#3024: Fix tests and import Report issue

client/src/pages/reports/EngagementDateFormPartial.js

@@ -84,10 +84,15 @@ const EngagementDatePartialFormWithDuration = ({
           disabled={isAllDay}
         />
       </Col>
-      <Col sm={2} style={{ marginTop: "2.2em", maxWidth: "max-content" }}>
+      <Col
+        sm={2}
+        style={{ marginTop: "2.2em", maxWidth: "max-content" }}
+        id="all-day-col"
+      >
         <Checkbox
           checked={isAllDay}
           label="All Day"
+          id="all-day"
           onChange={e => {
             setIsAllDay(e.target.checked)
             if (e.target.checked) {

client/tests/webdriver/baseSpecs/createReportWithPlanningConflict.spec.js

@@ -1,20 +1,21 @@
 import { expect } from "chai"
 import moment from "moment"
-import Settings from "../../../platform/node/settings"
 import CreateReport from "../pages/report/createReport.page"
 import EditReport from "../pages/report/editReport.page"
 import ShowReport from "../pages/report/showReport.page"
 
 // NOTE: Copied Report model logic here because importing issues
 
+function getFormattedDateInput(report) {
+  return report.engagementDate.format("DD-MM-YYYY HH:mm")
+}
+
 function isEngagementAllDay(report) {
   return !report.duration
 }
 
 function getEngagementDateFormat() {
-  return Settings.engagementsIncludeTimeAndDuration
-    ? Settings.dateFormats.forms.displayLong.withTime
-    : Settings.dateFormats.forms.displayLong.date
+  return "dddd, D MMMM YYYY @ HH:mm"
 }
 
 function getAllDayIndicator(report) {
@@ -28,10 +29,7 @@ function getFormattedEngagementDate(report) {
 
   const start = moment(report.engagementDate)
   if (isEngagementAllDay(report)) {
-    return Settings.engagementsIncludeTimeAndDuration
-      ? start.format(Settings.dateFormats.forms.displayLong.date) +
-          getAllDayIndicator(report)
-      : start.format(getEngagementDateFormat())
+    return start.format("dddd, D MMMM YYYY") + getAllDayIndicator(report)
   }
 
   const end = moment(report.engagementDate).add(report.duration, "minutes")
@@ -52,7 +50,7 @@ describe("When creating a Report with conflicts", () => {
   const report01 = {
     intent: "111111111111",
     engagementDate: moment()
-      .add(1, "day")
+      .add(2, "day")
       .hours(1)
       .minutes(0)
       .seconds(0)
@@ -64,7 +62,7 @@ describe("When creating a Report with conflicts", () => {
   const report02 = {
     intent: "2222222222",
     engagementDate: moment()
-      .add(1, "day")
+      .add(2, "day")
       .hours(1)
       .minutes(10)
       .seconds(0)
@@ -80,7 +78,7 @@ describe("When creating a Report with conflicts", () => {
 
     expect(CreateReport.intent.getValue()).to.equal(report01.intent)
     expect(CreateReport.engagementDate.getValue()).to.equal(
-      getFormattedEngagementDate(report01.engagementDate)
+      getFormattedDateInput(report01)
     )
     expect(CreateReport.duration.getValue()).to.equal(report01.duration)
     const advisor01 = CreateReport.getPersonByName("CIV ERINSON, Erin")
@@ -112,7 +110,7 @@ describe("When creating a Report with conflicts", () => {
 
     expect(CreateReport.intent.getValue()).to.equal(report02.intent)
     expect(CreateReport.engagementDate.getValue()).to.equal(
-      getFormattedEngagementDate(report02.engagementDate)
+      getFormattedDateInput(report02)
     )
     expect(CreateReport.duration.getValue()).to.equal(report02.duration)
     const advisor01 = CreateReport.getPersonByName("CIV ERINSON, Erin")
@@ -158,7 +156,7 @@ describe("When creating a Report with conflicts", () => {
 
     expect(ShowReport.intent).to.equal(report01.intent)
     expect(ShowReport.engagementDate).to.equal(
-      getFormattedEngagementDate(report01.engagementDate)
+      getFormattedEngagementDate(report01)
     )
     expect(ShowReport.reportConflictIcon.isExisting()).to.equal(true)
 
@@ -199,7 +197,7 @@ describe("When creating a Report with conflicts", () => {
 
     expect(ShowReport.intent).to.equal(report02.intent)
     expect(ShowReport.engagementDate).to.equal(
-      getFormattedEngagementDate(report02.engagementDate)
+      getFormattedEngagementDate(report02)
     )
     expect(ShowReport.reportConflictIcon.isExisting()).to.equal(true)
 

client/tests/webdriver/customFieldsSpecs/createReport.spec.js

@@ -36,6 +36,10 @@ describe("Create report form page", () => {
     })
 
     it("Should be able to prevent invalid duration values", () => {
+      // make it not an all day first to enable duration input
+      CreateReport.allDayCheckbox.click()
+      CreateReport.duration.waitForClickable()
+
       CreateReport.duration.setValue(INVALID_ENGAGEMENT_DURATION_1)
       browser.waitUntil(
         () => {
@@ -48,7 +52,13 @@ describe("Create report form page", () => {
           timeoutMsg: "Large positive duration value was not sliced "
         }
       )
-      CreateReport.duration.setValue(INVALID_ENGAGEMENT_DURATION_2)
+
+      // remove first value, otherwise appends the value
+      CreateReport.duration.setValue(
+        "\uE003".repeat(VALID_ENGAGEMENT_DURATION_1) +
+          INVALID_ENGAGEMENT_DURATION_2
+      )
+
       browser.waitUntil(
         () => {
           return (

client/tests/webdriver/pages/createReport.page.js

@@ -40,6 +40,10 @@ export class CreateReport extends Page {
     return browser.$(`div[id="fg-${id}"]`)
   }
 
+  get allDayCheckbox() {
+    return browser.$("#all-day-col label")
+  }
+
   get engagementInformationTitle() {
     return browser.$('//span[text()="Engagement information"]')
   }

client/tests/webdriver/pages/report/createReport.page.js

@@ -24,15 +24,20 @@ class CreateReport extends Page {
     return browser.$("#engagementDate")
   }
 
-  get tomorrow() {
-    const tomorrow = moment().add(1, "day").format("ddd MMM DD YYYY")
-    return browser.$(`div[aria-label="${tomorrow}"]`)
+  get datePickPopover() {
+    // check the today button
+    const today = moment().format("ddd MMM DD YYYY")
+    return browser.$(`div[aria-label="${today}"]`)
   }
 
   get duration() {
     return browser.$("#duration")
   }
 
+  get allDayCheckbox() {
+    return browser.$("#all-day-col label")
+  }
+
   get reportPeople() {
     return browser.$("#reportPeople")
   }
@@ -91,13 +96,17 @@ class CreateReport extends Page {
     this.intentHelpBlock.waitForExist({ reverse: true })
 
     if (moment.isMoment(fields.engagementDate)) {
+      // remove all day as it would block duration adding
+      if (!this.duration.isClickable()) {
+        this.allDayCheckbox.click()
+      }
       this.engagementDate.waitForClickable()
       this.engagementDate.click()
-      this.tomorrow.waitForDisplayed()
+      this.datePickPopover.waitForDisplayed()
       browser.keys(fields.engagementDate.format("DD-MM-YYYY HH:mm"))
 
       this.title.click()
-      this.tomorrow.waitForExist({ reverse: true, timeout: 3000 })
+      this.datePickPopover.waitForExist({ reverse: true, timeout: 3000 })
     }
 
     if (fields.duration !== undefined) {