Make sure Background steps are reported under the scenario they belong to. See #276

Author: aslakhellesoy

core/src/main/java/cucumber/runtime/model/CucumberScenario.java

@@ -19,6 +19,10 @@ public CucumberScenario(CucumberFeature cucumberFeature, CucumberBackground cucu
         this.cucumberBackground = cucumberBackground;
     }
 
+    public CucumberBackground getCucumberBackground() {
+        return cucumberBackground;
+    }
+
     /**
      * This method is called when Cucumber is run from the CLI, but not when run from JUnit
      */

junit/src/main/java/cucumber/junit/ExecutionUnitRunner.java

@@ -45,8 +45,15 @@ public String getName() {
     public Description getDescription() {
         if (description == null) {
             description = createDescription(getName(), cucumberScenario);
-            for (Step child : getChildren()) {
-                description.addChild(describeChild(child));
+
+            if(cucumberScenario.getCucumberBackground() != null) {
+                for (Step backgroundStep : cucumberScenario.getCucumberBackground().getSteps()) {
+                    description.addChild(describeChild(backgroundStep));
+                }
+            }
+
+            for (Step step : getChildren()) {
+                description.addChild(describeChild(step));
             }
         }
         return description;

picocontainer/src/test/resources/.cucumber/stepdefs.json

@@ -64,12 +64,7 @@
   {
     "source": "^I want to recognize colors as enums$",
     "flags": "",
-    "steps": [
-      {
-        "name": "I want to recognize colors as enums",
-        "args": []
-      }
-    ]
+    "steps": []
   },
   {
     "source": "^i use the (.*) in a step$",
@@ -104,7 +99,17 @@
   {
     "source": "^the date is (.+)$",
     "flags": "",
-    "steps": []
+    "steps": [
+      {
+        "name": "the date is 2011/10/25",
+        "args": [
+          {
+            "offset": 12,
+            "val": "2011/10/25"
+          }
+        ]
+      }
+    ]
   },
   {
     "source": "^the date should be (.+)$",
@@ -118,6 +123,15 @@
             "val": "Mar 1 2012"
           }
         ]
+      },
+      {
+        "name": "the date should be Oct 25 2011",
+        "args": [
+          {
+            "offset": 19,
+            "val": "Oct 25 2011"
+          }
+        ]
       }
     ]
   },
@@ -139,7 +153,17 @@
   {
     "source": "^the iso date is (.+)$",
     "flags": "",
-    "steps": []
+    "steps": [
+      {
+        "name": "the iso date is 2012-03-01T06:54:14",
+        "args": [
+          {
+            "offset": 16,
+            "val": "2012-03-01T06:54:14"
+          }
+        ]
+      }
+    ]
   },
   {
     "source": "^there are (\\d+) cukes in my belly",

picocontainer/src/test/resources/cucumber/runtime/java/picocontainer/dates.feature

@@ -1,11 +1,11 @@
 Feature: Dates
-#  Scenario: A pretty date
-#    Given the date is 2011/10/25
-#    Then the date should be Oct 25 2011
+  Scenario: A pretty date
+    Given the date is 2011/10/25
+    Then the date should be Oct 25 2011
 
-#  Scenario: An ISO 8601 date
-#    Given the iso date is 2012-03-01T06:54:14
-#    Then the date should be Mar 1 2012
+  Scenario: An ISO 8601 date
+    Given the iso date is 2012-03-01T06:54:14
+    Then the date should be Mar 1 2012
 
   Scenario: An ISO 8601 date as Calendar
     Given the iso calendar is 2012-03-01T06:54:14

picocontainer/src/test/resources/cucumber/runtime/java/picocontainer/enums.feature

@@ -1,7 +1,9 @@
 Feature: Java Enums
 
-  Scenario Outline: color should be recognized as an enum
+  Background:
     Given I want to recognize colors as enums
+
+  Scenario Outline: color should be recognized as an enum
     When i use the <color> in a step
     Then it should be recognized as enum