diff --git a/Jenkinsfile_nightly b/Jenkinsfile_nightly index 01ab1bee08..dccf18c7b5 100644 --- a/Jenkinsfile_nightly +++ b/Jenkinsfile_nightly @@ -60,6 +60,7 @@ withNightlyPipeline(type, product, component) { env.WAIT_FOR_TIMEOUT_MS = params.WAIT_FOR_TIMEOUT_MS env.URL_FOR_SECURITY_SCAN = params.CIVIL_SERVICE_URL env.TESTS_FOR_ACCESSIBILITY = false + env.CCD_UI_TESTS = true overrideVaultEnvironments([ 'aat': params.ENVIRONMENT ]) diff --git a/codecept.conf.js b/codecept.conf.js index b6e96f3237..4515c78278 100644 --- a/codecept.conf.js +++ b/codecept.conf.js @@ -23,6 +23,7 @@ exports.config = { './e2e/tests/api_tests/hearings/*_test.js', './e2e/tests/api_tests/bulkclaim/*_test.js', './e2e/tests/api_tests/lrspec/*_test.js', + './e2e/tests/api_tests/lrspec_cui/*_test.js', ], output: 'test-results/functional', helpers: { diff --git a/e2e/tests/api_tests/damages/api_1v1_test.js b/e2e/tests/api_tests/damages/api_1v1_test.js index 956bc9b97e..e6e2bc463d 100644 --- a/e2e/tests/api_tests/damages/api_1v1_test.js +++ b/e2e/tests/api_tests/damages/api_1v1_test.js @@ -1,7 +1,6 @@ /* eslint-disable no-unused-vars */ const config = require('../../../config.js'); -const {setupTokens} = require('../../../api/apiRequest'); const mpScenario = 'ONE_V_ONE'; //This test runs in api_judgment_online_1v1_test - so running only in nightly diff --git a/e2e/tests/api_tests/damages/api_1v2_different_solicitor_test.js b/e2e/tests/api_tests/damages/api_1v2_different_solicitor_test.js index d458ce583a..b610fa7d16 100644 --- a/e2e/tests/api_tests/damages/api_1v2_different_solicitor_test.js +++ b/e2e/tests/api_tests/damages/api_1v2_different_solicitor_test.js @@ -4,7 +4,7 @@ const config = require('../../../config.js'); const mpScenario = 'ONE_V_TWO_TWO_LEGAL_REP'; // add @api-tests to run -Feature('CCD 1v2 Different Solicitor API test @api-unspec @api-multiparty @api-tests-1v2DS @api-prod @api-nonprod-unspec'); +Feature('CCD 1v2 Different Solicitor API test @api-unspec @api-multiparty @api-tests-1v2DS @api-prod @api-nonprod-unspec @api-nightly-prod'); Scenario('Create claim', async ({I, api}) => { await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario); diff --git a/e2e/tests/api_tests/damages/api_2v1_test.js b/e2e/tests/api_tests/damages/api_2v1_test.js index 622646dab0..c99ac6e20d 100644 --- a/e2e/tests/api_tests/damages/api_2v1_test.js +++ b/e2e/tests/api_tests/damages/api_2v1_test.js @@ -3,7 +3,7 @@ const config = require('../../../config.js'); const mpScenario = 'TWO_V_ONE'; -Feature('CCD 2v1 API test @api-unspec @api-multiparty @api-tests-2v1 @api-prod @api-nonprod-unspec'); +Feature('CCD 2v1 API test @api-unspec @api-multiparty @api-tests-2v1 @api-prod @api-nightly-prod'); Scenario('Create claim', async ({I, api}) => { await api.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario); diff --git a/e2e/tests/api_tests/damages/api_noc_unspec_test.js b/e2e/tests/api_tests/damages/api_noc_unspec_test.js index a4223ea2d5..ba05273483 100644 --- a/e2e/tests/api_tests/damages/api_noc_unspec_test.js +++ b/e2e/tests/api_tests/damages/api_noc_unspec_test.js @@ -7,7 +7,7 @@ const { } = require('../../../config'); const config = require('../../../config.js'); -Feature('Unspecified Notice of Change on Unpecified Claim API test @api-noc @api-noc-unspec @api-prod @api-nonprod'); +Feature('Unspecified Notice of Change on Unpecified Claim API test @api-noc @api-noc-unspec @api-prod @api-nightly-prod'); Scenario('notice of change - 1v1 - represented defendant', async ({api, noc}) => { await api.createClaimWithRepresentedRespondent(applicantSolicitorUser); @@ -23,7 +23,7 @@ Scenario('notice of change - 1v1 - represented defendant', async ({api, noc}) => await noc.requestNoticeOfChangeForRespondent1Solicitor(caseId, otherSolicitorUser1); await api.checkUserCaseAccess(defendantSolicitorUser, false); await api.checkUserCaseAccess(otherSolicitorUser1, true); -}); +}).tag('@api-nonprod'); Scenario('notice of change - 1v1 - unrepresented defendant', async ({api, noc}) => { await api.createClaimWithRespondentLitigantInPerson(applicantSolicitorUser, 'ONE_V_ONE'); diff --git a/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v1_test.js b/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v1_test.js index 87abd84902..4858a4517f 100644 --- a/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v1_test.js +++ b/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v1_test.js @@ -8,7 +8,7 @@ const caseWorkerUser = config.testEarlyAdopterCourts ? config.hearingCenterAdmin // const judgeUser = config.judgeUserWithRegionId1Local; // const caseWorkerUser = config.tribunalCaseworkerWithRegionId1Local; -Feature('Record Judgment 1v1 API test spec @api-spec-1v1 @api-jo @api-nonprod'); +Feature('Record Judgment 1v1 API test spec @api-spec-1v1 @api-jo @api-nightly-prod'); Scenario('Record Judgment Spec claim 1v1 with set aside (Judge Order - pay instalments)', async ({I, api_spec}) => { if (['preview', 'demo'].includes(config.runningEnv)) { diff --git a/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_fulladmit_setdate_test.js b/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_fulladmit_setdate_test.js index 2a9292fc5d..be21265fe5 100644 --- a/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_fulladmit_setdate_test.js +++ b/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_fulladmit_setdate_test.js @@ -5,7 +5,7 @@ const claimType = 'SmallClaims'; let carmEnabled = false; let caseId; -Feature('CCD 1v1 API test @api-spec-cui @api-nonprod @non-prod-e2e-ft'); +Feature('CCD 1v1 API test @api-spec-cui @non-prod-e2e-ft'); Before(async () => { await createAccount(config.defendantCitizenUser2.email, config.defendantCitizenUser2.password); }); diff --git a/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_mediation_test.js b/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_mediation_test.js index 2393b7db3f..d34192848a 100644 --- a/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_mediation_test.js +++ b/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_mediation_test.js @@ -15,7 +15,7 @@ async function prepareClaim(api_spec_cui, carmEnabled) { } // set config.localMediationTests to true to run locally -Feature('Unsuccessful mediation for spec small claim with unrepresented defendant @cui-carm @api-nonprod @non-prod-e2e-ft'); +Feature('Unsuccessful mediation for spec small claim with unrepresented defendant @cui-carm @api-nonprod'); Before(async () => { await createAccount(config.defendantCitizenUser2.email, config.defendantCitizenUser2.password); diff --git a/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_partadmit_installments_test.js b/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_partadmit_installments_test.js index e268d4349e..64fd373d98 100644 --- a/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_partadmit_installments_test.js +++ b/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_partadmit_installments_test.js @@ -5,7 +5,7 @@ const claimType = 'SmallClaims'; let caseId; let carmEnabled = false; -Feature('CCD 1v1 API test @api-spec-cui @api-nonprod @non-prod-e2e-ft'); +Feature('CCD 1v1 API test @api-spec-cui @non-prod-e2e-ft'); Before(async () => { await createAccount(config.defendantCitizenUser2.email, config.defendantCitizenUser2.password); }); diff --git a/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_test.js b/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_test.js index 19f0ee3dfa..dec9efb0b3 100644 --- a/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_test.js +++ b/e2e/tests/api_tests/lrspec_cui/api_1v1_spec_cui_test.js @@ -6,7 +6,7 @@ const {createAccount, deleteAccount} = require('../../../api/idamHelper'); const claimType = 'SmallClaims'; let caseId; -Feature('CCD 1v1 API test @api-spec-cui @api-nonprod @non-prod-e2e-ft'); +Feature('CCD 1v1 API test @api-spec-cui @api-nonprod'); Before(async () => { await createAccount(config.defendantCitizenUser2.email, config.defendantCitizenUser2.password); diff --git a/e2e/tests/api_tests/sdo_R2/api_request_for_reconsideration_test.js b/e2e/tests/api_tests/sdo_R2/api_request_for_reconsideration_test.js index f6f188edc0..2260f8e09d 100644 --- a/e2e/tests/api_tests/sdo_R2/api_request_for_reconsideration_test.js +++ b/e2e/tests/api_tests/sdo_R2/api_request_for_reconsideration_test.js @@ -11,7 +11,7 @@ await api_spec_small.defendantResponse(config.defendantSolicitorUser, 'FULL_DEFE await api_spec_small.claimantResponse(config.applicantSolicitorUser, true); } -Feature('Request for reconsideration - 1v1 - spec @api-specified @api-nonprod'); +Feature('Request for reconsideration - 1v1 - spec @api-specified @api-nightly-prod'); Scenario('1v1 spec request for reconsideration for uphold previous order', async ({api_spec_small}) => { if (['preview', 'demo'].includes(config.runningEnv)) { @@ -53,7 +53,7 @@ Scenario('1v2 spec request for reconsideration by defendant2 for create general await api_spec_small.requestForReconsideration(config.secondDefendantSolicitorUser,'Respondent2'); await api_spec_small.judgeDecisionOnReconsiderationRequest(judgeUser, 'CREATE_GENERAL_ORDER'); } -}); +}).tag('@api-nonprod'); Scenario('1v1 spec request for reconsideration when claim amount is greater than 1000', async ({api_spec}) => { if (['preview', 'demo'].includes(config.runningEnv)) { diff --git a/package.json b/package.json index b1bb9a2ace..c36fa73c1a 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "test:crossbrowser": "./e2e/run-crossbrowser-tests.sh", "test:AATFunctional": "./e2e/run-prod-functional-tests.sh", "test:DemoFunctional": "./e2e/run-features-flag-enabled-full-functional-tests", - "test:fullfunctional": "MOCHAWESOME_REPORTFILENAME=functional-unspec npx codeceptjs run-workers --suites 2 --grep '@e2e-nightly-prod' --reporter mocha-multi --verbose", + "test:fullfunctional": "yarn playwright install && MOCHAWESOME_REPORTFILENAME=functional-unspec npx codeceptjs run-workers --suites 2 --grep '@e2e-nightly-prod' --reporter mocha-multi --verbose", "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:api-nightly-prod": "MOCHAWESOME_REPORTFILENAME=non-prod-e2e-ft npx codeceptjs run-workers --suites 8 --grep '@api-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",