diff --git a/cypress/e2e/other/configuration.spec.js b/cypress/integration/other/configuration.spec.js
similarity index 100%
rename from cypress/e2e/other/configuration.spec.js
rename to cypress/integration/other/configuration.spec.js
diff --git a/cypress/e2e/other/ghsa.spec.js b/cypress/integration/other/ghsa.spec.js
similarity index 100%
rename from cypress/e2e/other/ghsa.spec.js
rename to cypress/integration/other/ghsa.spec.js
diff --git a/cypress/e2e/other/interaction.spec.js b/cypress/integration/other/interaction.spec.js
similarity index 100%
rename from cypress/e2e/other/interaction.spec.js
rename to cypress/integration/other/interaction.spec.js
diff --git a/cypress/e2e/other/rerender.spec.js b/cypress/integration/other/rerender.spec.js
similarity index 100%
rename from cypress/e2e/other/rerender.spec.js
rename to cypress/integration/other/rerender.spec.js
diff --git a/cypress/e2e/other/webpackUsage.spec.js b/cypress/integration/other/webpackUsage.spec.js
similarity index 100%
rename from cypress/e2e/other/webpackUsage.spec.js
rename to cypress/integration/other/webpackUsage.spec.js
diff --git a/cypress/e2e/other/xss.spec.js b/cypress/integration/other/xss.spec.js
similarity index 100%
rename from cypress/e2e/other/xss.spec.js
rename to cypress/integration/other/xss.spec.js
diff --git a/cypress/e2e/rendering/appli.spec.js b/cypress/integration/rendering/appli.spec.js
similarity index 100%
rename from cypress/e2e/rendering/appli.spec.js
rename to cypress/integration/rendering/appli.spec.js
diff --git a/cypress/e2e/rendering/classDiagram-v2.spec.js b/cypress/integration/rendering/classDiagram-v2.spec.js
similarity index 100%
rename from cypress/e2e/rendering/classDiagram-v2.spec.js
rename to cypress/integration/rendering/classDiagram-v2.spec.js
diff --git a/cypress/e2e/rendering/classDiagram.spec.js b/cypress/integration/rendering/classDiagram.spec.js
similarity index 100%
rename from cypress/e2e/rendering/classDiagram.spec.js
rename to cypress/integration/rendering/classDiagram.spec.js
diff --git a/cypress/e2e/rendering/conf-and-directives.spec.js b/cypress/integration/rendering/conf-and-directives.spec.js
similarity index 100%
rename from cypress/e2e/rendering/conf-and-directives.spec.js
rename to cypress/integration/rendering/conf-and-directives.spec.js
diff --git a/cypress/e2e/rendering/current.spec.js b/cypress/integration/rendering/current.spec.js
similarity index 100%
rename from cypress/e2e/rendering/current.spec.js
rename to cypress/integration/rendering/current.spec.js
diff --git a/cypress/e2e/rendering/debug.spec.js b/cypress/integration/rendering/debug.spec.js
similarity index 100%
rename from cypress/e2e/rendering/debug.spec.js
rename to cypress/integration/rendering/debug.spec.js
diff --git a/cypress/e2e/rendering/erDiagram.spec.js b/cypress/integration/rendering/erDiagram.spec.js
similarity index 100%
rename from cypress/e2e/rendering/erDiagram.spec.js
rename to cypress/integration/rendering/erDiagram.spec.js
diff --git a/cypress/e2e/rendering/flowchart-v2.spec.js b/cypress/integration/rendering/flowchart-v2.spec.js
similarity index 100%
rename from cypress/e2e/rendering/flowchart-v2.spec.js
rename to cypress/integration/rendering/flowchart-v2.spec.js
diff --git a/cypress/e2e/rendering/flowchart.spec.js b/cypress/integration/rendering/flowchart.spec.js
similarity index 100%
rename from cypress/e2e/rendering/flowchart.spec.js
rename to cypress/integration/rendering/flowchart.spec.js
diff --git a/cypress/e2e/rendering/gantt.spec.js b/cypress/integration/rendering/gantt.spec.js
similarity index 100%
rename from cypress/e2e/rendering/gantt.spec.js
rename to cypress/integration/rendering/gantt.spec.js
diff --git a/cypress/e2e/rendering/gitGraph.spec.js b/cypress/integration/rendering/gitGraph.spec.js
similarity index 100%
rename from cypress/e2e/rendering/gitGraph.spec.js
rename to cypress/integration/rendering/gitGraph.spec.js
diff --git a/cypress/e2e/rendering/info.spec.js b/cypress/integration/rendering/info.spec.js
similarity index 100%
rename from cypress/e2e/rendering/info.spec.js
rename to cypress/integration/rendering/info.spec.js
diff --git a/cypress/e2e/rendering/journey.spec.js b/cypress/integration/rendering/journey.spec.js
similarity index 100%
rename from cypress/e2e/rendering/journey.spec.js
rename to cypress/integration/rendering/journey.spec.js
diff --git a/cypress/e2e/rendering/pie.spec.js b/cypress/integration/rendering/pie.spec.js
similarity index 100%
rename from cypress/e2e/rendering/pie.spec.js
rename to cypress/integration/rendering/pie.spec.js
diff --git a/cypress/e2e/rendering/requirement.spec.js b/cypress/integration/rendering/requirement.spec.js
similarity index 100%
rename from cypress/e2e/rendering/requirement.spec.js
rename to cypress/integration/rendering/requirement.spec.js
diff --git a/cypress/e2e/rendering/sequencediagram.spec.js b/cypress/integration/rendering/sequencediagram.spec.js
similarity index 100%
rename from cypress/e2e/rendering/sequencediagram.spec.js
rename to cypress/integration/rendering/sequencediagram.spec.js
diff --git a/cypress/e2e/rendering/stateDiagram-v2.spec.js b/cypress/integration/rendering/stateDiagram-v2.spec.js
similarity index 100%
rename from cypress/e2e/rendering/stateDiagram-v2.spec.js
rename to cypress/integration/rendering/stateDiagram-v2.spec.js
diff --git a/cypress/e2e/rendering/stateDiagram.spec.js b/cypress/integration/rendering/stateDiagram.spec.js
similarity index 100%
rename from cypress/e2e/rendering/stateDiagram.spec.js
rename to cypress/integration/rendering/stateDiagram.spec.js
diff --git a/cypress/e2e/rendering/theme.spec.js b/cypress/integration/rendering/theme.spec.js
similarity index 100%
rename from cypress/e2e/rendering/theme.spec.js
rename to cypress/integration/rendering/theme.spec.js
diff --git a/cypress/platform/knsv.html b/cypress/platform/knsv.html
index 8bc9f88e2..c8109ba17 100644
--- a/cypress/platform/knsv.html
+++ b/cypress/platform/knsv.html
@@ -218,11 +218,18 @@ class Class10 {
}
- stateDiagram
- accTitle: Apa
- accDescr: One that can climb better then any man
- [*] --> S1
- state "Some long name" as S1
+graph LR
+ A[[subroutine shape test]]
+ A -->|Get money| B[[Go shopping]]
+ B --> C[[Let me think...
Do I want something for work,
something to spend every free second with,
or something to get around?]]
+ C -->|One| D[[Laptop]]
+ C -->|Two| E[[iPhone]]
+ C -->|Three| F[[Car
wroom wroom]]
+ click A "index.html#link-clicked" "link test"
+ click B testClick "click test"
+ classDef someclass fill:#f96;
+ class A someclass;
+ class C someclass;
classDiagram
diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
new file mode 100644
index 000000000..2c98a54ad
--- /dev/null
+++ b/cypress/plugins/index.js
@@ -0,0 +1,32 @@
+// ***********************************************************
+// This example plugins/index.js can be used to load plugins
+//
+// You can change the location of this file or turn off loading
+// the plugins file with the 'pluginsFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/plugins-guide
+// ***********************************************************
+
+// This function is called when a project is opened or re-opened (e.g. due to
+// the project's config changing)
+
+// module.exports = (on, config) => {
+// // `on` is used to hook into various events Cypress emits
+// // `config` is the resolved Cypress config
+// }
+
+const { addMatchImageSnapshotPlugin } = require('cypress-image-snapshot/plugin');
+require('@applitools/eyes-cypress')(module);
+
+module.exports = (on, config) => {
+ addMatchImageSnapshotPlugin(on, config);
+ // copy any needed variables from process.env to config.env
+ config.env.useAppli = process.env.USE_APPLI ? true : false;
+ config.env.codeBranch = process.env.APPLI_BRANCH;
+
+ // do not forget to return the changed config object!
+ return config;
+};
+
+require('@applitools/eyes-cypress')(module);
diff --git a/package.json b/package.json
index d295b5f55..b49cb0ee2 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
"postbuild": "documentation build src/mermaidAPI.js src/config.js src/defaultConfig.js --shallow -f md --markdown-toc false > docs/Setup.md",
"build:watch": "yarn build:development --watch",
"release": "yarn build",
- "lint": "eslint ./ --ext .js,.json,.html,.md",
+ "lint": "eslint ./ --ext .js,.json,.html",
"lint:fix": "yarn lint --fix",
"e2e:depr": "yarn lint && jest e2e --config e2e/jest.config.js",
"cypress": "cypress run",
@@ -81,7 +81,7 @@
"concurrently": "^7.0.0",
"coveralls": "^3.0.2",
"css-to-string-loader": "^0.1.3",
- "cypress": "10.3.0",
+ "cypress": "9.7.0",
"cypress-image-snapshot": "^4.0.1",
"documentation": "13.2.0",
"eslint": "^8.4.1",
@@ -112,7 +112,7 @@
"webpack-merge": "^5.8.0",
"webpack-node-externals": "^3.0.0"
},
- "resolutions": {
+ "resolutions": {
"d3": "^7.0.0"
},
"files": [
diff --git a/yarn.lock b/yarn.lock
index 15beabbe6..853d09418 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -70,12 +70,12 @@
"@applitools/utils" "1.3.10"
"@applitools/eyes-cypress@^3.25.7":
- version "3.26.4"
- resolved "https://registry.yarnpkg.com/@applitools/eyes-cypress/-/eyes-cypress-3.26.4.tgz#e1a511cc6ff9f851e29d918cebf9008922e6650d"
- integrity sha512-YTlLlNBEwyLKzkKH9kAWz17GkDpI5kkuFIP+Gm4BGjRYawpLpF9GvxlCng0Q+Lli1jMIEIP6tZnjrapHbKqm4A==
+ version "3.26.6"
+ resolved "https://registry.yarnpkg.com/@applitools/eyes-cypress/-/eyes-cypress-3.26.6.tgz#a629ef45e1ae37b2234a79fac197f858eae96ccf"
+ integrity sha512-bj6goVPMdptgRreFcdoOKWJzkebp3R0TYj7G8OGDm6H2cHPQGLwPT+1Z+1Moj9XGy1X6Pgur6TeTtGE4q/QsUw==
dependencies:
"@applitools/eyes-api" "1.7.4"
- "@applitools/eyes-universal" "2.9.6"
+ "@applitools/eyes-universal" "2.9.7"
"@applitools/functional-commons" "1.6.0"
"@applitools/logger" "1.1.15"
"@applitools/visual-grid-client" "15.13.6"
@@ -102,10 +102,10 @@
chalk "3.0.0"
tunnel "0.0.6"
-"@applitools/eyes-universal@2.9.6":
- version "2.9.6"
- resolved "https://registry.yarnpkg.com/@applitools/eyes-universal/-/eyes-universal-2.9.6.tgz#65dad010283d5117704137e6c10e4592c6bdd7e1"
- integrity sha512-Un6/p8CCI7bdootTDnjpls/mo53Q/3YV8VQQalbkR7Xex63Y4/r4Y/xowoAZb+Q/Iq/BblMwhKFh11dEePFMpA==
+"@applitools/eyes-universal@2.9.7":
+ version "2.9.7"
+ resolved "https://registry.yarnpkg.com/@applitools/eyes-universal/-/eyes-universal-2.9.7.tgz#0e4e5309e04abbeeb2f29a9e5d63a2feb90de55f"
+ integrity sha512-pqmgAt2MSSYsT1Iye0motD6x4O9IMF0CCpqKbllU2Om6KSSedT8+c8V0nr+SSrWxKYnvZ6Et1MPs2xYibOywsg==
dependencies:
"@applitools/execution-grid-client" "1.1.22"
"@applitools/eyes-sdk-core" "13.8.12"
@@ -4220,10 +4220,10 @@ cypress-image-snapshot@^4.0.1:
pkg-dir "^3.0.0"
term-img "^4.0.0"
-cypress@10.3.0:
- version "10.3.0"
- resolved "https://registry.yarnpkg.com/cypress/-/cypress-10.3.0.tgz#fae8d32f0822fcfb938e79c7c31ef344794336ae"
- integrity sha512-txkQWKzvBVnWdCuKs5Xc08gjpO89W2Dom2wpZgT9zWZT5jXxqPIxqP/NC1YArtkpmp3fN5HW8aDjYBizHLUFvg==
+cypress@9.7.0:
+ version "9.7.0"
+ resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.7.0.tgz#bf55b2afd481f7a113ef5604aa8b693564b5e744"
+ integrity sha512-+1EE1nuuuwIt/N1KXRR2iWHU+OiIt7H28jJDyyI4tiUftId/DrXYEwoDa5+kH2pki1zxnA0r6HrUGHV5eLbF5Q==
dependencies:
"@cypress/request" "^2.88.10"
"@cypress/xvfb" "^1.2.4"