From cea897860a5cc226ffdc53d3ed7219444d826216 Mon Sep 17 00:00:00 2001 From: Chris Fritz Date: Sat, 24 Feb 2018 18:34:59 -0500 Subject: [PATCH] fix(cypress): upgrade cypress and properly set base url --- .../generator/template/test/e2e/specs/test.js | 2 +- packages/@vue/cli-plugin-e2e-cypress/index.js | 2 +- packages/@vue/cli-plugin-e2e-cypress/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/@vue/cli-plugin-e2e-cypress/generator/template/test/e2e/specs/test.js b/packages/@vue/cli-plugin-e2e-cypress/generator/template/test/e2e/specs/test.js index f6d51930e1..85645d0202 100644 --- a/packages/@vue/cli-plugin-e2e-cypress/generator/template/test/e2e/specs/test.js +++ b/packages/@vue/cli-plugin-e2e-cypress/generator/template/test/e2e/specs/test.js @@ -2,7 +2,7 @@ describe('My First Test', () => { it('Visits the Kitchen Sink', () => { - cy.visit(Cypress.env('VUE_DEV_SERVER_URL')) + cy.visit('/') cy.contains('h1', 'Welcome to Your Vue.js <%- hasTS ? '+ TypeScript ' : '' %>App') }) }) diff --git a/packages/@vue/cli-plugin-e2e-cypress/index.js b/packages/@vue/cli-plugin-e2e-cypress/index.js index cb20bd0002..cd1104288c 100644 --- a/packages/@vue/cli-plugin-e2e-cypress/index.js +++ b/packages/@vue/cli-plugin-e2e-cypress/index.js @@ -24,7 +24,7 @@ module.exports = (api, options) => { const cyArgs = [ command, // open or run - '--env', `VUE_DEV_SERVER_URL=${url}`, + '--config', `baseUrl=${url}`, ...rawArgs ] diff --git a/packages/@vue/cli-plugin-e2e-cypress/package.json b/packages/@vue/cli-plugin-e2e-cypress/package.json index e4a6d0dee6..26a51b18be 100644 --- a/packages/@vue/cli-plugin-e2e-cypress/package.json +++ b/packages/@vue/cli-plugin-e2e-cypress/package.json @@ -22,7 +22,7 @@ "access": "public" }, "dependencies": { - "cypress": "^1.4.1", + "cypress": "^2.0.3", "eslint-plugin-cypress": "^2.0.1" } }