Browse Source

Merge pull request #6554 from wenzhixin/feature/update-cypress

Feature/update cypress
文翼 3 years ago
parent
commit
2e9f4ab488

+ 13 - 0
cypress.config.js

@@ -0,0 +1,13 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+  video: false,
+  screenshot: false,
+  e2e: {
+    // We've imported your old cypress plugins here.
+    // You may want to clean this up later by importing these.
+    setupNodeEvents(on, config) {
+      return require('./cypress/plugins/index.js')(on, config)
+    },
+  },
+})

+ 0 - 4
cypress.json

@@ -1,4 +0,0 @@
-{
-    "video": false,
-    "screenshot": false
-}

cypress/integration/extensions/filter-control/options/bootstrap3.js → cypress/e2e/extensions/filter-control/options/bootstrap3.cy.js


cypress/integration/extensions/filter-control/options/bootstrap4.js → cypress/e2e/extensions/filter-control/options/bootstrap4.cy.js


cypress/integration/extensions/filter-control/options/bulma.js → cypress/e2e/extensions/filter-control/options/bulma.cy.js


cypress/integration/extensions/filter-control/options/foundation.js → cypress/e2e/extensions/filter-control/options/foundation.cy.js


cypress/integration/extensions/filter-control/options/index.js → cypress/e2e/extensions/filter-control/options/index.cy.js


cypress/integration/extensions/filter-control/options/materialize.js → cypress/e2e/extensions/filter-control/options/materialize.cy.js


cypress/integration/extensions/filter-control/options/semantic.js → cypress/e2e/extensions/filter-control/options/semantic.cy.js


cypress/integration/options/bootstrap3.js → cypress/e2e/options/bootstrap3.cy.js


cypress/integration/options/bootstrap4.js → cypress/e2e/options/bootstrap4.cy.js


cypress/integration/options/bulma.js → cypress/e2e/options/bulma.cy.js


cypress/integration/options/foundation.js → cypress/e2e/options/foundation.cy.js


cypress/integration/options/index.js → cypress/e2e/options/index.cy.js


cypress/integration/options/materialize.js → cypress/e2e/options/materialize.cy.js


cypress/integration/options/semantic.js → cypress/e2e/options/semantic.cy.js


cypress/integration/welcome/bootstrap3.js → cypress/e2e/welcome/bootstrap3.cy.js


cypress/integration/welcome/bootstrap4.js → cypress/e2e/welcome/bootstrap4.cy.js


cypress/integration/welcome/bulma.js → cypress/e2e/welcome/bulma.cy.js


cypress/integration/welcome/foundation.js → cypress/e2e/welcome/foundation.cy.js


cypress/integration/welcome/index.js → cypress/e2e/welcome/index.cy.js


cypress/integration/welcome/materialize.js → cypress/e2e/welcome/materialize.cy.js


cypress/integration/welcome/semantic.js → cypress/e2e/welcome/semantic.cy.js


cypress/support/index.js → cypress/support/e2e.js


+ 1 - 1
package.json

@@ -20,7 +20,7 @@
     "clean-css-cli": "^5.6.0",
     "clean-css-cli": "^5.6.0",
     "core-js": "^3.22.5",
     "core-js": "^3.22.5",
     "cross-env": "^7.0.3",
     "cross-env": "^7.0.3",
-    "cypress": "^9.6.1",
+    "cypress": "^12.1.0",
     "eslint": "^8.15.0",
     "eslint": "^8.15.0",
     "esm": "^3.2.25",
     "esm": "^3.2.25",
     "foreach-cli": "^1.8.1",
     "foreach-cli": "^1.8.1",

+ 9 - 9
yarn.lock

@@ -2207,10 +2207,10 @@ cssesc@^3.0.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha1-N3QZGZA7hoVl4cCep0dEXNGJg+4=
   integrity sha1-N3QZGZA7hoVl4cCep0dEXNGJg+4=
 
 
-cypress@^9.6.1:
-  version "9.7.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.7.0.tgz#bf55b2afd481f7a113ef5604aa8b693564b5e744"
-  integrity sha512-+1EE1nuuuwIt/N1KXRR2iWHU+OiIt7H28jJDyyI4tiUftId/DrXYEwoDa5+kH2pki1zxnA0r6HrUGHV5eLbF5Q==
+cypress@^12.1.0:
+  version "12.1.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-12.1.0.tgz#1fdaa631bc30df466dc9505154616f4cf69dbd4b"
+  integrity sha512-7fz8N84uhN1+ePNDsfQvoWEl4P3/VGKKmAg+bJQFY4onhA37Ys+6oBkGbNdwGeC7n2QqibNVPhk8x3YuQLwzfw==
   dependencies:
   dependencies:
     "@cypress/request" "^2.88.10"
     "@cypress/request" "^2.88.10"
     "@cypress/xvfb" "^1.2.4"
     "@cypress/xvfb" "^1.2.4"
@@ -2231,7 +2231,7 @@ cypress@^9.6.1:
     dayjs "^1.10.4"
     dayjs "^1.10.4"
     debug "^4.3.2"
     debug "^4.3.2"
     enquirer "^2.3.6"
     enquirer "^2.3.6"
-    eventemitter2 "^6.4.3"
+    eventemitter2 "6.4.7"
     execa "4.1.0"
     execa "4.1.0"
     executable "^4.1.1"
     executable "^4.1.1"
     extract-zip "2.0.1"
     extract-zip "2.0.1"
@@ -2602,10 +2602,10 @@ esutils@^2.0.2:
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha1-dNLrTeC42hKTcRkQ1Qd1ubcQ72Q=
   integrity sha1-dNLrTeC42hKTcRkQ1Qd1ubcQ72Q=
 
 
-eventemitter2@^6.4.3:
-  version "6.4.5"
-  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.5.tgz#97380f758ae24ac15df8353e0cc27f8b95644655"
-  integrity sha1-lzgPdYriSsFd+DU+DMJ/i5VkRlU=
+eventemitter2@6.4.7:
+  version "6.4.7"
+  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.7.tgz#a7f6c4d7abf28a14c1ef3442f21cb306a054271d"
+  integrity sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==
 
 
 execa@4.1.0:
 execa@4.1.0:
   version "4.1.0"
   version "4.1.0"