#3024: Fix tests and import Report issue

NCI-Agency · Nov 26, 2020 · 0ec9c17 · 0ec9c17
1 parent 26cd7af
commit 0ec9c17
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/client/src/pages/reports/EngagementDateFormPartial.js b/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) {

diff --git a/client/tests/webdriver/pages/createReport.page.js b/client/tests/webdriver/pages/createReport.page.js
@@ -18,6 +18,10 @@ export class CreateReport extends Page {
     return browser.$("#duration")
   }
 
+  get allDayCheckbox() {
+    return browser.$("#all-day-col label")
+  }
+
   get engagementInformationTitle() {
     return browser.$('//span[text()="Engagement information"]')
   }

diff --git a/client/tests/webdriver/specs/createReport.spec.js b/client/tests/webdriver/specs/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 (

diff --git a/client/tests/webdriver/specs/createReportWithPlanningConflict.spec.js b/client/tests/webdriver/specs/createReportWithPlanningConflict.spec.js
@@ -1,6 +1,5 @@
 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"
@@ -12,9 +11,7 @@ function isEngagementAllDay(report) {
 }
 
 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 +25,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")