CIV-7109 Fix nightly build (#2204)

* Update tags and test * Update tags and test * Update tags and test * Update tags and test --------- Co-authored-by: Mounika Ammineni <[email protected]>
hmcts · Feb 14, 2023 · c39a993 · c39a993
1 parent 4092a75
commit c39a993
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 18 deletions.
diff --git a/e2e/run-non-prod-features-flag-enabled-functional-tests.sh b/e2e/run-non-prod-features-flag-enabled-functional-tests.sh
@@ -1,10 +1,17 @@
 #!/bin/bash
 set -ex
 
-echo "Run Non prod Functional tests with all feature flags enabled in ccd def file"
+echo "Run Api Functional tests with non prod ccd def "
+yarn test:api-unspec
+yarn test:api-spec
+yarn test:api-dj
+yarn test:api-cos
+yarn test:api-sdo
+
+echo "Run E2E Functional tests with non prod ccd def file"
+
+yarn test:master-e2e-ft
+yarn test:e2e-nightly-prod
+yarn test:e2e-nightly-nonprod
 
-dir=$(dirname ${0})
 
-${dir}/run-spec-functional-tests.sh
-${dir}/run-sdo-functional-tests.sh
-${dir}/run-dj-functional-tests.sh
diff --git a/e2e/run-prod-functional-tests.sh b/e2e/run-prod-functional-tests.sh
@@ -1,8 +1,13 @@
 #!/bin/bash
 set -ex
 
-echo "Run Functional tests with prod ccd def file"
+echo "Run Api Functional tests with prod ccd def file"
+yarn test:api-unspec
+yarn test:api-spec
+
+echo "Run E2E Functional tests with prod ccd def file"
+
+yarn test:master-e2e-ft
+yarn test:e2e-nightly-prod
 
-dir=$(dirname ${0})
 
-${dir}/run-unspec-functional-tests.sh
diff --git a/e2e/tests/ui_tests/damages/1v1CreateClaim_test.js b/e2e/tests/ui_tests/damages/1v1CreateClaim_test.js
@@ -20,7 +20,7 @@ const respondent1 = {
 
 let caseNumber;
 
-Feature('1v1 - Claim Journey @e2e-unspec @e2e-1v1');
+Feature('1v1 - Claim Journey @e2e-unspec @e2e-1v1 @e2e-nightly-prod');
 
 Scenario('Applicant solicitor creates claim @create-claim', async ({I}) => {
   await I.login(config.applicantSolicitorUser);

diff --git a/e2e/tests/ui_tests/damages/1v2CreateClaim_SameSol_test.js b/e2e/tests/ui_tests/damages/1v2CreateClaim_SameSol_test.js
@@ -24,7 +24,7 @@ const respondent2 = {
 
 let caseNumber;
 
-Feature('1v2 Same Solicitor Claim Journey @e2e-unspec @e2e-multiparty @e2e-1v2SS');
+Feature('1v2 Same Solicitor Claim Journey @e2e-unspec @e2e-multiparty @e2e-1v2SS @e2e-nightly-prod');
 
 Scenario('Claimant solicitor raises a claim against 2 defendants who have the same solicitor', async ({I}) => {
   await I.login(config.applicantSolicitorUser);

diff --git a/e2e/tests/ui_tests/damages/1v2CreateClaim_offline_test.js b/e2e/tests/ui_tests/damages/1v2CreateClaim_offline_test.js
@@ -17,7 +17,7 @@ const respondent2 = {
 //let caseNumber;
 
 
-Feature('1v2 Create claim @e2e-unspec @e2e-multiparty');
+Feature('1v2 Create claim @e2e-unspec @e2e-multiparty @e2e-nightly-prod');
 
 Scenario('Claimant solicitor raise a claim against 2 defendants, one of who is without a solicitor (LiP) should progress case offline', async ({I}) => {
   await I.login(config.applicantSolicitorUser);
@@ -26,6 +26,7 @@ Scenario('Claimant solicitor raise a claim against 2 defendants, one of who is w
     null,
     respondent1,
     respondent2,
+    30000,
     false
   );
 

diff --git a/e2e/tests/ui_tests/damages/1v2_LIP_COS_test.js b/e2e/tests/ui_tests/damages/1v2_LIP_COS_test.js
@@ -3,7 +3,7 @@
 const config = require('../../../config.js');
 let civilCaseReference;
 
-Feature('CCD 1v2 2 LIPs COS UI test @e2e-cos');
+Feature('CCD 1v2 2 LIPs COS UI test @e2e-unspec @e2e-cos @e2e-nightly-nonprod');
 
 Scenario('1v2 two respondents are LIP - notify/notify claim details journey', async ({I, api}) => {
   if (['preview', 'demo'].includes(config.runningEnv)) {

diff --git a/e2e/tests/ui_tests/damages/2v1CreateClaim_test.js b/e2e/tests/ui_tests/damages/2v1CreateClaim_test.js
@@ -22,7 +22,7 @@ const respondent1 = {
 
 let caseNumber;
 
-Feature('2v1 Claim Journey @e2e-unspec @e2e-nightly @e2e-2v1');
+Feature('2v1 Claim Journey @e2e-unspec @e2e-nightly @e2e-2v1 @e2e-nightly-prod');
 
 Scenario('Claimant solicitor raises a claim for 2 claimants against 1 defendant', async ({I}) => {
   await I.login(config.applicantSolicitorUser);

diff --git a/e2e/tests/ui_tests/default_judgement/1v2UnspecDJ_test.js b/e2e/tests/ui_tests/default_judgement/1v2UnspecDJ_test.js
@@ -4,7 +4,7 @@ const config = require('../../../config.js');
 
 Feature('1v2 Unspec defaultJudgement @e2e-dj');
 
-Scenario('DefaultJudgement @create-claim ', async ({I, api}) => {
+Scenario('DefaultJudgement @create-claim @e2e-nightly-nonprod', async ({I, api}) => {
 
   await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'ONE_V_TWO_TWO_LEGAL_REP');
   let caseid = await api.getCaseId();

diff --git a/e2e/tests/ui_tests/default_judgement/1v2specDJ_test.js b/e2e/tests/ui_tests/default_judgement/1v2specDJ_test.js
@@ -2,7 +2,7 @@
 
 const config = require('../../../config.js');
 
-Feature('1v2 spec defaultJudgement @e2e-dj');
+Feature('1v2 spec defaultJudgement @e2e-dj @e2e-nightly-nonprod');
 
 Scenario('DefaultJudgement @create-claim ', async ({I, api_spec}) => {
   await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'ONE_V_TWO');

diff --git a/e2e/tests/ui_tests/lrspec/1v1CreateClaim-LRspec_test.js b/e2e/tests/ui_tests/lrspec/1v1CreateClaim-LRspec_test.js
@@ -9,7 +9,7 @@ const caseId = () => `${caseNumber.split('-').join('').replace(/#/, '')}`;
 
 let caseNumber;
 
-Feature('Claim creation 1v1 @e2e-tests-spec');
+Feature('Claim creation 1v1 @e2e-tests-spec @e2e-nightly-prod');
 
 Scenario('1v1 Applicant solicitor creates specified claim for fast track @create-claim-spec', async ({LRspec}) => {
   console.log('1v1 Applicant solicitor creates specified claim for fast track @create-claim-spec');

diff --git a/e2e/tests/ui_tests/lrspec/1v2SameSolicitor-LRspec-SmallClaims_test.js b/e2e/tests/ui_tests/lrspec/1v2SameSolicitor-LRspec-SmallClaims_test.js
@@ -21,7 +21,7 @@ const respondent2 = {
 
 let caseNumber;
 
-Feature('Claim creation 1v2 Same Solicitor with Small claims @e2e-tests-spec');
+Feature('Claim creation 1v2 Same Solicitor with Small claims @e2e-tests-spec @e2e-nightly-prod');
 
 Scenario('Applicant solicitor creates 1v2 specified claim both defendants same LR for small claims @create-claim-spec', async ({LRspec}) => {
   console.log('Applicant solicitor creates 1v2 specified claim both defendants Same LR for small claims @create-claim-spec');

diff --git a/e2e/tests/ui_tests/lrspec/2v1CreateClaim-LRspec_test.js b/e2e/tests/ui_tests/lrspec/2v1CreateClaim-LRspec_test.js
@@ -10,7 +10,7 @@ const caseId = () => `${caseNumber.split('-').join('').replace(/#/, '')}`;
 
 let caseNumber;
 
-Feature('2v1 Multi Party Claim Creation 2v1 @e2e-tests-spec');
+Feature('2v1 Multi Party Claim Creation 2v1 @e2e-tests-spec @e2e-nightly-prod');
 
 Scenario('Applicant solicitor creates 2v1 specified claim with 2 organisation vs 1 company for fast-track claims', async ({LRspec}) => {
   console.log('Applicant solicitor creates 2v1 specified claim with 2 organisation vs 1 company for fast-track claims');

diff --git a/package.json b/package.json
@@ -48,6 +48,8 @@
     "test:AATFunctional": "./e2e/run-prod-functional-tests.sh",
     "test:DemoFunctional": "./e2e/run-non-prod-features-flag-enabled-functional-tests.sh",
     "test:fullfunctional": "./e2e/run-features-flag-enabled-full-functional-tests.sh",
+    "test:e2e-nightly-prod": "MOCHAWESOME_REPORTFILENAME=non-prod-e2e-ft npx codeceptjs run-workers --suites 2 --grep '@e2e-nightly-prod' --reporter mocha-multi --verbose",
+    "test:e2e-nightly-nonprod": "MOCHAWESOME_REPORTFILENAME=non-prod-e2e-ft npx codeceptjs run-workers --suites 2 --grep '@e2e-nightly-nonprod' --reporter mocha-multi --verbose",
     "test:non-prod-e2e-ft": "MOCHAWESOME_REPORTFILENAME=non-prod-e2e-ft npx codeceptjs run-workers --suites 2 --grep '@master-e2e-ft|@non-prod-e2e-ft' --reporter mocha-multi --verbose",
     "test:master-e2e-ft": "MOCHAWESOME_REPORTFILENAME=master-e2e-ft npx codeceptjs run-workers --suites 2 --grep @master-e2e-ft --reporter mocha-multi --verbose",
     "test:functional": "./e2e/run-functional-tests.sh",