add ui integration to drone

UKHomeOffice · Oct 27, 2022 · 82bbeed · 82bbeed
1 parent 37e94b3
commit 82bbeed
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 1 deletion.
diff --git a/.drone.yml b/.drone.yml
@@ -45,6 +45,14 @@ sonar_scanner: &sonar_scanner
   commands:
     - sonar-scanner -Dproject.settings=./sonar-project.properties
 
+ui_integration_tests: &ui_integration_tests
+  pull: if-not-exists
+  image: node:14
+  environment:
+    NOTIFY_STUB: true
+  commands:
+    - yarn run test:ui-integration
+
 acceptance_tests: &acceptance_tests
   pull: if-not-exists
   image: mcr.microsoft.com/playwright:v1.12.3-focal
@@ -104,6 +112,14 @@ steps:
           - master
       event: push
 
+  - name: ui_integration_tests_deploy
+    <<: *ui_integration_tests
+    when:
+      branch:
+        include:
+          - master
+      event: push
+
   - name: build_image
     image: 340268328991.dkr.ecr.eu-west-2.amazonaws.com/acp/dind
     commands:
@@ -189,6 +205,15 @@ steps:
           - feature/*
       event: pull_request
 
+  - name: ui_integration_tests_branch
+    <<: *ui_integration_tests
+    when:
+      branch:
+        include:
+          - master
+          - feature/*
+      event: pull_request
+
   - name: build_acceptance_branch
     pull: if-not-exists
     image: 340268328991.dkr.ecr.eu-west-2.amazonaws.com/acp/dind

diff --git a/apps/are_form/data/exclusion_days.json b/apps/are_form/data/exclusion_days.json
@@ -331,6 +331,13 @@
         "bunting": true,
         "formattedDate": "Monday 29 August 2022"
       },
+      {
+        "title": "Bank Holiday for the State Funeral of Queen Elizabeth II",
+        "date": "2022-09-19",
+        "notes": "",
+        "bunting": false,
+        "formattedDate": "Monday 19 September 2022"
+      },
       {
         "title": "Boxing Day",
         "date": "2022-12-26",
@@ -770,6 +777,13 @@
         "bunting": true,
         "formattedDate": "Monday 01 August 2022"
       },
+      {
+        "title": "Bank Holiday for the State Funeral of Queen Elizabeth II",
+        "date": "2022-09-19",
+        "notes": "",
+        "bunting": false,
+        "formattedDate": "Monday 19 September 2022"
+      },
       {
         "title": "St Andrew’s Day",
         "date": "2022-11-30",
@@ -1272,6 +1286,13 @@
         "bunting": true,
         "formattedDate": "Monday 29 August 2022"
       },
+      {
+        "title": "Bank Holiday for the State Funeral of Queen Elizabeth II",
+        "date": "2022-09-19",
+        "notes": "",
+        "bunting": false,
+        "formattedDate": "Monday 19 September 2022"
+      },
       {
         "title": "Boxing Day",
         "date": "2022-12-26",

diff --git a/test/_unit/apps/are_form/lib/exclusiondates.spec.js b/test/_unit/apps/are_form/lib/exclusiondates.spec.js
@@ -13,7 +13,7 @@ const januaryMinusOneYear = moment().year(currentYear - 1).month(1).day(1);
 const januaryMinusOneYearToString = januaryMinusOneYear.year().toString();
 const oneYear = 1;
 
-describe.only('Exclusion Dates', () => {
+describe('Exclusion Dates', () => {
   let englishExclusionDates;
   let irelandExclusionDates;
   let scottishExclusionDates;