refactor: update to cypress 13

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-job/back-to-all-jobs/index.js → cypress/e2e/add-job/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 route', () => {
     cy.visit('/#/job/add')

cypress/integration/add-job/create-parameter-jobs/index.js → cypress/e2e/add-job/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-job/create-parameterless-jobs/index.js → cypress/e2e/add-job/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-job/cron-presets/index.js → cypress/e2e/add-job/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('the user navigated to the add job route', () => {
     cy.visit('/#/job/add')

cypress/integration/add-job/info-link/index.js → cypress/e2e/add-job/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-master/maintaining-the-system/scheduling.html'

cypress/integration/add-queue/back-to-all-jobs/index.js → cypress/e2e/add-queue/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 queue route', () => {
     cy.visit('/#/queue/add')

cypress/integration/add-queue/create-queue/index.js → cypress/e2e/add-queue/create-queue/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-job/back-to-all-jobs/index.js → cypress/e2e/edit-job/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-job/cron-presets/index.js → cypress/e2e/edit-job/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-job/delete-button/index.js → cypress/e2e/edit-job/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-job/display-jobs/index.js → cypress/e2e/edit-job/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-job/edit-parameter-jobs/index.js → cypress/e2e/edit-job/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-job/edit-parameterless-jobs/index.js → cypress/e2e/edit-job/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-job/info-link/index.js → cypress/e2e/edit-job/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-master/maintaining-the-system/scheduling.html'

cypress/integration/edit-queue/back-to-all-jobs/index.js → cypress/e2e/edit-queue/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 queue exists', () => {
     cy.intercept(

cypress/integration/edit-queue/edit-queue/index.js → cypress/e2e/edit-queue/edit-queue/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/list/actions-queue/index.js → cypress/e2e/list/actions-queue/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 queue exists', () => {
     cy.intercept(

cypress/integration/list/actions-system-job/index.js → cypress/e2e/list/actions-system-job/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 system job exists', () => {
     cy.intercept(

cypress/integration/list/actions-user-job/index.js → cypress/e2e/list/actions-user-job/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/list/filter/index.js → cypress/e2e/list/filter/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('some user jobs and queues exist', () => {
     cy.intercept(

cypress/integration/list/include-system-jobs/index.js → cypress/e2e/list/include-system-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('some user jobs exist', () => {
     cy.intercept(

cypress/integration/list/info-link/index.js → cypress/e2e/list/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-master/maintaining-the-system/scheduling.html'

cypress/integration/list/list-queues/index.js → cypress/e2e/list/list-queues/index.js

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

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

@@ -1,4 +1,4 @@
-import { Given, Then } from 'cypress-cucumber-preprocessor/steps'
+import { Given, Then } from '@badeball/cypress-cucumber-preprocessor'
 
 Given('there are no user jobs', () => {
     cy.intercept(

cypress/integration/list/new-job/index.js → cypress/e2e/list/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 list route', () => {
     cy.visit('/')

cypress/integration/list/new-queue/index.js → cypress/e2e/list/new-queue/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 list route', () => {
     cy.visit('/')

cypress/integration/list/toggle-job/index.js → cypress/e2e/list/toggle-job/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 disabled user job exists', () => {
     cy.intercept(

cypress/integration/list/toggle-queue/index.js → cypress/e2e/list/toggle-queue/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 disabled queue exists', () => {
     cy.intercept(

cypress/integration/not-authorized/block-unauthorized/index.js → cypress/e2e/not-authorized/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-job/back-to-all-jobs/index.js → cypress/e2e/view-job/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-job/display-jobs/index.js → cypress/e2e/view-job/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-job/info-link/index.js → cypress/e2e/view-job/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-master/maintaining-the-system/scheduling.html'

cypress/support/e2e.js

@@ -0,0 +1,47 @@
+/* global Cypress */
+import '@testing-library/cypress/add-commands'
+
+/**
+ * Custom login command, can be used to login or switch between sessions.
+ * Will cache and restore cookies, localStorage, and sessionStorage. See:
+ * https://docs.cypress.io/api/commands/session
+ */
+Cypress.Commands.add('login', (user) => {
+    cy.session(
+        user,
+        () => {
+            // Login via API
+            cy.request({
+                url: `${user.server}/dhis-web-commons-security/login.action`,
+                method: 'POST',
+                form: true,
+                followRedirect: true,
+                body: {
+                    j_username: user.name,
+                    j_password: user.password,
+                    '2fa_code': '',
+                },
+            })
+
+            // Set base url for the app platform
+            window.localStorage.setItem('DHIS2_BASE_URL', user.server)
+        },
+        {
+            validate: () => {
+                cy.request(`${user.server}/api/me`).then((response) => {
+                    expect(response.status).to.eq(200)
+                    expect(response.body.username).to.eq(user.name)
+                })
+            },
+        }
+    )
+})
+
+// Log in before each test, if not already logged in
+beforeEach(() => {
+    cy.login({
+        name: Cypress.env('LOGIN_NAME'),
+        password: Cypress.env('LOGIN_PASSWORD'),
+        server: Cypress.env('LOGIN_SERVER'),
+    })
+})

package.json

@@ -11,9 +11,7 @@
         "lint:css": "stylelint './src/**/*.css' && prettier './src/**/*.css' --check",
         "format": "d2-style apply && yarn format:css",
         "format:css": "prettier './src/**/*.css' --write",
-        "cypress:capture": "start-server-and-test 'yarn start:nobrowser' http://localhost:3000 'yarn cypress run --env networkMode=capture'",
-        "cypress:stub": "start-server-and-test 'yarn start:nobrowser' http://localhost:3000 'yarn cypress run --env networkMode=stub'",
-        "cypress:live": "start-server-and-test 'yarn start:nobrowser' http://localhost:3000 'yarn cypress open --env networkMode=live'"
+        "cypress": "start-server-and-test 'yarn start:nobrowser' 3000 'yarn exec cypress open'"
     },
     "dependencies": {
         "@dhis2/app-runtime": "^3.8.0",
@@ -32,23 +30,21 @@
         "styled-jsx": "^4.0.1"
     },
     "devDependencies": {
+        "@badeball/cypress-cucumber-preprocessor": "^20.0.3",
+        "@cypress/webpack-preprocessor": "^6.0.1",
         "@dhis2/cli-app-scripts": "^10.3.9",
         "@dhis2/cli-style": "^10.4.1",
-        "@dhis2/cli-utils-cypress": "^9.0.2",
-        "@dhis2/cypress-commands": "^9.0.2",
-        "@dhis2/cypress-plugins": "^9.0.2",
         "@testing-library/cypress": "^7.0.6",
         "@testing-library/react-hooks": "^7.0.0",
-        "cypress": "^9.5.1",
-        "cypress-cucumber-preprocessor": "^4.3.1",
+        "cypress": "^13.7.2",
         "enzyme": "^3.10.0",
         "enzyme-adapter-react-16": "^1.15.6",
         "eslint-plugin-compat": "^3.9.0",
         "eslint-plugin-i18next": "^5.1.1",
         "eslint-plugin-import": "^2.23.4",
         "eslint-plugin-jsx-a11y": "^6.4.1",
         "identity-obj-proxy": "^3.0.0",
-        "start-server-and-test": "^1.12.5",
+        "start-server-and-test": "^2.0.3",
         "stylelint": "^13.13.1",
         "stylelint-config-prettier": "^8.0.2",
         "stylelint-config-standard": "^22.0.0",