fix(.features): have the new load-all loader work with non-global step definitions

Author: lgandecki

lib/featuresLoader.js

@@ -7,22 +7,32 @@ const log = require("debug")("cypress:cucumber");
 const { getStepDefinitionsPaths } = require("./getStepDefinitionsPaths");
 const { cucumberTemplate } = require("./cucumberTemplate");
 const { getCucumberJsonConfig } = require("./getCucumberJsonConfig");
+const {
+  isNonGlobalStepDefinitionsMode
+} = require("./isNonGlobalStepDefinitionsMode");
 
-// This is the template for the file that we will send back to cypress instead of the text of a
-// feature file
-const createCucumber = (specs, toRequire, cucumberJson) =>
+const createCucumber = (
+  specs,
+  globalToRequire,
+  nonGlobalToRequire,
+  cucumberJson
+) =>
   `
     ${cucumberTemplate}
     
   window.cucumberJson = ${JSON.stringify(cucumberJson)};
 
-  ${toRequire.join("\n")}
+  ${globalToRequire.join("\n")}
 
   ${specs
     .map(
-      ({ spec, filePath, name }) =>
-        `
+      ({ spec, filePath, name }) => `
         describe(\`${name}\`, function() {
+        ${nonGlobalToRequire &&
+          nonGlobalToRequire
+            .find(fileSteps => fileSteps[filePath])
+            [filePath].join("\n")}
+            
         createTestsFromFeature('${filePath}', \`${spec}\`);
         })
         `
@@ -35,24 +45,35 @@ module.exports = function(_, filePath) {
 
   const features = glob.sync(`${path.dirname(filePath)}/**/*.feature`);
 
-  const stepDefinitionsToRequire = [
-    ...new Set(
-      features.reduce(
-        requires =>
-          requires.concat(
-            getStepDefinitionsPaths(filePath).map(
-              sdPath => `require('${sdPath}')`
-            )
-          ),
-        []
+  let globalStepDefinitionsToRequire = [];
+  let nonGlobalStepDefinitionsToRequire;
+
+  if (isNonGlobalStepDefinitionsMode()) {
+    nonGlobalStepDefinitionsToRequire = features.map(featurePath => ({
+      [featurePath]: getStepDefinitionsPaths(featurePath).map(
+        sdPath => `require('${sdPath}')`
       )
-    )
-  ];
+    }));
+  } else {
+    globalStepDefinitionsToRequire = [
+      ...new Set(
+        features.reduce(
+          requires =>
+            requires.concat(
+              getStepDefinitionsPaths(filePath).map(
+                sdPath => `require('${sdPath}')`
+              )
+            ),
+          []
+        )
+      )
+    ];
+  }
 
   const specs = features
     .map(featurePath => ({
       spec: fs.readFileSync(featurePath).toString(),
-      filePath: path.basename(featurePath)
+      filePath: featurePath
     }))
     .map(feature =>
       Object.assign({}, feature, {
@@ -62,7 +83,8 @@ module.exports = function(_, filePath) {
 
   return createCucumber(
     specs,
-    stepDefinitionsToRequire,
+    globalStepDefinitionsToRequire,
+    nonGlobalStepDefinitionsToRequire,
     getCucumberJsonConfig()
   );
 };

lib/getStepDefinitionsPaths.js

@@ -11,7 +11,7 @@ const getStepDefinitionsPaths = filePath => {
     const nonGlobalPattern = `${getStepDefinitionPathsFrom(
       filePath
     )}/**/*.+(js|ts)`;
-
+    console.log("GOZDECKI nonGlobalPattern", nonGlobalPattern);
     const commonPath =
       loaded.config.commonPath || `${stepDefinitionPath()}/common/`;
     const commonDefinitionsPattern = `${commonPath}**/*.+(js|ts)`;

lib/isNonGlobalStepDefinitionsMode.js

@@ -0,0 +1,7 @@
+const cosmiconfig = require("cosmiconfig");
+
+exports.isNonGlobalStepDefinitionsMode = () => {
+  const explorer = cosmiconfig("cypress-cucumber-preprocessor", { sync: true });
+  const loaded = explorer.load();
+  return loaded && loaded.config && loaded.config.nonGlobalStepDefinitions;
+};