Skip to content

Commit

Permalink
Merge pull request #15 from Synthetixio/dev
Browse files Browse the repository at this point in the history
promote dev to master
  • Loading branch information
drptbl authored Dec 5, 2020
2 parents 88daecf + 5dbdbfa commit a934389
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 105 deletions.
124 changes: 28 additions & 96 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,15 @@
"babel-plugin-transform-react-styled-components-qa": "2.0.1",
"commander": "6.2.0",
"cypress": "6.0.1",
"cypress-ethereum-provider": "0.1.0",
"cypress-wait-until": "1.7.1",
"eslint": "7.14.0",
"eslint": "7.15.0",
"eslint-config-prettier": "6.15.0",
"eslint-config-standard": "16.0.2",
"eslint-plugin-chai-friendly": "0.6.0",
"eslint-plugin-cypress": "2.11.2",
"eslint-plugin-import": "2.22.1",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-prettier": "3.1.4",
"eslint-plugin-prettier": "3.2.0",
"eslint-plugin-promise": "4.2.1",
"eslint-plugin-standard": "4.1.0",
"eslint-plugin-testing-library": "3.10.1",
Expand Down
5 changes: 1 addition & 4 deletions plugins/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,7 @@ module.exports = (on, config) => {
config.baseUrl = process.env.BASE_URL;
}

if (process.env.DEV) {
config.retries.runMode = 0;
config.retries.openMode = 0;
} else {
if (process.env.CI) {
config.retries.runMode = 1;
config.retries.openMode = 1;
}
Expand Down
3 changes: 1 addition & 2 deletions synpress.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@
"integrationFolder": "tests/e2e/specs",
"screenshotsFolder": "tests/e2e/screenshots",
"videosFolder": "tests/e2e/videos",
"chromeWebSecurity": false,
"experimentalFetchPolyfill": true
"chromeWebSecurity": true
}

0 comments on commit a934389

Please sign in to comment.