From f67a000c117900a6c6e73a7fba9725b7403f20b3 Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Thu, 20 Feb 2020 18:24:31 +0100 Subject: [PATCH] Stub Websockets, remove vue-loader - no reason we need websockets to try connect endlessly - vue-loader was stopping the cypress tests in debugger at webpack:///./node_modules/vue-style-loader/lib/addStylesClient.js?499e and we are not using anywhere. --- cypress/support/commands.js | 12 ++++++------ cypress/support/index.js | 9 ++++++++- package.json | 5 ++++- webapp/package.json | 1 - webapp/yarn.lock | 2 +- yarn.lock | 39 +++++++++++++++++++++++++++++++++++++ 6 files changed, 58 insertions(+), 10 deletions(-) diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 75f27d0f7..a15e57007 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -58,14 +58,14 @@ Cypress.Commands.add("login", user => { }); Cypress.Commands.add("manualLogin", ({ email, password }) => { - cy.visit(`/login`); - cy.get("input[name=email]") + cy.visit(`/login`) + .get("input[name=email]") .trigger("focus") - .type(email); - cy.get("input[name=password]") + .type(email) + .get("input[name=password]") .trigger("focus") - .type(password); - cy.get("button[name=submit]") + .type(password) + .get("button[name=submit]") .as("submitButton") .click(); }); diff --git a/cypress/support/index.js b/cypress/support/index.js index 195b0de7d..3290d2a5a 100644 --- a/cypress/support/index.js +++ b/cypress/support/index.js @@ -23,4 +23,11 @@ import 'cypress-plugin-retries' // Alternatively you can use CommonJS syntax: // require('./commands') - +import { WebSocket } from 'mock-socket' +before(() => { + cy.visit('/', { + onBeforeLoad(win) { + cy.stub(win, "WebSocket", url => new WebSocket(url)) + } + }) +}) diff --git a/package.json b/package.json index 79798391c..736f77336 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,9 @@ "expect": "^25.1.0", "faker": "Marak/faker.js#master", "graphql-request": "^1.8.2", + "import": "^0.0.6", "jsonwebtoken": "^8.5.1", + "mock-socket": "^9.0.3", "neo4j-driver": "^4.0.1", "neode": "^0.3.7", "npm-run-all": "^4.1.5", @@ -53,5 +55,6 @@ }, "resolutions": { "set-value": "^2.0.1" - } + }, + "dependencies": {} } diff --git a/webapp/package.json b/webapp/package.json index af96851f3..5969a2cdb 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -142,7 +142,6 @@ "style-loader": "~0.23.1", "style-resources-loader": "~1.3.3", "vue-jest": "~3.0.5", - "vue-loader": "~15.9.0", "vue-svg-loader": "~0.16.0", "vue-template-compiler": "^2.6.11" } diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 053585558..ecf078903 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -16497,7 +16497,7 @@ vue-jest@~3.0.5: tsconfig "^7.0.0" vue-template-es2015-compiler "^1.6.0" -vue-loader@^15.8.3, vue-loader@~15.9.0: +vue-loader@^15.8.3: version "15.9.0" resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.0.tgz#5d4b0378a4606188fc83e587ed23c94bc3a10998" integrity sha512-FeDHvTSpwyLeF7LIV1PYkvqUQgTJ8UmOxhSlCyRSxaXCKk+M6NF4tDQsLsPPNeDPyR7TfRQ8MLg6v+8PsDV9xQ== diff --git a/yarn.lock b/yarn.lock index 68ba8ae0e..af32fce96 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3790,6 +3790,13 @@ ignore-walk@3.0.3, ignore-walk@^3.0.1: dependencies: minimatch "^3.0.4" +import@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/import/-/import-0.0.6.tgz#d0eb79df86aa2677c6db61578a5212b3031e6042" + integrity sha1-0Ot534aqJnfG22FXilISswMeYEI= + dependencies: + optimist "0.3.x" + imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" @@ -4884,6 +4891,13 @@ mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1: dependencies: minimist "0.0.8" +mock-socket@^9.0.3: + version "9.0.3" + resolved "https://registry.yarnpkg.com/mock-socket/-/mock-socket-9.0.3.tgz#4bc6d2aea33191e4fed5ec71f039e2bbeb95e414" + integrity sha512-SxIiD2yE/By79p3cNAAXyLQWTvEFNEzcAO7PH+DzRqKSFaplAPFjiQLmw8ofmpCsZf+Rhfn2/xCJagpdGmYdTw== + dependencies: + url-parse "^1.4.4" + modify-values@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" @@ -5222,6 +5236,13 @@ onetime@^1.0.0: resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789" integrity sha1-ofeDj4MUxRbwXs78vEzP4EtO14k= +optimist@0.3.x: + version "0.3.7" + resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.3.7.tgz#c90941ad59e4273328923074d2cf2e7cbc6ec0d9" + integrity sha1-yQlBrVnkJzMokjB00s8ufLxuwNk= + dependencies: + wordwrap "~0.0.2" + optimist@^0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686" @@ -5638,6 +5659,11 @@ querystring@0.2.0: resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= +querystringify@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e" + integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA== + quick-lru@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8" @@ -5909,6 +5935,11 @@ require-main-filename@^2.0.0: resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= + resolve-from@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" @@ -6881,6 +6912,14 @@ urix@^0.1.0: resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= +url-parse@^1.4.4: + version "1.4.7" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278" + integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" + url@0.11.0, url@~0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"