Merge pull request #136 from javierbrea/release

Release v3.1.0

CHANGELOG.md

@@ -11,6 +11,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Removed
 ### BREAKING CHANGES
 
+## [3.1.0] - 2021-07-22
+
+### Added
+- chore(#129): Support Cypress v8.x in peerDependencies. Add E2E tests using Cypress v8
+
+### Changed
+- chore(deps): Update dependencies
+
 ## [3.0.0] - 2021-06-23
 
 ### Added

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cypress-fail-fast",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "Skip the rest of Cypress tests on first failure",
   "keywords": [
     "cypress",
@@ -40,25 +40,25 @@
     "prepare": "is-ci || husky install"
   },
   "peerDependencies": {
-    "cypress": "5.x || 6.x || 7.x"
+    "cypress": "5.x || 6.x || 7.x || 8.x"
   },
   "dependencies": {
     "chalk": "4.1.1"
   },
   "devDependencies": {
-    "@stryker-mutator/core": "5.1.1",
-    "@stryker-mutator/jest-runner": "5.1.1",
+    "@stryker-mutator/core": "5.2.2",
+    "@stryker-mutator/jest-runner": "5.2.2",
     "babel-eslint": "10.1.0",
     "cross-env": "7.0.3",
-    "eslint": "7.29.0",
+    "eslint": "7.31.0",
     "eslint-config-prettier": "8.3.0",
     "eslint-plugin-prettier": "3.4.0",
     "eslint-plugin-react": "7.24.0",
-    "husky": "6.0.0",
+    "husky": "7.0.1",
     "is-ci": "3.0.0",
-    "jest": "27.0.4",
-    "lint-staged": "11.0.0",
-    "prettier": "2.3.1",
+    "jest": "27.0.6",
+    "lint-staged": "11.0.1",
+    "prettier": "2.3.2",
     "sinon": "11.1.1"
   },
   "lint-staged": {

sonar-project.properties

@@ -1,6 +1,6 @@
 sonar.organization=javierbrea
 sonar.projectKey=javierbrea_cypress-fail-fast
-sonar.projectVersion=3.0.0
+sonar.projectVersion=3.1.0
 
 sonar.javascript.file.suffixes=.js
 sonar.sourceEncoding=UTF-8

test-e2e/commands/support/variants.js

@@ -16,6 +16,12 @@ const VARIANTS = [
     path: "cypress-7",
     typescript: false,
   },
+  {
+    name: "Cypress 8",
+    path: "cypress-8",
+    typescript: false,
+    pluginFile: "preprocessor-babel-config",
+  },
   {
     name: "TypeScript",
     path: "typescript",

test-e2e/cypress-src/plugins-custom/parallel-preprocessor-babel-config/index.js

@@ -0,0 +1,43 @@
+const fsExtra = require("fs-extra");
+const path = require("path");
+const webpackPreprocessor = require("@cypress/webpack-preprocessor");
+const defaults = webpackPreprocessor.defaultOptions;
+
+const storageFile = path.resolve(
+  __dirname,
+  "..",
+  "..",
+  "..",
+  "..",
+  "parallel-storage",
+  "parallel-storage.json"
+);
+
+module.exports = (on, config) => {
+  require("../../../../../plugin")(on, config, {
+    parallelCallbacks: {
+      onCancel: () => {
+        fsExtra.writeJsonSync(storageFile, { cancelled: true });
+      },
+      isCancelled: () => {
+        if (fsExtra.pathExistsSync(storageFile)) {
+          return fsExtra.readJsonSync(storageFile).cancelled;
+        }
+        return false;
+      },
+    },
+  });
+
+  // Add log task
+  on("task", {
+    log: function (message) {
+      console.log(message);
+      return null;
+    },
+  });
+
+  delete defaults.webpackOptions.module.rules[0].use[0].options.presets;
+  on("file:preprocessor", webpackPreprocessor(defaults));
+
+  return config;
+};

test-e2e/cypress-src/plugins-custom/parallel-preprocessor-babel-config/index.ts

@@ -0,0 +1,39 @@
+import fsExtra = require("fs-extra");
+import path = require("path");
+
+const storageFile = path.resolve(
+  __dirname,
+  "..",
+  "..",
+  "..",
+  "..",
+  "parallel-storage",
+  "parallel-storage.json"
+);
+
+import cypressFailFast = require("../support/cypress-fail-fast/plugin");
+
+export default (on: Cypress.PluginEvents, config: Cypress.PluginConfigOptions): Cypress.ResolvedConfigOptions => {
+  cypressFailFast(on, config, {
+    parallelCallbacks: {
+      onCancel: () => {
+        fsExtra.writeJsonSync(storageFile, { cancelled: true });
+      },
+      isCancelled: () => {
+        if (fsExtra.pathExistsSync(storageFile)) {
+          return fsExtra.readJsonSync(storageFile).cancelled;
+        }
+        return false;
+      },
+    },
+  });
+
+  on("task", {
+    log: function (message) {
+      console.log(message);
+      return null;
+    },
+  });
+
+  return config;
+};

test-e2e/cypress-src/plugins-custom/preprocessor-babel-config/index.js

@@ -0,0 +1,19 @@
+const webpackPreprocessor = require("@cypress/webpack-preprocessor");
+const defaults = webpackPreprocessor.defaultOptions;
+
+module.exports = (on, config) => {
+  require("../../../../../plugin")(on, config);
+
+  // Add log task
+  on("task", {
+    log: function (message) {
+      console.log(message);
+      return null;
+    },
+  });
+
+  delete defaults.webpackOptions.module.rules[0].use[0].options.presets;
+  on("file:preprocessor", webpackPreprocessor(defaults));
+
+  return config;
+};

test-e2e/cypress-src/plugins-custom/preprocessor-babel-config/index.ts

@@ -0,0 +1,14 @@
+import cypressFailFast = require("../support/cypress-fail-fast/plugin");
+
+export default (on: Cypress.PluginEvents, config: Cypress.PluginConfigOptions): Cypress.ResolvedConfigOptions => {
+  cypressFailFast(on, config);
+
+  on("task", {
+    log: function (message) {
+      console.log(message);
+      return null;
+    },
+  });
+
+  return config;
+};

test-e2e/cypress-variants/cypress-8/.gitignore

@@ -0,0 +1,7 @@
+# exclude everything
+/*
+
+# exception to the rule
+!/.gitignore
+!/package.json
+!/package-lock.json