Skip to content

Commit

Permalink
chore: update cypress (#2850)
Browse files Browse the repository at this point in the history
* upgrade cypress

* use edge for integration test runs

* only allow 1 version of cypress in lockfile

Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
  • Loading branch information
a-b-r-o-w-n and cwhitten authored May 1, 2020
1 parent 454975c commit d749977
Show file tree
Hide file tree
Showing 4 changed files with 312 additions and 976 deletions.
31 changes: 0 additions & 31 deletions Composer/cypress/plugins/cy-ts-preprocessor.js

This file was deleted.

8 changes: 1 addition & 7 deletions Composer/cypress/plugins/index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

/* eslint-disable @typescript-eslint/no-var-requires */

const cypressTypeScriptPreprocessor = require('./cy-ts-preprocessor');

module.exports = on => {
on('file:preprocessor', cypressTypeScriptPreprocessor);
};
module.exports = on => {};
9 changes: 4 additions & 5 deletions Composer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"test": "yarn typecheck && jest",
"test:watch": "yarn typecheck && jest --watch",
"test:coverage": "yarn test --coverage --no-cache --reporters=default",
"test:integration": "cypress run --browser chrome",
"test:integration": "cypress run --browser edge",
"test:integration:start-server": "node scripts/e2e.js",
"test:integration:open": "cypress open",
"test:integration:clean": "node scripts/clean-e2e.js",
Expand Down Expand Up @@ -75,19 +75,18 @@
"@babel/preset-react": "^7.0.0",
"@babel/preset-typescript": "^7.3.3",
"@bfc/eslint-plugin-bfcomposer": "*",
"@cypress/webpack-preprocessor": "^4.1.1",
"@emotion/babel-preset-css-prop": "^10.0.17",
"@testing-library/cypress": "^5.2.1",
"@testing-library/cypress": "^6.0.0",
"@typescript-eslint/eslint-plugin": "2.10.0",
"@typescript-eslint/parser": "2.10.0",
"chalk": "^4.0.0",
"concurrently": "^4.1.0",
"coveralls": "^3.0.7",
"cypress": "^3.8.3",
"cypress": "^4.5.0",
"cypress-plugin-tab": "^1.0.5",
"eslint": "^6.7.2",
"eslint-config-prettier": "^6.7.0",
"eslint-plugin-cypress": "^2.8.1",
"eslint-plugin-cypress": "^2.10.3",
"eslint-plugin-emotion": "^10.0.14",
"eslint-plugin-format-message": "^6.2.3",
"eslint-plugin-import": "^2.18.2",
Expand Down
Loading

0 comments on commit d749977

Please sign in to comment.