-
Notifications
You must be signed in to change notification settings - Fork 22
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
chore: [TECH-1654] upgrade cypress to v12 #3429
Merged
Merged
Changes from 26 commits
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
debba9e
chore: initial upgrade
eirikhaugstulen bc37417
chore: tests
eirikhaugstulen afcd64e
Merge remote-tracking branch 'origin/master' into eh/TECH/upgrade_cyp…
eirikhaugstulen 33ddee5
chore: tests
eirikhaugstulen 7d8f39f
chore: temp
eirikhaugstulen 5456f2a
feat: add aoc and first stage
eirikhaugstulen b149324
feat: custom preprocessor
eirikhaugstulen ec609e2
chore: test
eirikhaugstulen 84d5066
chore: test
eirikhaugstulen 6a4a0f0
chore: test
eirikhaugstulen e3eed12
chore: test
eirikhaugstulen 9c529c7
chore: test
eirikhaugstulen c9f2076
chore: test
eirikhaugstulen a4112f7
chore: test
eirikhaugstulen 0f2272a
chore: test
eirikhaugstulen bdfc2d8
chore: test
eirikhaugstulen 7b4be22
chore: test
eirikhaugstulen 38202ee
chore: test
eirikhaugstulen bb177f9
Merge remote-tracking branch 'origin/master' into eh/TECH/upgrade_cyp…
eirikhaugstulen 06f9bf1
chore: test
eirikhaugstulen 99313fd
chore: test
eirikhaugstulen 8503cdb
chore: test
eirikhaugstulen 9924c8b
chore: test
eirikhaugstulen 92c46cd
chore: test
eirikhaugstulen 0fa8da8
chore: test
eirikhaugstulen f2ef341
chore: comment out BTG
eirikhaugstulen e60c3d4
Merge remote-tracking branch 'origin/master' into eh/TECH/upgrade_cyp…
eirikhaugstulen df5950c
Merge remote-tracking branch 'origin/master' into eh/TECH/upgrade_cyp…
eirikhaugstulen 0fa4c35
chore: change tests
eirikhaugstulen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
{ | ||
"nonGlobalStepDefinitions": true | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
REACT_APP_CACHE_VERSION=$npm_package_cacheVersion | ||
REACT_APP_SERVER_VERSION=$npm_package_serverVersion | ||
REACT_APP_VERSION=$npm_package_version | ||
# TODO: Remove this when upgrading to react-scripts 5 (and webpack 5) | ||
NODE_OPTIONS=--openssl-legacy-provider |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
const { chromeAllowXSiteCookies } = require('@dhis2/cypress-plugins'); | ||
const { defineConfig } = require('cypress'); | ||
const getCypressEnvVariables = require('./cypress/support/getCypressEnvVariables'); | ||
const cucumberPreprocessor = require('./cypress/support/cucumberPreprocessor'); | ||
|
||
async function setupNodeEvents(on, config) { | ||
await chromeAllowXSiteCookies(on); | ||
await cucumberPreprocessor(on, config); | ||
|
||
config.env = getCypressEnvVariables(config); | ||
return config; | ||
} | ||
|
||
module.exports = defineConfig({ | ||
video: true, | ||
dhis2_datatest_prefix: 'dhis2-capture', | ||
chromeWebSecurityComment: | ||
'chromeWebSecurity should removed once https://github.com/cypress-io/cypress/issues/4220 is fixed', | ||
chromeWebSecurity: false, | ||
defaultCommandTimeout: 25000, | ||
projectId: '322xnh', | ||
experimentalFetchPolyfill: true, | ||
retries: { | ||
runMode: 3, | ||
}, | ||
env: { | ||
dhis2DataTestPrefix: 'capture-app', | ||
networkMode: 'live', | ||
}, | ||
e2e: { | ||
setupNodeEvents, | ||
baseUrl: 'http://localhost:3000', | ||
specPattern: 'cypress/e2e/**/*.feature', | ||
}, | ||
}); |
This file was deleted.
Oops, something went wrong.
File renamed without changes.
2 changes: 2 additions & 0 deletions
2
...gration/AllAccessibleRecordsPage/index.js → ...ess/e2e/AllAccessibleRecordsPage/index.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
1 change: 1 addition & 0 deletions
1
...EnrollmentAddEventPageNavigation/index.js → ...EnrollmentAddEventPageNavigation/index.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
2 changes: 2 additions & 0 deletions
2
...ddEventPage/ProgramStageSelector/index.js → ...ddEventPage/ProgramStageSelector/index.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
...ion/EnrollmentAddEventPage/sharedSteps.js → ...e2e/EnrollmentAddEventPage/sharedSteps.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
1 change: 1 addition & 0 deletions
1
...Page/EnrollmentEditEventPageForm/index.js → ...Page/EnrollmentEditEventPageForm/index.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
2 changes: 2 additions & 0 deletions
2
...nrollmentEditEventPageNavigation/index.js → ...nrollmentEditEventPageNavigation/index.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
...n/EnrollmentPage/BreakingTheGlass.feature → ...e/EnrollmentPage/BreakingTheGlass.feature
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
2 changes: 2 additions & 0 deletions
2
...lmentPage/EnrollmentQuickActions/index.js → ...lmentPage/EnrollmentQuickActions/index.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When you merge the PR, can you add this test and ticket to the Cypress tests wiki? Thanks!