aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEylon Malin <eylon.malin@intl.att.com>2019-11-26 21:27:08 +0200
committerEylon Malin <eylon.malin@intl.att.com>2019-11-26 21:27:08 +0200
commit4be73ee021a45e44f3fecc33ce3d9ab121cadb47 (patch)
tree8b1198ad6b6218bb29f43a160a5e21d44d71cf48
parent0e8e2be472db881a40a2d0ed073b1ee8d01e36f2 (diff)
upgrade cypress to 3.6.1
Issue-ID: VID-603 Signed-off-by: Eylon Malin <eylon.malin@intl.att.com> Change-Id: Ief1114e24fe5b7a0975a1414ad5059a0d3812a88
-rw-r--r--vid-webpack-master/cypress.json1
-rw-r--r--vid-webpack-master/package.cypress.json6
-rw-r--r--vid-webpack-master/package.json6
3 files changed, 7 insertions, 6 deletions
diff --git a/vid-webpack-master/cypress.json b/vid-webpack-master/cypress.json
index 7a6bc73fd..80fc773eb 100644
--- a/vid-webpack-master/cypress.json
+++ b/vid-webpack-master/cypress.json
@@ -9,6 +9,7 @@
"video": false,
"viewportWidth": 1920,
"viewportHeight": 1080,
+ "baseUrl": "http://localhost:8080/vid",
"reporterOptions": {
"mochaFile": "cypress/reports/TEST-cypress-[hash].xml",
"toConsole": true,
diff --git a/vid-webpack-master/package.cypress.json b/vid-webpack-master/package.cypress.json
index 096e61565..da6aa602f 100644
--- a/vid-webpack-master/package.cypress.json
+++ b/vid-webpack-master/package.cypress.json
@@ -4,16 +4,16 @@
"license": "Apache-2.0",
"scripts": {
"cypress:open": "cypress open",
- "cypress": "cypress open --config baseUrl=http://localhost:8080/vid ",
+ "cypress": "cypress open",
"cypress:run": "cypress run",
- "cypress:headless": "cypress run --config baseUrl=http://localhost:8080/vid "
+ "cypress:headless": "cypress run"
},
"private": true,
"dependencies": {},
"devDependencies": {
"@bahmutov/add-typescript-to-cypress": "2.0.0",
"@types/lodash": "4.14.121",
- "cypress": "^3.1.0",
+ "cypress": "3.6.1",
"typescript": "3.1.6",
"rxjs": "^6.3.3",
"rxjs-compat": "^6.3.3"
diff --git a/vid-webpack-master/package.json b/vid-webpack-master/package.json
index 617a4516c..f76ab8745 100644
--- a/vid-webpack-master/package.json
+++ b/vid-webpack-master/package.json
@@ -19,9 +19,9 @@
"e2e": "ng e2e",
"build-watch": "ng build --watch",
"cypress:open": "cypress open",
- "cypress": "cypress open --config watchForFileChanges=false,baseUrl=http://localhost:8080/vid",
+ "cypress": "cypress open",
"cypress:run": "cypress run",
- "cypress:headless": "cypress run --config baseUrl=http://localhost:8080/vid",
+ "cypress:headless": "cypress run",
"format": "prettier",
"format:fix": "pretty-quick --staged",
"lint": "ng lint"
@@ -87,7 +87,7 @@
"angular2-template-loader": "0.6.2",
"babel-jest": "24.1.0",
"codelyzer": "4.5.0",
- "cypress": "^3.1.5",
+ "cypress": "3.6.1",
"hammerjs": "2.0.8",
"husky": "^1.3.1",
"istanbul-reports": "2.1.1",