Skip to content

Commit

Permalink
Merge pull request #505 from Synthetixio/dev
Browse files Browse the repository at this point in the history
promote dev to master
  • Loading branch information
drptbl authored Sep 14, 2022
2 parents cb00e6a + a425bdc commit f4ebae0
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 11 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ To see in which direction Synpress is headed to, take a look at
- can be used in existing
[cypress setup](https://github.com/Synthetixio/synpress/issues/346#issuecomment-1060506096)
- supports dotenv
- loads all env vars from your `.env` file automatically (from project root folder)
- loads all env vars from your `.env` file automatically (from project root
folder)
- ability to use latest metamask or lock it's version to avoid unexpected
failures related to metamask updates
- supports multi-lang of metamask, it doesn't depend on any labels
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ services:
ngrok:4040/api/tunnels | jq -r .tunnels[0].public_url && yarn test:e2e'
networks:
- x11

display:
container_name: display
image: synthetixio/display:b2643097e891906524e52e7ee956260b20fa01fb-base
Expand Down
8 changes: 2 additions & 6 deletions support/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,7 @@ declare namespace Cypress {
* cy.confirmMetamaskTransaction()
* cy.confirmMetamaskTransaction({gasFee: 10, gasLimit: 1000000})
*/
confirmMetamaskTransaction(
gasConfig?: object,
): Chainable<Subject>;
confirmMetamaskTransaction(gasConfig?: object): Chainable<Subject>;
/**
* Reject metamask transaction
* @example
Expand All @@ -209,9 +207,7 @@ declare namespace Cypress {
* cy.allowMetamaskToAddNetwork()
* cy.allowMetamaskToAddNetwork('close') // (waitForEvent)
*/
allowMetamaskToAddNetwork(
waitForEvent?: string,
): Chainable<Subject>;
allowMetamaskToAddNetwork(waitForEvent?: string): Chainable<Subject>;
/**
* Reject site to add new network in metamask
* @example
Expand Down
6 changes: 3 additions & 3 deletions synpress.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ module.exports = defineConfig({
env: {
coverage: false,
},
defaultCommandTimeout: process.env.SYNDEBUG ? 0 : 30000,
pageLoadTimeout: process.env.SYNDEBUG ? 0 : 30000,
requestTimeout: process.env.SYNDEBUG ? 0 : 30000,
defaultCommandTimeout: process.env.SYNDEBUG ? 9999999 : 30000,
pageLoadTimeout: process.env.SYNDEBUG ? 0 : 9999999,
requestTimeout: process.env.SYNDEBUG ? 0 : 9999999,
e2e: {
setupNodeEvents,
baseUrl: 'http://localhost:3000',
Expand Down

0 comments on commit f4ebae0

Please sign in to comment.