Skip to content

Commit

Permalink
Merge branch 'dev' into ahmed/plugins-refactor
Browse files Browse the repository at this point in the history
# Conflicts:
#	plugins/index.js
  • Loading branch information
duckception committed Aug 17, 2023
2 parents 4cf972e + 3ae7cfc commit a4b040f
Show file tree
Hide file tree
Showing 7 changed files with 305 additions and 275 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
25 changes: 6 additions & 19 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 Expand Up @@ -238,9 +226,8 @@ module.exports = {

await module.exports.createDirIfNotExist(downloadsDirectory);
const metamaskDirectory = path.join(downloadsDirectory, release.tagName);
const metamaskDirectoryExists = await module.exports.checkDirOrFileExist(
metamaskDirectory,
);
const metamaskDirectoryExists =
await module.exports.checkDirOrFileExist(metamaskDirectory);
const metamaskManifestFilePath = path.join(
downloadsDirectory,
release.tagName,
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
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@synthetixio/synpress",
"version": "3.7.2-beta.0",
"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 Expand Up @@ -52,10 +52,10 @@
},
"dependencies": {
"@cypress/code-coverage": "^3.11.0",
"@cypress/webpack-dev-server": "^3.5.1",
"@cypress/webpack-dev-server": "^3.5.2",
"@drptbl/gremlins.js": "^2.2.1",
"@foundry-rs/easy-foundryup": "^0.1.3",
"@playwright/test": "^1.36.2",
"@playwright/test": "^1.37.0",
"@testing-library/cypress": "^9.0.0",
"@testing-library/react": "^14.0.0",
"@types/testing-library__cypress": "^5.0.9",
Expand All @@ -69,41 +69,41 @@
"babel-plugin-transform-react-styled-components-qa": "^2.1.0",
"bytes32": "^0.0.3",
"commander": "^11.0.0",
"cypress": "^12.17.3",
"cypress-wait-until": "^2.0.0",
"cypress": "^12.17.4",
"cypress-wait-until": "^2.0.1",
"debug": "^4.3.4",
"dotenv": "^16.3.1",
"dotenv-parse-variables": "^2.0.0",
"download": "^8.0.0",
"ethers": "^6.6.7",
"ethers": "^6.7.1",
"etherscan-api": "^10.3.0",
"find-config": "^1.0.0",
"get-port": "^7.0.0",
"node-fetch": "^2.6.1",
"underscore": "^1.13.6",
"viem": "^1.5.0",
"viem": "^1.6.0",
"wait-on": "^7.0.1"
},
"devDependencies": {
"@metamask/test-dapp": "^7.0.1",
"@microsoft/eslint-formatter-sarif": "^3.0.0",
"eslint": "^8.46.0",
"eslint-config-prettier": "^8.9.0",
"eslint": "^8.47.0",
"eslint-config-prettier": "^9.0.0",
"eslint-config-standard": "^17.1.0",
"eslint-config-turbo": "^1.10.12",
"eslint-plugin-chai-friendly": "^0.7.2",
"eslint-plugin-cypress": "^2.13.3",
"eslint-plugin-cypress": "^2.14.0",
"eslint-plugin-import": "^2.28.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-standard": "^4.1.0",
"eslint-plugin-testing-library": "^5.11.0",
"eslint-plugin-testing-library": "^6.0.0",
"eslint-plugin-ui-testing": "^2.0.1",
"eslint-plugin-unicorn": "^48.0.1",
"npm-check-updates": "^16.10.17",
"prettier": "^3.0.0",
"release-it": "^16.1.3",
"npm-check-updates": "^16.12.2",
"prettier": "^3.0.2",
"release-it": "^16.1.5",
"serve": "^14.2.0",
"start-server-and-test": "^2.0.0",
"turbo": "^1.10.12"
Expand Down
Loading

0 comments on commit a4b040f

Please sign in to comment.