feat: remove store

.github/workflows/dhis2-verify-app.yml

@@ -95,19 +95,19 @@ jobs:
               with:
                   node-version: 16
             - name: End-to-End tests
-              uses: cypress-io/github-action@v2
+              uses: cypress-io/github-action@v5
               with:
-                  start: yarn start:nobrowser
-                  wait-on: 'http://localhost:3000'
-                  wait-on-timeout: 300
+                  start: npx --yes @dhis2/cli-cluster up 2.40 --channel dev --db-version 2.40 --seed, yarn start:nobrowser
+                  wait-on: 'http://localhost:8080/dhis-web-commons/security/login.action, http://localhost:3000'
+                  wait-on-timeout: 600
                   record: true
                   parallel: true
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                   CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
-                  CYPRESS_dhis2BaseUrl: http://localhost:8080
-                  CYPRESS_dhis2ApiVersion: 40
-                  CYPRESS_networkMode: stub
+                  CYPRESS_LOGIN_NAME: ${{ secrets.CYPRESS_LOGIN_NAME }}
+                  CYPRESS_LOGIN_PASSWORD: ${{ secrets.CYPRESS_LOGIN_PASSWORD }}
+                  CYPRESS_LOGIN_SERVER: http://localhost:8080
 
     release:
         runs-on: ubuntu-latest

cypress.config.js

@@ -0,0 +1,50 @@
+// eslint-disable-next-line import/no-unused-modules
+const { defineConfig } = require('cypress')
+const webpack = require('@cypress/webpack-preprocessor')
+const preprocessor = require('@badeball/cypress-cucumber-preprocessor')
+
+/**
+ * Configuration for the cypress-cucumber preprocessing, see:
+ * https://github.com/badeball/cypress-cucumber-preprocessor/tree/master/examples/webpack-cjs
+ */
+async function setupNodeEvents(on, config) {
+    // This is required for the preprocessor to be able to generate JSON reports after each run, and more,
+    await preprocessor.addCucumberPreprocessorPlugin(on, config)
+
+    on(
+        'file:preprocessor',
+        webpack({
+            webpackOptions: {
+                resolve: {
+                    extensions: ['.ts', '.js'],
+                },
+                module: {
+                    rules: [
+                        {
+                            test: /\.feature$/,
+                            use: [
+                                {
+                                    loader: '@badeball/cypress-cucumber-preprocessor/webpack',
+                                    options: config,
+                                },
+                            ],
+                        },
+                    ],
+                },
+            },
+        })
+    )
+
+    // Make sure to return the config object as it might have been modified by the plugin.
+    return config
+}
+
+module.exports = defineConfig({
+    projectId: 'sc56ms',
+    video: false,
+    e2e: {
+        setupNodeEvents,
+        baseUrl: 'http://localhost:3000',
+        specPattern: 'cypress/e2e/**/*.feature',
+    },
+})

cypress.env.json.example

@@ -1,5 +1,5 @@
 {
-    "dhis2BaseUrl": "http://localhost:8080",
-    "dhis2Username": "USERNAME_HERE",
-    "dhis2Password": "PASSWORD_HERE"
+  "LOGIN_NAME": "login name here",
+  "LOGIN_PASSWORD": "password here",
+  "LOGIN_SERVER": "https://debug.dhis2.org/dev"
 }

cypress/integration/add-route/back-to-all-jobs/index.js → cypress/e2e/add-route/back-to-all-jobs/index.js

@@ -1,4 +1,4 @@
-import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps'
+import { Given, When, Then } from '@badeball/cypress-cucumber-preprocessor'
 
 Given('the user navigated to the add job page', () => {
     cy.visit('/#/add')

cypress/integration/add-route/create-parameter-jobs/index.js → cypress/e2e/add-route/create-parameter-jobs/index.js

@@ -1,4 +1,4 @@
-import { Given, Then } from 'cypress-cucumber-preprocessor/steps'
+import { Given, Then } from '@badeball/cypress-cucumber-preprocessor'
 
 /**
  * Local helpers

cypress/integration/add-route/create-parameterless-jobs/index.js → cypress/e2e/add-route/create-parameterless-jobs/index.js

@@ -1,4 +1,4 @@
-import { Given, Then } from 'cypress-cucumber-preprocessor/steps'
+import { Given, Then } from '@badeball/cypress-cucumber-preprocessor'
 
 /**
  * Local helpers

cypress/integration/add-route/cron-presets.feature → cypress/e2e/add-route/cron-presets.feature

@@ -2,6 +2,7 @@ Feature: Users should be able to insert cron presets
 
     Scenario: User inserts a cron preset
         Given the user navigated to the add job page
+        And the job types have loaded
         And the user selects a cron scheduled job type
         When the user clicks the choose from preset times button
         And selects a cron preset from the modal
@@ -10,6 +11,7 @@ Feature: Users should be able to insert cron presets
 
     Scenario: User cancels inserting a cron preset
         Given the user navigated to the add job page
+        And the job types have loaded
         And the user selects a cron scheduled job type
         When the user clicks the choose from preset times button
         And selects a cron preset from the modal

cypress/integration/add-route/cron-presets/index.js → cypress/e2e/add-route/cron-presets/index.js

@@ -1,10 +1,17 @@
-import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps'
+import { Given, When, Then } from '@badeball/cypress-cucumber-preprocessor'
 
 Given('the user navigated to the add job page', () => {
     cy.visit('/#/add')
     cy.findByRole('heading', { name: 'New Job' }).should('exist')
 })
 
+Given('the job types have loaded', () => {
+    cy.get('[data-test="dhis2-uicore-select-input"]').should(
+        'not.have.class',
+        'disabled'
+    )
+})
+
 Given('the user selects a cron scheduled job type', () => {
     cy.get('[data-test="dhis2-uicore-select-input"]').click()
     cy.findByText('Data integrity').click()

cypress/integration/add-route/info-link/index.js → cypress/e2e/add-route/info-link/index.js

@@ -1,4 +1,4 @@
-import { Given, Then } from 'cypress-cucumber-preprocessor/steps'
+import { Given, Then } from '@badeball/cypress-cucumber-preprocessor'
 
 const infoHref =
     'https://docs.dhis2.org/en/use/user-guides/dhis-core-version-236/maintaining-the-system/scheduling.html'

cypress/integration/edit-route/back-to-all-jobs/index.js → cypress/e2e/edit-route/back-to-all-jobs/index.js

@@ -1,4 +1,4 @@
-import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps'
+import { Given, When, Then } from '@badeball/cypress-cucumber-preprocessor'
 
 Given('a single user job exists', () => {
     cy.intercept(

cypress/integration/edit-route/cron-presets/index.js → cypress/e2e/edit-route/cron-presets/index.js

@@ -1,4 +1,4 @@
-import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps'
+import { Given, When, Then } from '@badeball/cypress-cucumber-preprocessor'
 
 Given('a single cron scheduled user job exists', () => {
     cy.intercept(

cypress/integration/edit-route/delete-button/index.js → cypress/e2e/edit-route/delete-button/index.js

@@ -1,4 +1,4 @@
-import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps'
+import { Given, When, Then } from '@badeball/cypress-cucumber-preprocessor'
 
 Given('a single user job exists', () => {
     cy.intercept(

cypress/integration/edit-route/display-jobs/index.js → cypress/e2e/edit-route/display-jobs/index.js

@@ -1,4 +1,4 @@
-import { Given, Then } from 'cypress-cucumber-preprocessor/steps'
+import { Given, Then } from '@badeball/cypress-cucumber-preprocessor'
 
 Given('a single user job exists', () => {
     cy.intercept(

cypress/integration/edit-route/edit-parameter-jobs/index.js → cypress/e2e/edit-route/edit-parameter-jobs/index.js

@@ -1,4 +1,4 @@
-import { Given, Then } from 'cypress-cucumber-preprocessor/steps'
+import { Given, Then } from '@badeball/cypress-cucumber-preprocessor'
 
 /**
  * Local helpers

cypress/integration/edit-route/edit-parameterless-jobs/index.js → cypress/e2e/edit-route/edit-parameterless-jobs/index.js

@@ -1,4 +1,4 @@
-import { Given, Then } from 'cypress-cucumber-preprocessor/steps'
+import { Given, Then } from '@badeball/cypress-cucumber-preprocessor'
 
 /**
  * Local helpers

cypress/integration/edit-route/info-link/index.js → cypress/e2e/edit-route/info-link/index.js

@@ -1,4 +1,4 @@
-import { Given, Then } from 'cypress-cucumber-preprocessor/steps'
+import { Given, Then } from '@badeball/cypress-cucumber-preprocessor'
 
 const infoHref =
     'https://docs.dhis2.org/en/use/user-guides/dhis-core-version-236/maintaining-the-system/scheduling.html'

cypress/integration/list-route/filter-jobs/index.js → cypress/e2e/list-route/filter-jobs/index.js

@@ -1,15 +1,15 @@
-import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps'
+import { Given, When, Then } from '@badeball/cypress-cucumber-preprocessor'
 
 Given('some user jobs exist', () => {
     cy.intercept(
-        { pathname: /jobConfigurations$/ },
+        { pathname: /scheduler$/ },
         { fixture: 'list-route/some-user-jobs' }
     )
 })
 
 Given('some user and system jobs exist', () => {
     cy.intercept(
-        { pathname: /jobConfigurations$/ },
+        { pathname: /scheduler$/ },
         { fixture: 'list-route/some-user-and-system-jobs' }
     )
 })

cypress/integration/list-route/include-system-jobs/index.js → cypress/e2e/list-route/include-system-jobs/index.js

@@ -1,15 +1,15 @@
-import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps'
+import { Given, When, Then } from '@badeball/cypress-cucumber-preprocessor'
 
 Given('some user jobs exist', () => {
     cy.intercept(
-        { pathname: /jobConfigurations$/ },
+        { pathname: /scheduler$/ },
         { fixture: 'list-route/some-user-jobs' }
     )
 })
 
 Given('some user and system jobs exist', () => {
     cy.intercept(
-        { pathname: /jobConfigurations$/ },
+        { pathname: /scheduler$/ },
         { fixture: 'list-route/some-user-and-system-jobs' }
     )
 })

cypress/integration/list-route/info-link/index.js → cypress/e2e/list-route/info-link/index.js

@@ -1,4 +1,4 @@
-import { Given, Then } from 'cypress-cucumber-preprocessor/steps'
+import { Given, Then } from '@badeball/cypress-cucumber-preprocessor'
 
 const infoHref =
     'https://docs.dhis2.org/en/use/user-guides/dhis-core-version-236/maintaining-the-system/scheduling.html'

cypress/integration/list-route/job-toggle.feature → cypress/e2e/list-route/job-toggle.feature

@@ -4,12 +4,12 @@ Feature: User jobs can be enabled and disabled
         Given a disabled user job exists
         And the user navigated to the job list page
         And the job toggle switch is off
-        When the user clicks the job toggle switch
+        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 job toggle switch is on
-        When the user clicks the job toggle switch
+        When the user clicks the enabled job toggle switch
         Then the job toggle switch is off

cypress/e2e/list-route/job-toggle/index.js

@@ -0,0 +1,48 @@
+import { Given, When, Then } from '@badeball/cypress-cucumber-preprocessor'
+
+Given('a disabled user job exists', () => {
+    cy.intercept(
+        { pathname: /scheduler$/ },
+        { fixture: 'list-route/disabled-user-job' }
+    )
+})
+
+Given('an enabled user job exists', () => {
+    cy.intercept(
+        { pathname: /scheduler$/ },
+        { fixture: 'list-route/enabled-user-job' }
+    )
+})
+
+Given('the user navigated to the job list page', () => {
+    cy.visit('/')
+    cy.findByRole('heading', { name: 'Scheduled jobs' }).should('exist')
+})
+
+Given('the job toggle switch is off', () => {
+    cy.findByRole('switch', { name: 'Toggle job' }).should('not.be.checked')
+})
+
+When('the user clicks the enabled job toggle switch', () => {
+    cy.intercept({ pathname: /lnWRZN67iDU$/ }, { statusCode: 204 })
+    cy.intercept(
+        { pathname: /scheduler$/ },
+        { fixture: 'list-route/disabled-user-job' }
+    )
+
+    cy.findByRole('switch', { name: 'Toggle job' }).click()
+})
+
+When('the user clicks the disabled job toggle switch', () => {
+    cy.intercept({ pathname: /lnWRZN67iDU$/ }, { statusCode: 204 })
+    cy.intercept(
+        { pathname: /scheduler$/ },
+        { fixture: 'list-route/enabled-user-job' }
+    )
+
+    cy.findByRole('switch', { name: 'Toggle job' }).click()
+})
+
+Then('the job toggle switch is on', () => {
+    cy.findByRole('switch', { name: 'Toggle job' }).should('be.checked')
+})

cypress/integration/list-route/list-user-jobs/index.js → cypress/e2e/list-route/list-user-jobs/index.js

@@ -1,15 +1,12 @@
-import { Given, Then } from 'cypress-cucumber-preprocessor/steps'
+import { Given, Then } from '@badeball/cypress-cucumber-preprocessor'
 
 Given('there are no user jobs', () => {
-    cy.intercept(
-        { pathname: /jobConfigurations$/ },
-        { fixture: 'list-route/no-jobs' }
-    )
+    cy.intercept({ pathname: /scheduler$/ }, { fixture: 'list-route/no-jobs' })
 })
 
 Given('some user jobs exist', () => {
     cy.intercept(
-        { pathname: /jobConfigurations$/ },
+        { pathname: /scheduler$/ },
         { fixture: 'list-route/some-user-jobs' }
     )
 })

cypress/integration/list-route/new-job/index.js → cypress/e2e/list-route/new-job/index.js

@@ -1,4 +1,4 @@
-import { Given, Then } from 'cypress-cucumber-preprocessor/steps'
+import { Given, Then } from '@badeball/cypress-cucumber-preprocessor'
 
 Given('the user navigated to the job list page', () => {
     cy.visit('/')

cypress/integration/list-route/system-job-actions/index.js → cypress/e2e/list-route/system-job-actions/index.js

@@ -1,10 +1,15 @@
-import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps'
+import { Given, When, Then } from '@badeball/cypress-cucumber-preprocessor'
 
 Given('a single system job exists', () => {
     cy.intercept(
-        { pathname: /jobConfigurations$/ },
+        { pathname: /scheduler$/ },
         { fixture: 'list-route/single-system-job' }
     )
+
+    cy.intercept(
+        { pathname: /jobConfigurations$/ },
+        { fixture: 'list-route/single-system-job-job-configurations' }
+    )
 })
 
 Given('the user navigated to the job list page', () => {

cypress/integration/list-route/user-job-actions/index.js → cypress/e2e/list-route/user-job-actions/index.js

@@ -1,10 +1,15 @@
-import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps'
+import { Given, When, Then } from '@badeball/cypress-cucumber-preprocessor'
 
 Given('a single user job exists', () => {
     cy.intercept(
-        { pathname: /jobConfigurations$/ },
+        { pathname: /scheduler$/ },
         { fixture: 'list-route/single-user-job' }
     )
+
+    cy.intercept(
+        { pathname: /jobConfigurations$/ },
+        { fixture: 'list-route/single-user-job-job-configurations' }
+    )
 })
 
 Given('the user navigated to the job list page', () => {

cypress/integration/not-authorized-route/block-unauthorized/index.js → cypress/e2e/not-authorized-route/block-unauthorized/index.js

@@ -1,4 +1,4 @@
-import { Given, Then } from 'cypress-cucumber-preprocessor/steps'
+import { Given, Then } from '@badeball/cypress-cucumber-preprocessor'
 
 Given('an unauthorized user navigates to the app', () => {
     cy.intercept(

cypress/integration/view-route/back-to-all-jobs/index.js → cypress/e2e/view-route/back-to-all-jobs/index.js

@@ -1,4 +1,4 @@
-import { Given, Then } from 'cypress-cucumber-preprocessor/steps'
+import { Given, Then } from '@badeball/cypress-cucumber-preprocessor'
 
 Given('a single system job exists', () => {
     cy.intercept(

cypress/integration/view-route/display-jobs/index.js → cypress/e2e/view-route/display-jobs/index.js

@@ -1,4 +1,4 @@
-import { Given, Then } from 'cypress-cucumber-preprocessor/steps'
+import { Given, Then } from '@badeball/cypress-cucumber-preprocessor'
 
 Given('a single system job exists', () => {
     cy.intercept(

cypress/integration/view-route/info-link/index.js → cypress/e2e/view-route/info-link/index.js

@@ -1,4 +1,4 @@
-import { Given, Then } from 'cypress-cucumber-preprocessor/steps'
+import { Given, Then } from '@badeball/cypress-cucumber-preprocessor'
 
 const infoHref =
     'https://docs.dhis2.org/en/use/user-guides/dhis-core-version-236/maintaining-the-system/scheduling.html'