Merge remote-tracking branch 'origin/master'

gherking · Feb 14, 2018 · 63b2b3d · 63b2b3d
2 parents f850a2b + 9c1b401
commit 63b2b3d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/lib/builtIn/Macro.js b/lib/builtIn/Macro.js
@@ -27,6 +27,9 @@ class Macro extends DefaultConfig {
      * @returns {boolean|*} FALSE if the given element should be filtered out.
      */
     preFilterScenario(scenario, parent, i) {
+        if (!scenario.tags) {
+            return;
+        }
         const macroTag = scenario.tags.find(tag => /^@macro\(.*\)/.test(tag.name));
 
         if (macroTag) {

diff --git a/test/data/input/macro.feature b/test/data/input/macro.feature
@@ -1,5 +1,8 @@
 Feature: Test for macro
 
+  Background: Background
+    Given step
+
   @macro(not_used_macro)
   Scenario: Macro not used
     Given the Index pages is opened

diff --git a/test/data/output/macro.feature b/test/data/output/macro.feature
@@ -1,5 +1,8 @@
 Feature: Test for macro
 
+  Background: Background
+    Given step
+
   Scenario: Logging in
     Given the Login pages is opened
     When the username field is filled with the username of user_1