From 6a8778becd708d1fb0a779fcb552bc7cdcb124c0 Mon Sep 17 00:00:00 2001 From: Joe Date: Wed, 2 Mar 2022 15:39:52 +0000 Subject: [PATCH] Fix for .env not picked up and Cypress update --- .env | 3 + .../.cypress-cucumber-preprocessorrc | 3 + apps/explorer-e2e/src/integration/app.spec.ts | 13 ---- package-lock.json | 59 ++++++++++++++++--- package.json | 2 +- yarn.lock | 8 +-- 6 files changed, 62 insertions(+), 26 deletions(-) create mode 100644 apps/explorer-e2e/.cypress-cucumber-preprocessorrc delete mode 100644 apps/explorer-e2e/src/integration/app.spec.ts diff --git a/.env b/.env index 578fadf8e..b99d02256 100644 --- a/.env +++ b/.env @@ -1 +1,4 @@ +NX_CHAIN_EXPLORER_URL = "https://explorer.vega.trading/.netlify/functions/chain-explorer-api" +NX_TENDERMINT_URL = "https://lb.testnet.vega.xyz/tm" +NX_TENDERMINT_WEBSOCKET_URL = "wss://lb.testnet.vega.xyz/tm/websocket" NX_VEGA_URL = "https://lb.testnet.vega.xyz/query" diff --git a/apps/explorer-e2e/.cypress-cucumber-preprocessorrc b/apps/explorer-e2e/.cypress-cucumber-preprocessorrc new file mode 100644 index 000000000..dc930805e --- /dev/null +++ b/apps/explorer-e2e/.cypress-cucumber-preprocessorrc @@ -0,0 +1,3 @@ +{ + "stepDefinitions": "src/support/step_definitions" +} diff --git a/apps/explorer-e2e/src/integration/app.spec.ts b/apps/explorer-e2e/src/integration/app.spec.ts deleted file mode 100644 index 118c4e4fc..000000000 --- a/apps/explorer-e2e/src/integration/app.spec.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { getGreeting } from '../support/app.po'; - -describe('explorer', () => { - beforeEach(() => cy.visit('/')); - - it('should display welcome message', () => { - // Custom command example, see `../support/commands.ts` file - cy.login('my-email@something.com', 'myPassword'); - - // Function helper example, see `../support/app.po.ts` file - getGreeting().contains('Welcome explorer'); - }); -}); diff --git a/package-lock.json b/package-lock.json index 9c977e5ff..1ffec471c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -62,7 +62,7 @@ "@typescript-eslint/parser": "~5.10.0", "babel-jest": "27.2.3", "babel-loader": "8.1.0", - "cypress": "^9.1.0", + "cypress": "^9.5.1", "cypress-cucumber-preprocessor": "^4.3.1", "eslint": "~8.7.0", "eslint-config-next": "12.0.7", @@ -7758,6 +7758,8 @@ }, "node_modules/@pmmmwh/react-refresh-webpack-plugin/node_modules/webpack": { "version": "4.46.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", + "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==", "license": "MIT", "peer": true, "dependencies": { @@ -9587,6 +9589,8 @@ }, "node_modules/@storybook/builder-webpack4/node_modules/babel-loader/node_modules/webpack": { "version": "5.68.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.68.0.tgz", + "integrity": "sha512-zUcqaUO0772UuuW2bzaES2Zjlm/y3kRBQDVFVCge+s2Y8mwuUTdperGaAv65/NtRL/1zanpSJOq/MD8u61vo6g==", "dev": true, "license": "MIT", "peer": true, @@ -10778,6 +10782,8 @@ }, "node_modules/@storybook/builder-webpack5/node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/core": { "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.13.tgz", + "integrity": "sha512-BQKE9kXkPlXHPeqissfxo0lySWJcYdEP0hdtJOH/iJfDdhOCcgtNCjftCJg3qqauB4h+lz2N6ixM++b9DN1Tcw==", "dev": true, "license": "MIT", "peer": true, @@ -12571,6 +12577,8 @@ }, "node_modules/@storybook/core-common/node_modules/babel-loader/node_modules/webpack": { "version": "5.68.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.68.0.tgz", + "integrity": "sha512-zUcqaUO0772UuuW2bzaES2Zjlm/y3kRBQDVFVCge+s2Y8mwuUTdperGaAv65/NtRL/1zanpSJOq/MD8u61vo6g==", "dev": true, "license": "MIT", "peer": true, @@ -13301,6 +13309,8 @@ }, "node_modules/@storybook/core-common/node_modules/fork-ts-checker-webpack-plugin/node_modules/webpack": { "version": "5.68.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.68.0.tgz", + "integrity": "sha512-zUcqaUO0772UuuW2bzaES2Zjlm/y3kRBQDVFVCge+s2Y8mwuUTdperGaAv65/NtRL/1zanpSJOq/MD8u61vo6g==", "dev": true, "license": "MIT", "peer": true, @@ -15166,6 +15176,8 @@ }, "node_modules/@storybook/core/node_modules/webpack": { "version": "4.46.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", + "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==", "dev": true, "license": "MIT", "peer": true, @@ -15974,6 +15986,8 @@ }, "node_modules/@storybook/manager-webpack4/node_modules/babel-loader/node_modules/webpack": { "version": "5.68.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.68.0.tgz", + "integrity": "sha512-zUcqaUO0772UuuW2bzaES2Zjlm/y3kRBQDVFVCge+s2Y8mwuUTdperGaAv65/NtRL/1zanpSJOq/MD8u61vo6g==", "dev": true, "license": "MIT", "peer": true, @@ -26557,6 +26571,8 @@ }, "node_modules/css-loader/node_modules/webpack": { "version": "4.46.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", + "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==", "dev": true, "license": "MIT", "peer": true, @@ -27036,12 +27052,11 @@ "license": "MIT" }, "node_modules/cypress": { - "version": "9.4.1", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-9.4.1.tgz", - "integrity": "sha512-+JgMG9uT+QFx97JU9kOHE3jO3+0UdkQ9H1oCBiC7A74qme7Jkdy2sYDBCPjjGczutnWnGUTMRlwiNMP/Uq6LrQ==", + "version": "9.5.1", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-9.5.1.tgz", + "integrity": "sha512-H7lUWB3Svr44gz1rNnj941xmdsCljXoJa2cDneAltjI9leKLMQLm30x6jLlpQ730tiVtIbW5HdUmBzPzwzfUQg==", "devOptional": true, "hasInstallScript": true, - "license": "MIT", "dependencies": { "@cypress/request": "^2.88.10", "@cypress/xvfb": "^1.2.4", @@ -32121,6 +32136,8 @@ }, "node_modules/html-webpack-plugin/node_modules/webpack": { "version": "4.46.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", + "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==", "devOptional": true, "license": "MIT", "peer": true, @@ -44152,6 +44169,8 @@ }, "node_modules/style-loader/node_modules/webpack": { "version": "4.46.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", + "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==", "dev": true, "license": "MIT", "peer": true, @@ -47709,6 +47728,8 @@ }, "node_modules/webpack-dev-middleware/node_modules/webpack": { "version": "4.46.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", + "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==", "dev": true, "license": "MIT", "peer": true, @@ -53789,6 +53810,8 @@ }, "webpack": { "version": "4.46.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", + "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==", "peer": true, "requires": { "@webassemblyjs/ast": "1.9.0", @@ -55060,6 +55083,8 @@ }, "webpack": { "version": "5.68.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.68.0.tgz", + "integrity": "sha512-zUcqaUO0772UuuW2bzaES2Zjlm/y3kRBQDVFVCge+s2Y8mwuUTdperGaAv65/NtRL/1zanpSJOq/MD8u61vo6g==", "dev": true, "peer": true, "requires": { @@ -55922,6 +55947,8 @@ "dependencies": { "@babel/core": { "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.13.tgz", + "integrity": "sha512-BQKE9kXkPlXHPeqissfxo0lySWJcYdEP0hdtJOH/iJfDdhOCcgtNCjftCJg3qqauB4h+lz2N6ixM++b9DN1Tcw==", "dev": true, "peer": true, "requires": { @@ -57059,6 +57086,8 @@ }, "webpack": { "version": "4.46.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", + "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==", "dev": true, "peer": true, "requires": { @@ -57724,6 +57753,8 @@ }, "webpack": { "version": "5.68.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.68.0.tgz", + "integrity": "sha512-zUcqaUO0772UuuW2bzaES2Zjlm/y3kRBQDVFVCge+s2Y8mwuUTdperGaAv65/NtRL/1zanpSJOq/MD8u61vo6g==", "dev": true, "peer": true, "requires": { @@ -58258,6 +58289,8 @@ }, "webpack": { "version": "5.68.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.68.0.tgz", + "integrity": "sha512-zUcqaUO0772UuuW2bzaES2Zjlm/y3kRBQDVFVCge+s2Y8mwuUTdperGaAv65/NtRL/1zanpSJOq/MD8u61vo6g==", "dev": true, "peer": true, "requires": { @@ -59740,6 +59773,8 @@ }, "webpack": { "version": "5.68.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.68.0.tgz", + "integrity": "sha512-zUcqaUO0772UuuW2bzaES2Zjlm/y3kRBQDVFVCge+s2Y8mwuUTdperGaAv65/NtRL/1zanpSJOq/MD8u61vo6g==", "dev": true, "peer": true, "requires": { @@ -67571,6 +67606,8 @@ }, "webpack": { "version": "4.46.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", + "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==", "dev": true, "peer": true, "requires": { @@ -67902,9 +67939,9 @@ "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=" }, "cypress": { - "version": "9.4.1", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-9.4.1.tgz", - "integrity": "sha512-+JgMG9uT+QFx97JU9kOHE3jO3+0UdkQ9H1oCBiC7A74qme7Jkdy2sYDBCPjjGczutnWnGUTMRlwiNMP/Uq6LrQ==", + "version": "9.5.1", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-9.5.1.tgz", + "integrity": "sha512-H7lUWB3Svr44gz1rNnj941xmdsCljXoJa2cDneAltjI9leKLMQLm30x6jLlpQ730tiVtIbW5HdUmBzPzwzfUQg==", "devOptional": true, "requires": { "@cypress/request": "^2.88.10", @@ -71628,6 +71665,8 @@ }, "webpack": { "version": "4.46.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", + "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==", "devOptional": true, "peer": true, "requires": { @@ -80165,6 +80204,8 @@ }, "webpack": { "version": "4.46.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", + "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==", "dev": true, "peer": true, "requires": { @@ -82745,6 +82786,8 @@ }, "webpack": { "version": "4.46.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", + "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==", "dev": true, "peer": true, "requires": { diff --git a/package.json b/package.json index 150fd4b34..71666577a 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "@typescript-eslint/parser": "~5.10.0", "babel-jest": "27.2.3", "babel-loader": "8.1.0", - "cypress": "^9.1.0", + "cypress": "^9.5.1", "cypress-cucumber-preprocessor": "^4.3.1", "eslint": "~8.7.0", "eslint-config-next": "12.0.7", diff --git a/yarn.lock b/yarn.lock index f756e9a93..c6e7a3264 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8119,10 +8119,10 @@ "minimist" "^1.2.5" "through" "^2.3.8" -"cypress@^9.1.0", "cypress@>= 3 < 10": - "integrity" "sha512-+JgMG9uT+QFx97JU9kOHE3jO3+0UdkQ9H1oCBiC7A74qme7Jkdy2sYDBCPjjGczutnWnGUTMRlwiNMP/Uq6LrQ==" - "resolved" "https://registry.npmjs.org/cypress/-/cypress-9.4.1.tgz" - "version" "9.4.1" +"cypress@^9.5.1", "cypress@>= 3 < 10": + "integrity" "sha512-H7lUWB3Svr44gz1rNnj941xmdsCljXoJa2cDneAltjI9leKLMQLm30x6jLlpQ730tiVtIbW5HdUmBzPzwzfUQg==" + "resolved" "https://registry.npmjs.org/cypress/-/cypress-9.5.1.tgz" + "version" "9.5.1" dependencies: "@cypress/request" "^2.88.10" "@cypress/xvfb" "^1.2.4"