diff --git a/cypress/fixtures/network/41/users_should_be_able_to_navigate_back_to_the_job_list.json b/cypress/fixtures/network/41/users_should_be_able_to_navigate_back_to_the_job_list.json index db154c6cf..3b9997f33 100644 --- a/cypress/fixtures/network/41/users_should_be_able_to_navigate_back_to_the_job_list.json +++ b/cypress/fixtures/network/41/users_should_be_able_to_navigate_back_to_the_job_list.json @@ -1,7 +1,7 @@ [ { "path": "/api/41/systemSettings/helpPageLink", - "featureName": "Users should be able to navigate back to the job list", + "featureName": "Users should be able to navigate back to the list route", "static": false, "count": 9, "nonDeterministic": false, @@ -34,7 +34,7 @@ }, { "path": "/api/41/jobConfigurations/jobTypes?fields=*&paging=false", - "featureName": "Users should be able to navigate back to the job list", + "featureName": "Users should be able to navigate back to the list route", "static": false, "count": 4, "nonDeterministic": false, @@ -66,7 +66,7 @@ }, { "path": "/api/41/scheduler", - "featureName": "Users should be able to navigate back to the job list", + "featureName": "Users should be able to navigate back to the list route", "static": false, "count": 3, "nonDeterministic": true, @@ -102,7 +102,7 @@ }, { "path": "/api/41/scheduler/queueable", - "featureName": "Users should be able to navigate back to the job list", + "featureName": "Users should be able to navigate back to the list route", "static": false, "count": 2, "nonDeterministic": false, @@ -133,7 +133,7 @@ }, { "path": "/api/41/analytics/tableTypes", - "featureName": "Users should be able to navigate back to the job list", + "featureName": "Users should be able to navigate back to the list route", "static": false, "count": 1, "nonDeterministic": false, @@ -165,7 +165,7 @@ }, { "path": "/api/41/pushAnalysis?paging=false", - "featureName": "Users should be able to navigate back to the job list", + "featureName": "Users should be able to navigate back to the list route", "static": false, "count": 1, "nonDeterministic": false, @@ -198,7 +198,7 @@ }, { "path": "/api/41/validationRuleGroups?paging=false", - "featureName": "Users should be able to navigate back to the job list", + "featureName": "Users should be able to navigate back to the list route", "static": false, "count": 1, "nonDeterministic": false, @@ -231,7 +231,7 @@ }, { "path": "/api/41/predictors?paging=false", - "featureName": "Users should be able to navigate back to the job list", + "featureName": "Users should be able to navigate back to the list route", "static": false, "count": 1, "nonDeterministic": false, @@ -264,7 +264,7 @@ }, { "path": "/api/41/predictorGroups?paging=false", - "featureName": "Users should be able to navigate back to the job list", + "featureName": "Users should be able to navigate back to the list route", "static": false, "count": 1, "nonDeterministic": false, @@ -297,7 +297,7 @@ }, { "path": "/api/41/dataIntegrity", - "featureName": "Users should be able to navigate back to the job list", + "featureName": "Users should be able to navigate back to the list route", "static": false, "count": 1, "nonDeterministic": false, diff --git a/cypress/integration/add-job/back-to-all-jobs.feature b/cypress/integration/add-job/back-to-all-jobs.feature index 528db2940..0e4959075 100644 --- a/cypress/integration/add-job/back-to-all-jobs.feature +++ b/cypress/integration/add-job/back-to-all-jobs.feature @@ -1,11 +1,11 @@ -Feature: Users should be able to navigate back to the job list +Feature: Users should be able to navigate back to the list route Background: Given the user navigated to the add job page Scenario: User clicks the cancel button When the user clicks the cancel button - Then the job list route will be loaded + Then the list route will be loaded Scenario: User clicks the cancel button after editing the form Given the user has edited the form diff --git a/cypress/integration/add-job/back-to-all-jobs/index.js b/cypress/integration/add-job/back-to-all-jobs/index.js index f7bd9a2b1..c8d66f61e 100644 --- a/cypress/integration/add-job/back-to-all-jobs/index.js +++ b/cypress/integration/add-job/back-to-all-jobs/index.js @@ -13,7 +13,7 @@ When('the user clicks the cancel button', () => { cy.findByRole('button', { name: 'Cancel' }).click() }) -Then('the job list route will be loaded', () => { +Then('the list route will be loaded', () => { cy.findByRole('heading', { name: 'Scheduled jobs' }).should('exist') }) diff --git a/cypress/integration/add-job/create-parameter-jobs.feature b/cypress/integration/add-job/create-parameter-jobs.feature index e48180004..2b7673f49 100644 --- a/cypress/integration/add-job/create-parameter-jobs.feature +++ b/cypress/integration/add-job/create-parameter-jobs.feature @@ -7,7 +7,7 @@ Feature: Users should be able to create jobs that take parameters And the user enters a schedule And the user enters the parameters for Then the expected job is created when the user saves the job - And the job list is loaded + And the list route is loaded Scenarios: | job-type | schedule-type | diff --git a/cypress/integration/add-job/create-parameter-jobs/index.js b/cypress/integration/add-job/create-parameter-jobs/index.js index f7d93ba6d..fc9a399ad 100644 --- a/cypress/integration/add-job/create-parameter-jobs/index.js +++ b/cypress/integration/add-job/create-parameter-jobs/index.js @@ -299,6 +299,6 @@ Then('the expected job is created when the user saves the predictor job', () => }) ) -Then('the job list is loaded', () => { +Then('the list route is loaded', () => { cy.findByRole('heading', { name: 'Scheduled jobs' }).should('exist') }) diff --git a/cypress/integration/add-job/create-parameterless-jobs.feature b/cypress/integration/add-job/create-parameterless-jobs.feature index 22b710778..df61580d0 100644 --- a/cypress/integration/add-job/create-parameterless-jobs.feature +++ b/cypress/integration/add-job/create-parameterless-jobs.feature @@ -6,7 +6,7 @@ Feature: Users should be able to create jobs without parameters And the user selects the job type And the user enters a cron schedule Then the expected job is created when the user saves the job - And the job list is loaded + And the list route is loaded Scenarios: | job-type | diff --git a/cypress/integration/add-job/create-parameterless-jobs/index.js b/cypress/integration/add-job/create-parameterless-jobs/index.js index 632fd9289..c0a459ae7 100644 --- a/cypress/integration/add-job/create-parameterless-jobs/index.js +++ b/cypress/integration/add-job/create-parameterless-jobs/index.js @@ -94,6 +94,6 @@ Then( }) ) -Then('the job list is loaded', () => { +Then('the list route is loaded', () => { cy.findByRole('heading', { name: 'Scheduled jobs' }).should('exist') }) diff --git a/cypress/integration/add-queue/back-to-all-jobs.feature b/cypress/integration/add-queue/back-to-all-jobs.feature index dea347dc9..faf5bc52b 100644 --- a/cypress/integration/add-queue/back-to-all-jobs.feature +++ b/cypress/integration/add-queue/back-to-all-jobs.feature @@ -1,11 +1,11 @@ -Feature: Users should be able to navigate back to the job list +Feature: Users should be able to navigate back to the list route Background: Given the user navigated to the add sequence page Scenario: User clicks the cancel button When the user clicks the cancel button - Then the job list route will be loaded + Then the list route will be loaded Scenario: User clicks the cancel button after editing the form Given the user has edited the form diff --git a/cypress/integration/add-queue/back-to-all-jobs/index.js b/cypress/integration/add-queue/back-to-all-jobs/index.js index 2e8fdae22..5a32ce290 100644 --- a/cypress/integration/add-queue/back-to-all-jobs/index.js +++ b/cypress/integration/add-queue/back-to-all-jobs/index.js @@ -13,7 +13,7 @@ When('the user clicks the cancel button', () => { cy.findByRole('button', { name: 'Cancel' }).click() }) -Then('the job list route will be loaded', () => { +Then('the list route will be loaded', () => { cy.findByRole('heading', { name: 'Scheduled jobs' }).should('exist') }) diff --git a/cypress/integration/add-queue/create-sequence.feature b/cypress/integration/add-queue/create-sequence.feature index e1ba7972a..7a71acc5a 100644 --- a/cypress/integration/add-queue/create-sequence.feature +++ b/cypress/integration/add-queue/create-sequence.feature @@ -7,4 +7,4 @@ Feature: Users should be able to create a sequence And the user enters a cron schedule And the user adds jobs to the queue Then the expected sequence is created when the user saves the sequence - And the job list is loaded + And the list route is loaded diff --git a/cypress/integration/add-queue/create-sequence/index.js b/cypress/integration/add-queue/create-sequence/index.js index 817852a92..a8371c5d8 100644 --- a/cypress/integration/add-queue/create-sequence/index.js +++ b/cypress/integration/add-queue/create-sequence/index.js @@ -59,6 +59,6 @@ Then('the expected sequence is created when the user saves the sequence', () => }) ) -Then('the job list is loaded', () => { +Then('the list route is loaded', () => { cy.findByRole('heading', { name: 'Scheduled jobs' }).should('exist') }) diff --git a/cypress/integration/edit-job/back-to-all-jobs.feature b/cypress/integration/edit-job/back-to-all-jobs.feature index adff034cc..02fcde4f2 100644 --- a/cypress/integration/edit-job/back-to-all-jobs.feature +++ b/cypress/integration/edit-job/back-to-all-jobs.feature @@ -1,4 +1,4 @@ -Feature: Users should be able to navigate back to the job list +Feature: Users should be able to navigate back to the list route Background: Given a single user job exists @@ -6,7 +6,7 @@ Feature: Users should be able to navigate back to the job list Scenario: User clicks the cancel button When the user clicks the cancel button - Then the job list route will be loaded + Then the list route will be loaded Scenario: User clicks the cancel button after editing the form Given the user has edited the form diff --git a/cypress/integration/edit-job/back-to-all-jobs/index.js b/cypress/integration/edit-job/back-to-all-jobs/index.js index e567d92cb..88f16fadd 100644 --- a/cypress/integration/edit-job/back-to-all-jobs/index.js +++ b/cypress/integration/edit-job/back-to-all-jobs/index.js @@ -20,7 +20,7 @@ When('the user clicks the cancel button', () => { cy.findByRole('button', { name: 'Cancel' }).click() }) -Then('the job list route will be loaded', () => { +Then('the list route will be loaded', () => { cy.findByRole('heading', { name: 'Scheduled jobs' }).should('exist') }) diff --git a/cypress/integration/edit-job/edit-parameter-jobs.feature b/cypress/integration/edit-job/edit-parameter-jobs.feature index 43e7e9c36..83b511959 100644 --- a/cypress/integration/edit-job/edit-parameter-jobs.feature +++ b/cypress/integration/edit-job/edit-parameter-jobs.feature @@ -8,7 +8,7 @@ Feature: Users should be able to edit jobs that take parameters And the user enters a schedule And the user enters the parameters for Then the job is updated when the user saves the job - And the job list is loaded + And the list route is loaded Scenarios: | job-type | schedule-type | diff --git a/cypress/integration/edit-job/edit-parameter-jobs/index.js b/cypress/integration/edit-job/edit-parameter-jobs/index.js index 2e8485edd..3a112e906 100644 --- a/cypress/integration/edit-job/edit-parameter-jobs/index.js +++ b/cypress/integration/edit-job/edit-parameter-jobs/index.js @@ -312,6 +312,6 @@ Then('the job is updated when the user saves the predictor job', () => }) ) -Then('the job list is loaded', () => { +Then('the list route is loaded', () => { cy.findByRole('heading', { name: 'Scheduled jobs' }).should('exist') }) diff --git a/cypress/integration/edit-job/edit-parameterless-jobs.feature b/cypress/integration/edit-job/edit-parameterless-jobs.feature index 5e046264b..35e92f5c4 100644 --- a/cypress/integration/edit-job/edit-parameterless-jobs.feature +++ b/cypress/integration/edit-job/edit-parameterless-jobs.feature @@ -7,7 +7,7 @@ Feature: Users should be able to edit jobs without parameters And the user selects the job type And the user enters a cron schedule Then the job is updated when the user saves the job - And the job list is loaded + And the list route is loaded Scenarios: | job-type | diff --git a/cypress/integration/edit-job/edit-parameterless-jobs/index.js b/cypress/integration/edit-job/edit-parameterless-jobs/index.js index eff23ce28..26f33b253 100644 --- a/cypress/integration/edit-job/edit-parameterless-jobs/index.js +++ b/cypress/integration/edit-job/edit-parameterless-jobs/index.js @@ -108,6 +108,6 @@ Then( }) ) -Then('the job list is loaded', () => { +Then('the list route is loaded', () => { cy.findByRole('heading', { name: 'Scheduled jobs' }).should('exist') }) diff --git a/cypress/integration/edit-queue/back-to-all-jobs.feature b/cypress/integration/edit-queue/back-to-all-jobs.feature index aa11a0703..0a99712c1 100644 --- a/cypress/integration/edit-queue/back-to-all-jobs.feature +++ b/cypress/integration/edit-queue/back-to-all-jobs.feature @@ -1,4 +1,4 @@ -Feature: Users should be able to navigate back to the job list +Feature: Users should be able to navigate back to the list route Background: Given a sequence exists @@ -6,7 +6,7 @@ Feature: Users should be able to navigate back to the job list Scenario: User clicks the cancel button When the user clicks the cancel button - Then the job list route will be loaded + Then the list route will be loaded Scenario: User clicks the cancel button after editing the form Given the user has edited the form diff --git a/cypress/integration/edit-queue/back-to-all-jobs/index.js b/cypress/integration/edit-queue/back-to-all-jobs/index.js index 3a4791bfd..8aa733a1c 100644 --- a/cypress/integration/edit-queue/back-to-all-jobs/index.js +++ b/cypress/integration/edit-queue/back-to-all-jobs/index.js @@ -35,7 +35,7 @@ When('the user clicks the cancel button', () => { cy.findByRole('button', { name: 'Cancel' }).click() }) -Then('the job list route will be loaded', () => { +Then('the list route will be loaded', () => { cy.findByRole('heading', { name: 'Scheduled jobs' }).should('exist') }) diff --git a/cypress/integration/edit-queue/edit-sequence.feature b/cypress/integration/edit-queue/edit-sequence.feature index fc62d1334..dc6766a19 100644 --- a/cypress/integration/edit-queue/edit-sequence.feature +++ b/cypress/integration/edit-queue/edit-sequence.feature @@ -7,4 +7,4 @@ Feature: Users should be able to edit a sequence And the user changes the cron schedule And the user adds jobs to the queue Then the sequence is updated when the user saves the sequence - And the job list is loaded + And the list route is loaded diff --git a/cypress/integration/edit-queue/edit-sequence/index.js b/cypress/integration/edit-queue/edit-sequence/index.js index 3af0aa687..671e137b5 100644 --- a/cypress/integration/edit-queue/edit-sequence/index.js +++ b/cypress/integration/edit-queue/edit-sequence/index.js @@ -76,6 +76,6 @@ Then('the sequence is updated when the user saves the sequence', () => }) ) -Then('the job list is loaded', () => { +Then('the list route is loaded', () => { cy.findByRole('heading', { name: 'Scheduled jobs' }).should('exist') }) diff --git a/cypress/integration/list/actions-system-job.feature b/cypress/integration/list/actions-system-job.feature index 0fe0d668e..72aeb359d 100644 --- a/cypress/integration/list/actions-system-job.feature +++ b/cypress/integration/list/actions-system-job.feature @@ -2,7 +2,7 @@ Feature: System job actions Scenario: User clicks the view job button on a system job Given a single system job exists - And the user navigated to the job list page + And the user navigated to the list route And the user checks the include-system-jobs-in-list checkbox And the user clicks the actions button When the user clicks the view button diff --git a/cypress/integration/list/actions-system-job/index.js b/cypress/integration/list/actions-system-job/index.js index e10a72367..78cf939e0 100644 --- a/cypress/integration/list/actions-system-job/index.js +++ b/cypress/integration/list/actions-system-job/index.js @@ -12,7 +12,7 @@ Given('a single system job exists', () => { ) }) -Given('the user navigated to the job list page', () => { +Given('the user navigated to the list route', () => { cy.visit('/') cy.findByRole('heading', { name: 'Scheduled jobs' }).should('exist') }) diff --git a/cypress/integration/list/actions-user-job.feature b/cypress/integration/list/actions-user-job.feature index ab78d65f4..1a2781dd4 100644 --- a/cypress/integration/list/actions-user-job.feature +++ b/cypress/integration/list/actions-user-job.feature @@ -2,7 +2,7 @@ Feature: User job actions Background: Given a single user job exists - And the user navigated to the job list page + And the user navigated to the list route And the user clicks the actions button Scenario: User clicks the edit job button on a user job diff --git a/cypress/integration/list/actions-user-job/index.js b/cypress/integration/list/actions-user-job/index.js index 1f7be45a8..7b1ff69f9 100644 --- a/cypress/integration/list/actions-user-job/index.js +++ b/cypress/integration/list/actions-user-job/index.js @@ -12,7 +12,7 @@ Given('a single user job exists', () => { ) }) -Given('the user navigated to the job list page', () => { +Given('the user navigated to the list route', () => { cy.visit('/') cy.findByRole('heading', { name: 'Scheduled jobs' }).should('exist') }) diff --git a/cypress/integration/list/filter.feature b/cypress/integration/list/filter.feature index b0a0bab08..9e8243904 100644 --- a/cypress/integration/list/filter.feature +++ b/cypress/integration/list/filter.feature @@ -2,13 +2,13 @@ Feature: Jobs can be filtered Scenario: User filters user jobs and queues by name Given some user jobs and queues exist - And the user navigated to the job list page + And the user navigated to the list route When the user enters a filter string Then only user jobs and queues that match the filter will be shown Scenario: User filters all jobs by name Given some user and system jobs exist - And the user navigated to the job list page + And the user navigated to the list route And the user enables the include-system-jobs-in-list toggle When the user enters a filter string Then only jobs that match the filter will be shown diff --git a/cypress/integration/list/filter/index.js b/cypress/integration/list/filter/index.js index dec698f13..5f844ddcf 100644 --- a/cypress/integration/list/filter/index.js +++ b/cypress/integration/list/filter/index.js @@ -14,7 +14,7 @@ Given('some user and system jobs exist', () => { ) }) -Given('the user navigated to the job list page', () => { +Given('the user navigated to the list route', () => { cy.visit('/') cy.findByRole('heading', { name: 'Scheduled jobs' }).should('exist') }) diff --git a/cypress/integration/list/include-system-jobs.feature b/cypress/integration/list/include-system-jobs.feature index ba04abcc9..cb1bc40fa 100644 --- a/cypress/integration/list/include-system-jobs.feature +++ b/cypress/integration/list/include-system-jobs.feature @@ -2,13 +2,13 @@ Feature: System job visibility can be toggled Scenario: System jobs are not shown by default Given some user and system jobs exist - And the user navigated to the job list page + And the user navigated to the list route Then the include-system-jobs-in-list checkbox is unchecked And system jobs are not shown Scenario: User toggles system job visibility Given some user and system jobs exist - And the user navigated to the job list page + And the user navigated to the list route And the include-system-jobs-in-list checkbox is unchecked When the user checks the include-system-jobs-in-list checkbox Then system jobs are shown diff --git a/cypress/integration/list/include-system-jobs/index.js b/cypress/integration/list/include-system-jobs/index.js index bba2cb10a..505bdca5e 100644 --- a/cypress/integration/list/include-system-jobs/index.js +++ b/cypress/integration/list/include-system-jobs/index.js @@ -14,7 +14,7 @@ Given('some user and system jobs exist', () => { ) }) -Given('the user navigated to the job list page', () => { +Given('the user navigated to the list route', () => { cy.visit('/') cy.findByRole('heading', { name: 'Scheduled jobs' }).should('exist') }) diff --git a/cypress/integration/list/info-link.feature b/cypress/integration/list/info-link.feature index 47c966612..be20ce3ac 100644 --- a/cypress/integration/list/info-link.feature +++ b/cypress/integration/list/info-link.feature @@ -1,5 +1,5 @@ Feature: Users should be able to navigate to the documentation Scenario: There is a documentation link - Given the user navigated to the job list page + Given the user navigated to the list route Then there is a link to the documentation diff --git a/cypress/integration/list/info-link/index.js b/cypress/integration/list/info-link/index.js index 4b9d6ef64..bfb819139 100644 --- a/cypress/integration/list/info-link/index.js +++ b/cypress/integration/list/info-link/index.js @@ -3,7 +3,7 @@ import { Given, Then } from 'cypress-cucumber-preprocessor/steps' const infoHref = 'https://docs.dhis2.org/en/use/user-guides/dhis-core-version-master/maintaining-the-system/scheduling.html' -Given('the user navigated to the job list page', () => { +Given('the user navigated to the list route', () => { cy.visit('/') cy.findByRole('heading', { name: 'Scheduled jobs' }).should('exist') }) diff --git a/cypress/integration/list/list-user-jobs.feature b/cypress/integration/list/list-user-jobs.feature index 4f16aaeed..d35f026a9 100644 --- a/cypress/integration/list/list-user-jobs.feature +++ b/cypress/integration/list/list-user-jobs.feature @@ -2,10 +2,10 @@ Feature: All user defined jobs should be listed Scenario: No user jobs exist Given there are no user jobs - And the user navigated to the job list page + And the user navigated to the list route Then the table should contain a cell that states that there are no jobs Scenario: Some user jobs exist Given some user jobs exist - And the user navigated to the job list page + And the user navigated to the list route Then the user jobs are rendered as tabular data diff --git a/cypress/integration/list/list-user-jobs/index.js b/cypress/integration/list/list-user-jobs/index.js index 1a4a19985..74bac0407 100644 --- a/cypress/integration/list/list-user-jobs/index.js +++ b/cypress/integration/list/list-user-jobs/index.js @@ -14,7 +14,7 @@ Given('some user jobs exist', () => { ) }) -Given('the user navigated to the job list page', () => { +Given('the user navigated to the list route', () => { cy.visit('/') cy.findByRole('heading', { name: 'Scheduled jobs' }).should('exist') }) diff --git a/cypress/integration/list/toggle-job.feature b/cypress/integration/list/toggle-job.feature index 3391765df..95e78f65d 100644 --- a/cypress/integration/list/toggle-job.feature +++ b/cypress/integration/list/toggle-job.feature @@ -2,14 +2,14 @@ Feature: User jobs can be enabled and disabled Scenario: The user enables a user job Given a disabled user job exists - And the user navigated to the job list page + And the user navigated to the list route And the job toggle switch is off When the user clicks the disabled job toggle switch Then the job toggle switch is on Scenario: The user disables a user job Given an enabled user job exists - And the user navigated to the job list page + And the user navigated to the list route And the job toggle switch is on When the user clicks the enabled job toggle switch Then the job toggle switch is off diff --git a/cypress/integration/list/toggle-job/index.js b/cypress/integration/list/toggle-job/index.js index e9e8f9e97..1ee4763cd 100644 --- a/cypress/integration/list/toggle-job/index.js +++ b/cypress/integration/list/toggle-job/index.js @@ -14,7 +14,7 @@ Given('an enabled user job exists', () => { ) }) -Given('the user navigated to the job list page', () => { +Given('the user navigated to the list route', () => { cy.visit('/') cy.findByRole('heading', { name: 'Scheduled jobs' }).should('exist') }) diff --git a/cypress/integration/view-job/back-to-all-jobs.feature b/cypress/integration/view-job/back-to-all-jobs.feature index e3152ce88..ffd533984 100644 --- a/cypress/integration/view-job/back-to-all-jobs.feature +++ b/cypress/integration/view-job/back-to-all-jobs.feature @@ -1,6 +1,6 @@ -Feature: Users should be able to navigate back to the job list +Feature: Users should be able to navigate back to the list route - Scenario: There is a link to the job list + Scenario: There is a link to the list route Given a single system job exists And the user navigated to the view job page - Then there is a link to the job list page + Then there is a link to the list route diff --git a/cypress/integration/view-job/back-to-all-jobs/index.js b/cypress/integration/view-job/back-to-all-jobs/index.js index 3acead72b..346be9f42 100644 --- a/cypress/integration/view-job/back-to-all-jobs/index.js +++ b/cypress/integration/view-job/back-to-all-jobs/index.js @@ -14,7 +14,7 @@ Given('the user navigated to the view job page', () => { ) }) -Then('there is a link to the job list page', () => { +Then('there is a link to the list route', () => { cy.findByRole('link', { name: 'Back to all jobs' }).should( 'have.attr', 'href',