diff --git a/.github/workflows/verify-app.yml b/.github/workflows/verify-app.yml index 9a10948e6e..8731720ceb 100644 --- a/.github/workflows/verify-app.yml +++ b/.github/workflows/verify-app.yml @@ -94,7 +94,7 @@ jobs: instance-version: runs-on: ubuntu-latest - needs: [lint, flow, unit-tests] + needs: install # [lint, flow, unit-tests] if: "!(startsWith(github.event.head_commit.message, 'fix(translations)') && github.actor == 'dhis2-bot') && !contains(github.event.head_commit.message, '[skip ci]')" outputs: version: ${{ steps.instance-version.outputs.version }} @@ -108,7 +108,7 @@ jobs: cypress-dev: runs-on: ubuntu-latest - needs: install + needs: instance-version strategy: # when one test fails, DO NOT cancel the other # containers, because this will kill Cypress processes diff --git a/cypress.config.js b/cypress.config.js index 753205f475..837af5437d 100644 --- a/cypress.config.js +++ b/cypress.config.js @@ -2,22 +2,11 @@ const { chromeAllowXSiteCookies } = require('@dhis2/cypress-plugins'); const { defineConfig } = require('cypress'); const getCypressEnvVariables = require('./cypress/support/getCypressEnvVariables'); const cucumberPreprocessor = require('./cypress/support/cucumberPreprocessor'); -const path = require('path'); async function setupNodeEvents(on, config) { await chromeAllowXSiteCookies(on); await cucumberPreprocessor(on, config); - on('before:browser:launch', (browser, launchOptions) => { - if (browser.family === 'chromium' && browser.name !== 'electron') { - launchOptions.extensions.push(path.join(__dirname, '/ignore-x-frame-headers')); - launchOptions - .args - .push('--disable-features=SameSiteByDefaultCookies,CookiesWithoutSameSiteMustBeSecure,SameSiteDefaultChecksMethodRigorously'); - } - return launchOptions; - }); - config.env = getCypressEnvVariables(config); return config; }