Skip to content

Commit

Permalink
chore: test
Browse files Browse the repository at this point in the history
  • Loading branch information
eirikhaugstulen committed Oct 19, 2023
1 parent c9f2076 commit a4112f7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/verify-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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
Expand Down
11 changes: 0 additions & 11 deletions cypress.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit a4112f7

Please sign in to comment.