Merge pull request #87 from aaronjrich/master

Restored Background description and reflected in model
picklesdoc · Dec 19, 2013 · 3026820 · 3026820
2 parents 7e961b8 + 49896cc
commit 3026820
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 3 deletions.
diff --git a/src/Pickles/Examples/Features/14MarkdownExample/MarkdownExamples.feature b/src/Pickles/Examples/Features/14MarkdownExample/MarkdownExamples.feature
@@ -26,6 +26,12 @@
 
 	- - -
 
+	Background:
+		This is the *coolest* background
+
+		Given I have initialized the Sum-variable to 0
+		When I add 1 to the Sum-variable
+
 	Scenario: Sample Markdown Scenario Example
 
 		This is **important** text

diff --git a/src/Pickles/Pickles.BaseDhtmlFiles/Index.html b/src/Pickles/Pickles.BaseDhtmlFiles/Index.html
@@ -114,7 +114,7 @@ <h1 data-bind="text: Name, click: $root.toggleDetails" class="canHighlight, clic
                         <div class="row-fluid" data-bind="if: Background">
                             <div class="scenario">
                                 <h4>Background:</h4>
-                                <div class="description" data-bind="html: renderMarkdownBlock(Description)"></div>
+                                <div class="description" data-bind="html: renderMarkdownBlock(Background.Description)"></div>
                                 <ul data-bind="template: { name: 'steps-template', foreach: Background.Steps }"></ul>
                             </div>
                         </div>

diff --git a/src/Pickles/Pickles.BaseDhtmlFiles/js/featuresModel.js b/src/Pickles/Pickles.BaseDhtmlFiles/js/featuresModel.js
@@ -42,8 +42,8 @@ function Examples(data) {
 }
 
 function Background(data) {
-    this.Name = '';
-    this.Description = '';
+    this.Name = data.Name || '';
+    this.Description = data.Description || '';
     this.Steps = $.map(data.Steps, function(step) { return new Step(step); }) || new Array();
     this.Tags = data.Tags || null;
     this.Result = data.Result == null ? null : new Result(data.Result);

diff --git a/src/Pickles/Pickles.BaseDhtmlFiles/pickledFeatures.js b/src/Pickles/Pickles.BaseDhtmlFiles/pickledFeatures.js
@@ -260,6 +260,27 @@ jsonPWrapper ([
           }
         }
       ],
+      "Background": {
+        "Name": "",
+        "Description": "This is the *coolest* background",
+        "Steps": [
+          {
+            "Keyword": "Given",
+            "NativeKeyword": "Given ",
+            "Name": "I have initialized the Sum-variable to 0"
+          },
+          {
+            "Keyword": "When",
+            "NativeKeyword": "When ",
+            "Name": "I add 1 to the Sum-variable"
+          }
+        ],
+        "Tags": [],
+        "Result": {
+          "WasExecuted": false,
+          "WasSuccessful": false
+        }
+      },
       "Result": {
         "WasExecuted": false,
         "WasSuccessful": false

diff --git a/src/Pickles/Pickles/Resources/Pickles.BaseDhtmlFiles.zip b/src/Pickles/Pickles/Resources/Pickles.BaseDhtmlFiles.zip