From 9f10b5b8a2cdb2223bc95a91471bf4cd5a4f715c Mon Sep 17 00:00:00 2001 From: Scott Alexander Date: Mon, 20 Nov 2023 11:16:15 +0000 Subject: [PATCH] workflow tidy structure --- .../auth_general_browser_states.cy.js} | 2 +- .../auth_gp_admin_path_access.cy.js} | 2 +- .../auth_gp_clinical_path_access.cy.js} | 2 +- .../auth_pcse_path_access.cy.js} | 0 .../base_step_individual_patient_search_and_verify.cy.js} | 0 .../upload_step_1_individual_patient_document_upload.cy.js} | 0 .../view_lg_step_1_workflow.cy.js} | 0 .../base_step_individual_patient_search_and_verify.cy.js} | 0 .../download_step_1_download_patient_files.cy.js} | 2 +- 9 files changed, 4 insertions(+), 4 deletions(-) rename app/cypress/e2e/0-ndr-core-tests/{auth.cy.js => auth_routes/auth_general_browser_states.cy.js} (95%) rename app/cypress/e2e/0-ndr-core-tests/{auth_gp_admin_path.cy.js => auth_routes/auth_gp_admin_path_access.cy.js} (94%) rename app/cypress/e2e/0-ndr-core-tests/{auth_gp_clinical_path.cy.js => auth_routes/auth_gp_clinical_path_access.cy.js} (94%) rename app/cypress/e2e/0-ndr-core-tests/{auth_pcse_path.cy.js => auth_routes/auth_pcse_path_access.cy.js} (100%) rename app/cypress/e2e/0-ndr-core-tests/{gp_upload_workflow_step1_individual_patient_search_and_verify.cy.js => gp_user_workflows/base_step_individual_patient_search_and_verify.cy.js} (100%) rename app/cypress/e2e/0-ndr-core-tests/{gp_upload_workflow_step2_individual_patient_document_upload.cy.js => gp_user_workflows/upload_step_1_individual_patient_document_upload.cy.js} (100%) rename app/cypress/e2e/0-ndr-core-tests/{gp_view_lloyd_george_workflow.cy.js => gp_user_workflows/view_lg_step_1_workflow.cy.js} (100%) rename app/cypress/e2e/0-ndr-core-tests/{pcse_all_workflows_step1_individual_patient_search_and_verify.cy.js => pcse_user_workflows/base_step_individual_patient_search_and_verify.cy.js} (100%) rename app/cypress/e2e/0-ndr-core-tests/{pcse_download_workflow_step2_individual_patient_search_and_verify.cy.js => pcse_user_workflows/download_step_1_download_patient_files.cy.js} (99%) diff --git a/app/cypress/e2e/0-ndr-core-tests/auth.cy.js b/app/cypress/e2e/0-ndr-core-tests/auth_routes/auth_general_browser_states.cy.js similarity index 95% rename from app/cypress/e2e/0-ndr-core-tests/auth.cy.js rename to app/cypress/e2e/0-ndr-core-tests/auth_routes/auth_general_browser_states.cy.js index f66624378..1097f9b53 100644 --- a/app/cypress/e2e/0-ndr-core-tests/auth.cy.js +++ b/app/cypress/e2e/0-ndr-core-tests/auth_routes/auth_general_browser_states.cy.js @@ -1,4 +1,4 @@ -import authPayload from '../../fixtures/requests/auth/GET_TokenRequest_GP_ADMIN.json'; +import authPayload from '../../../fixtures/requests/auth/GET_TokenRequest_GP_ADMIN.json'; describe('authentication & authorisation', () => { const baseUrl = 'http://localhost:3000'; diff --git a/app/cypress/e2e/0-ndr-core-tests/auth_gp_admin_path.cy.js b/app/cypress/e2e/0-ndr-core-tests/auth_routes/auth_gp_admin_path_access.cy.js similarity index 94% rename from app/cypress/e2e/0-ndr-core-tests/auth_gp_admin_path.cy.js rename to app/cypress/e2e/0-ndr-core-tests/auth_routes/auth_gp_admin_path_access.cy.js index cf8a1f872..64c819465 100644 --- a/app/cypress/e2e/0-ndr-core-tests/auth_gp_admin_path.cy.js +++ b/app/cypress/e2e/0-ndr-core-tests/auth_routes/auth_gp_admin_path_access.cy.js @@ -13,7 +13,7 @@ const patient = { const smokeTest = Cypress.env('CYPRESS_RUN_AS_SMOKETEST') ?? false; const baseUrl = Cypress.env('CYPRESS_BASE_URL') ?? 'http://localhost:3000/'; -describe('assert GP_ADMIM workflow path', () => { +describe('assert GP_ADMIN user has access to the GP_ADMIM workflow path', () => { const baseUrl = 'http://localhost:3000'; context('session management', () => { diff --git a/app/cypress/e2e/0-ndr-core-tests/auth_gp_clinical_path.cy.js b/app/cypress/e2e/0-ndr-core-tests/auth_routes/auth_gp_clinical_path_access.cy.js similarity index 94% rename from app/cypress/e2e/0-ndr-core-tests/auth_gp_clinical_path.cy.js rename to app/cypress/e2e/0-ndr-core-tests/auth_routes/auth_gp_clinical_path_access.cy.js index 55064edb5..ded2edcc3 100644 --- a/app/cypress/e2e/0-ndr-core-tests/auth_gp_clinical_path.cy.js +++ b/app/cypress/e2e/0-ndr-core-tests/auth_routes/auth_gp_clinical_path_access.cy.js @@ -13,7 +13,7 @@ const patient = { const smokeTest = Cypress.env('CYPRESS_RUN_AS_SMOKETEST') ?? false; const baseUrl = Cypress.env('CYPRESS_BASE_URL') ?? 'http://localhost:3000/'; -describe('assert GP_CLINICAL workflow path', () => { +describe('assert GP_CLINICAL user has access to the GP_CLINICAL workflow path', () => { const baseUrl = 'http://localhost:3000'; context('session management', () => { diff --git a/app/cypress/e2e/0-ndr-core-tests/auth_pcse_path.cy.js b/app/cypress/e2e/0-ndr-core-tests/auth_routes/auth_pcse_path_access.cy.js similarity index 100% rename from app/cypress/e2e/0-ndr-core-tests/auth_pcse_path.cy.js rename to app/cypress/e2e/0-ndr-core-tests/auth_routes/auth_pcse_path_access.cy.js diff --git a/app/cypress/e2e/0-ndr-core-tests/gp_upload_workflow_step1_individual_patient_search_and_verify.cy.js b/app/cypress/e2e/0-ndr-core-tests/gp_user_workflows/base_step_individual_patient_search_and_verify.cy.js similarity index 100% rename from app/cypress/e2e/0-ndr-core-tests/gp_upload_workflow_step1_individual_patient_search_and_verify.cy.js rename to app/cypress/e2e/0-ndr-core-tests/gp_user_workflows/base_step_individual_patient_search_and_verify.cy.js diff --git a/app/cypress/e2e/0-ndr-core-tests/gp_upload_workflow_step2_individual_patient_document_upload.cy.js b/app/cypress/e2e/0-ndr-core-tests/gp_user_workflows/upload_step_1_individual_patient_document_upload.cy.js similarity index 100% rename from app/cypress/e2e/0-ndr-core-tests/gp_upload_workflow_step2_individual_patient_document_upload.cy.js rename to app/cypress/e2e/0-ndr-core-tests/gp_user_workflows/upload_step_1_individual_patient_document_upload.cy.js diff --git a/app/cypress/e2e/0-ndr-core-tests/gp_view_lloyd_george_workflow.cy.js b/app/cypress/e2e/0-ndr-core-tests/gp_user_workflows/view_lg_step_1_workflow.cy.js similarity index 100% rename from app/cypress/e2e/0-ndr-core-tests/gp_view_lloyd_george_workflow.cy.js rename to app/cypress/e2e/0-ndr-core-tests/gp_user_workflows/view_lg_step_1_workflow.cy.js diff --git a/app/cypress/e2e/0-ndr-core-tests/pcse_all_workflows_step1_individual_patient_search_and_verify.cy.js b/app/cypress/e2e/0-ndr-core-tests/pcse_user_workflows/base_step_individual_patient_search_and_verify.cy.js similarity index 100% rename from app/cypress/e2e/0-ndr-core-tests/pcse_all_workflows_step1_individual_patient_search_and_verify.cy.js rename to app/cypress/e2e/0-ndr-core-tests/pcse_user_workflows/base_step_individual_patient_search_and_verify.cy.js diff --git a/app/cypress/e2e/0-ndr-core-tests/pcse_download_workflow_step2_individual_patient_search_and_verify.cy.js b/app/cypress/e2e/0-ndr-core-tests/pcse_user_workflows/download_step_1_download_patient_files.cy.js similarity index 99% rename from app/cypress/e2e/0-ndr-core-tests/pcse_download_workflow_step2_individual_patient_search_and_verify.cy.js rename to app/cypress/e2e/0-ndr-core-tests/pcse_user_workflows/download_step_1_download_patient_files.cy.js index a5fbbf308..5fa97d56a 100644 --- a/app/cypress/e2e/0-ndr-core-tests/pcse_download_workflow_step2_individual_patient_search_and_verify.cy.js +++ b/app/cypress/e2e/0-ndr-core-tests/pcse_user_workflows/download_step_1_download_patient_files.cy.js @@ -1,4 +1,4 @@ -import searchPatientPayload from '../../fixtures/requests/GET_SearchPatient.json'; +import searchPatientPayload from '../../../fixtures/requests/GET_SearchPatient.json'; describe('PCSE Download Workflow: Access and download found files', () => { // env vars