Skip to content

Commit

Permalink
refactor: align terms
Browse files Browse the repository at this point in the history
  • Loading branch information
ismay committed Nov 30, 2023
1 parent f7acc29 commit 7940f0f
Show file tree
Hide file tree
Showing 37 changed files with 56 additions and 56 deletions.
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions cypress/integration/add-job/back-to-all-jobs.feature
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/add-job/back-to-all-jobs/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})

Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/add-job/create-parameter-jobs.feature
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Feature: Users should be able to create jobs that take parameters
And the user enters a <schedule-type> schedule
And the user enters the parameters for <job-type>
Then the expected job is created when the user saves the <job-type> job
And the job list is loaded
And the list route is loaded

Scenarios:
| job-type | schedule-type |
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/add-job/create-parameter-jobs/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Feature: Users should be able to create jobs without parameters
And the user selects the <job-type> job type
And the user enters a cron schedule
Then the expected job is created when the user saves the <job-type> job
And the job list is loaded
And the list route is loaded

Scenarios:
| job-type |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})
4 changes: 2 additions & 2 deletions cypress/integration/add-queue/back-to-all-jobs.feature
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/add-queue/back-to-all-jobs/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})

Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/add-queue/create-sequence.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion cypress/integration/add-queue/create-sequence/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})
4 changes: 2 additions & 2 deletions cypress/integration/edit-job/back-to-all-jobs.feature
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
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
And the user navigated to the edit 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
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/edit-job/back-to-all-jobs/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})

Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/edit-job/edit-parameter-jobs.feature
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Feature: Users should be able to edit jobs that take parameters
And the user enters a <schedule-type> schedule
And the user enters the parameters for <job-type>
Then the job is updated when the user saves the <job-type> job
And the job list is loaded
And the list route is loaded

Scenarios:
| job-type | schedule-type |
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/edit-job/edit-parameter-jobs/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Feature: Users should be able to edit jobs without parameters
And the user selects the <job-type> job type
And the user enters a cron schedule
Then the job is updated when the user saves the <job-type> job
And the job list is loaded
And the list route is loaded

Scenarios:
| job-type |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})
4 changes: 2 additions & 2 deletions cypress/integration/edit-queue/back-to-all-jobs.feature
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
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
And the user navigates to the edit 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
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/edit-queue/back-to-all-jobs/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})

Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/edit-queue/edit-sequence.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion cypress/integration/edit-queue/edit-sequence/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})
2 changes: 1 addition & 1 deletion cypress/integration/list/actions-system-job.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/list/actions-system-job/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/list/actions-user-job.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/list/actions-user-job/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})
Expand Down
4 changes: 2 additions & 2 deletions cypress/integration/list/filter.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion cypress/integration/list/filter/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})
Expand Down
4 changes: 2 additions & 2 deletions cypress/integration/list/include-system-jobs.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/list/include-system-jobs/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/list/info-link.feature
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion cypress/integration/list/info-link/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})
Expand Down
4 changes: 2 additions & 2 deletions cypress/integration/list/list-user-jobs.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading

0 comments on commit 7940f0f

Please sign in to comment.