Skip to content

Commit

Permalink
Merge branch 'dev' into duckception/allow-to-add-and-switch-network-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
r3kt-eth authored Aug 17, 2023
2 parents 0881b38 + 3ae7cfc commit 300b4e0
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/e2e_cypress-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
uses: pnpm/action-setup@d882d12c64e032187b2edb46d3a0d003b7a43598 # [email protected]

- name: Setup node
uses: actions/setup-node@bea5baf987ba7aa777a8a0b4ace377a21c45c381 # [email protected].0
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # [email protected].1
with:
node-version: 18.16

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e_debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
uses: pnpm/action-setup@d882d12c64e032187b2edb46d3a0d003b7a43598 # [email protected]

- name: Setup node
uses: actions/setup-node@bea5baf987ba7aa777a8a0b4ace377a21c45c381 # [email protected].0
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # [email protected].1
with:
node-version: 18.16

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e_headful.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
uses: pnpm/action-setup@d882d12c64e032187b2edb46d3a0d003b7a43598 # [email protected]

- name: Setup node
uses: actions/setup-node@bea5baf987ba7aa777a8a0b4ace377a21c45c381 # [email protected].0
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # [email protected].1
with:
node-version: 18.16

Expand Down
20 changes: 4 additions & 16 deletions helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ module.exports = {
},
// set currently active network
async setNetwork(network) {
log(`Setting network to ${JSON.stringify(network)}`);
log('Setting network to', network);
currentNetwork = network;
},
// find network in presets
Expand All @@ -31,11 +31,7 @@ module.exports = {
}

network = network.toLowerCase();
log(
`[findNetwork] Trying to find following network: ${JSON.stringify(
network,
)}`,
);
log('[findNetwork] Trying to find following network', network);

let chain;
for (const [key, value] of Object.entries(chains)) {
Expand Down Expand Up @@ -78,11 +74,7 @@ module.exports = {
},
// get currently active network
getCurrentNetwork() {
log(
`[getCurrentNetwork] Current network data: ${JSON.stringify(
currentNetwork,
)}`,
);
log('[getCurrentNetwork] Current network data', currentNetwork);
return currentNetwork;
},
// add new network to presets and list of metamask networks
Expand All @@ -97,11 +89,7 @@ module.exports = {
},
// check if network is already added to metamask
async checkNetworkAdded(network) {
log(
`[checkNetworkAdded] Checking if network is already added: ${JSON.stringify(
network,
)}`,
);
log('[checkNetworkAdded] Checking if network is already added', network);
if (addedNetworks.includes(network)) {
log(`[checkNetworkAdded] Network is present`);
return true;
Expand Down
4 changes: 1 addition & 3 deletions launcher.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,7 @@ const launcher = {
}

const runOptions = await cypress.cli.parseRunArguments(defaultArguments);
log(
`Running synpress with following options: ${JSON.stringify(runOptions)}`,
);
log('Running synpress with following options', runOptions);
const results = await cypress.run(runOptions);
if (results.failures) {
console.error('Failed to run Cypress');
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@synthetixio/synpress",
"version": "3.7.2-beta.1",
"version": "3.7.2-beta.2",
"packageManager": "[email protected]",
"description": "Synpress is e2e testing framework based around Cypress.io & playwright with included MetaMask support. Test your dapps with ease.",
"keywords": [
Expand Down
15 changes: 4 additions & 11 deletions pnpm-lock.yaml

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

0 comments on commit 300b4e0

Please sign in to comment.