Skip to content

Commit

Permalink
CI
Browse files Browse the repository at this point in the history
  • Loading branch information
Lomilar committed Sep 24, 2024
1 parent 0105933 commit 4a03f58
Show file tree
Hide file tree
Showing 7 changed files with 94 additions and 4 deletions.
1 change: 1 addition & 0 deletions cypressBrowserify.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ module.exports = defineConfig({
// We've imported your old cypress plugins here.
// You may want to clean this up later by importing these.
setupNodeEvents(on, config) {
require("cypress-fail-fast/plugin")(on, config);
return require('./cypressBrowserify/plugins/index.js')(on, config)
},
specPattern: 'src//**/*.test.js',
Expand Down
1 change: 1 addition & 0 deletions cypressVite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ module.exports = defineConfig({
// We've imported your old cypress plugins here.
// You may want to clean this up later by importing these.
setupNodeEvents(on, config) {
require("cypress-fail-fast/plugin")(on, config);
return require('./cypressVite/plugins/index.js')(on, config)
},
specPattern: 'src//**/*.test.js',
Expand Down
1 change: 1 addition & 0 deletions cypressWebpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ module.exports = defineConfig({
// We've imported your old cypress plugins here.
// You may want to clean this up later by importing these.
setupNodeEvents(on, config) {
require("cypress-fail-fast/plugin")(on, config);
return require('./cypressWebpack/plugins/index.js')(on, config)
},
specPattern: 'src//**/*.test.js',
Expand Down
4 changes: 2 additions & 2 deletions docker/cypress
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM cypress/included:13.7.0
FROM cypress/included:13.9.0

WORKDIR code
COPY package.json package.json
Expand All @@ -15,4 +15,4 @@ COPY cypressWebpack.config.js cypressWebpack.config.js
COPY cypressBrowserify.config.js cypressBrowserify.config.js
COPY cypressVite cypressVite
COPY cypressVite.config.js cypressVite.config.js
ENTRYPOINT cypress run --config-file cypressWebpack.config.js --browser edge && cypress run --config-file cypressWebpack.config.js --browser chrome && cypress run --config-file cypressWebpack.config.js
ENTRYPOINT cypress run -e CASS_LOOPBACK=${CASS_LOOPBACK} --config-file cypressWebpack.config.js --browser edge && cypress run -e CASS_LOOPBACK=${CASS_LOOPBACK} --config-file cypressWebpack.config.js --browser chrome && cypress run -e CASS_LOOPBACK=${CASS_LOOPBACK} --config-file cypressWebpack.config.js
4 changes: 2 additions & 2 deletions docker/cypressHttps
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM cypress/included:13.7.0
FROM cypress/included:13.9.0

WORKDIR code
COPY package.json package.json
Expand All @@ -13,4 +13,4 @@ COPY cypressWebpack cypressWebpack
COPY cypressBrowserify cypressBrowserify
COPY cypressWebpack.config.js cypressWebpack.config.js
COPY cypressBrowserify.config.js cypressBrowserify.config.js
ENTRYPOINT cypress run --config-file cypressWebpack.config.js --browser edge && cypress run --config-file cypressWebpack.config.js --browser chrome && cypress run --config-file cypressWebpack.config.js
ENTRYPOINT cypress run -e CASS_LOOPBACK=${CASS_LOOPBACK} --config-file cypressWebpack.config.js --browser edge && cypress run -e CASS_LOOPBACK=${CASS_LOOPBACK} --config-file cypressWebpack.config.js --browser chrome && cypress run -e CASS_LOOPBACK=${CASS_LOOPBACK} --config-file cypressWebpack.config.js
86 changes: 86 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@
"concurrently": "^9.0.1",
"convert-hrtime": "^5.0.0",
"cypress": "^13.14.2",
"cypress-fail-fast": "^7.1.1",
"eslint": "^9.11.0",
"mocha": "^10.7.3",
"node-polyfill-webpack-plugin": "^2.0.1",
Expand Down

0 comments on commit 4a03f58

Please sign in to comment.