Merge pull request #1974 from ministryofjustice/no-ticket/fix-cypress…

…-test

Specify timezone in Cypress test appointmentTimes

integration_tests/integration/referral.cy.js

@@ -1,4 +1,4 @@
-import moment from 'moment'
+import moment from 'moment-timezone'
 import draftReferralFactory from '../../testutils/factories/draftReferral'
 import sentReferralFactory from '../../testutils/factories/sentReferral'
 import serviceCategoryFactory from '../../testutils/factories/serviceCategory'

integration_tests/integration/serviceProviderReferrals.cy.js

@@ -1,4 +1,4 @@
-import moment from 'moment'
+import moment from 'moment-timezone'
 import sentReferralFactory from '../../testutils/factories/sentReferral'
 import sentReferralForSummaries from '../../testutils/factories/sentReferralSummaries'
 import serviceCategoryFactory from '../../testutils/factories/serviceCategory'
@@ -912,7 +912,7 @@ describe('Service provider referrals dashboard', () => {
     describe('with valid inputs and an appointment in the future', () => {
       describe('when booking for an In-Person Meeting - Other Location', () => {
         it('should present no errors and display scheduled appointment', () => {
-          const tomorrow = moment('09:02:00', 'HH:mm:ss').add(1, 'days')
+          const tomorrow = moment.tz('09:02:00', 'HH:mm:ss', 'Europe/London').add(1, 'days')
           cy.visit(`/service-provider/action-plan/${actionPlan.id}/sessions/1/edit/start`)
           cy.get('#date-day').type(tomorrow.format('D'))
           cy.get('#date-month').type(tomorrow.format('M'))
@@ -984,7 +984,7 @@ describe('Service provider referrals dashboard', () => {
 
         describe('and their chosen date causes a clash of appointments', () => {
           it('the user is able to amend their chosen date and re-submit', () => {
-            const tomorrow = moment('09:02:00', 'HH:mm:ss').add(1, 'days')
+            const tomorrow = moment.tz('09:02:00', 'HH:mm:ss', 'Europe/London').add(1, 'days')
             const rescheduledDate = moment('09:02:00', 'HH:mm:ss').add(2, 'days')
             cy.visit(`/service-provider/action-plan/${actionPlan.id}/sessions/1/edit/start`)
             cy.get('#date-day').type(tomorrow.format('D'))
@@ -1070,7 +1070,7 @@ describe('Service provider referrals dashboard', () => {
 
       describe('when booking for an In-Person Meeting - NPS Location', () => {
         it('should present no errors and display scheduled appointment', () => {
-          const tomorrow = moment('09:02:00', 'HH:mm:ss').add(1, 'days')
+          const tomorrow = moment.tz('09:02:00', 'HH:mm:ss', 'Europe/London').add(1, 'days')
           cy.visit(`/service-provider/action-plan/${actionPlan.id}/sessions/1/edit/start`)
           cy.get('#date-day').type(tomorrow.format('D'))
           cy.get('#date-month').type(tomorrow.format('M'))
@@ -2201,7 +2201,7 @@ describe('Service provider referrals dashboard', () => {
 
       describe('with appointments in the future', () => {
         it('presents a confirmation page and the booking is successful', () => {
-          const tomorrow = moment('09:02:02', 'HH:mm:ss').add(1, 'days')
+          const tomorrow = moment.tz('09:02:00', 'HH:mm:ss', 'Europe/London').add(1, 'days')
           cy.visit(`/service-provider/referrals/${referral.id}/progress`)
           cy.get('#supplier-assessment-status').contains('not scheduled')
           cy.contains('Schedule initial assessment').click()
@@ -2290,7 +2290,7 @@ describe('Service provider referrals dashboard', () => {
         })
 
         it('User schedules a supplier assessment appointment, changing their chosen time after it turns out to cause a clash of appointments', () => {
-          const tomorrow = moment('09:02:02', 'HH:mm:ss').add(1, 'days')
+          const tomorrow = moment.tz('09:02:00', 'HH:mm:ss', 'Europe/London').add(1, 'days')
           const rescheduledDate = moment('16:15:00', 'HH:mm:ss').add(2, 'days')
           cy.visit(`/service-provider/referrals/${referral.id}/supplier-assessment/schedule/start`)
 
@@ -2361,7 +2361,7 @@ describe('Service provider referrals dashboard', () => {
         })
 
         it('User reschedules a supplier assessment appointment', () => {
-          const tomorrow = moment('09:02:02', 'HH:mm:ss').add(1, 'days')
+          const tomorrow = moment.tz('09:02:00', 'HH:mm:ss', 'Europe/London').add(1, 'days')
           const rescheduledDate = moment('16:15:00', 'HH:mm:ss').add(1, 'days')
           const scheduledAppointment = initialAssessmentAppointmentFactory.build({
             appointmentTime: tomorrow.format(),

package.json

@@ -182,7 +182,7 @@
     "mocha": "^10.2.0",
     "mocha-junit-reporter": "^2.2.0",
     "mockdate": "^3.0.5",
-    "moment": "^2.29.4",
+    "moment-timezone": "^0.5.42",
     "nock": "^13.2.9",
     "nodemon": "^2.0.20",
     "prettier": "^2.8.2",

server/routes/makeAReferral/expected-release-date/expectedReleaseDateForm.test.ts

@@ -1,4 +1,4 @@
-import moment from 'moment'
+import moment from 'moment-timezone'
 import ExpectedReleaseDateForm from './expectedReleaseDateForm'
 import TestUtils from '../../../../testutils/testUtils'
 

server/routes/makeAReferral/makeAReferralController.test.ts

@@ -1,7 +1,7 @@
 import request from 'supertest'
 import { Express } from 'express'
 import createError from 'http-errors'
-import moment from 'moment'
+import moment from 'moment-timezone'
 import InterventionsService from '../../services/interventionsService'
 import ServiceUser from '../../models/serviceUser'
 import CommunityApiService from '../../services/communityApiService'

server/routes/makeAReferral/service-user-details/serviceUserDetailsPresenter.test.ts

@@ -1,4 +1,4 @@
-import moment from 'moment'
+import moment from 'moment-timezone'
 import { ListStyle } from '../../../utils/summaryList'
 import ServiceUserDetailsPresenter from './serviceUserDetailsPresenter'
 import expandedDeliusServiceUserFactory from '../../../../testutils/factories/expandedDeliusServiceUser'

server/services/interventionsService.test.ts

@@ -1,6 +1,6 @@
 import { pactWith } from 'jest-pact'
 import { Matchers } from '@pact-foundation/pact'
-import moment from 'moment'
+import moment from 'moment-timezone'
 import InterventionsService, { UpdateDraftEndOfServiceReportParams } from './interventionsService'
 import SentReferral from '../models/sentReferral'
 import SentReferralSummaries from '../models/sentReferralSummaries'

testutils/factories/draftReferral.ts

@@ -1,5 +1,5 @@
 import { Factory } from 'fishery'
-import moment from 'moment'
+import moment from 'moment-timezone'
 import DraftReferral, { CurrentLocationType } from '../../server/models/draftReferral'
 import serviceCategoryFactory from './serviceCategory'
 import interventionFactory from './intervention'

testutils/factories/sentReferral.ts

@@ -1,5 +1,5 @@
 import { Factory } from 'fishery'
-import moment from 'moment'
+import moment from 'moment-timezone'
 import SentReferral from '../../server/models/sentReferral'
 import { CurrentLocationType, ReferralFields } from '../../server/models/draftReferral'
 import serviceCategoryFactory from './serviceCategory'