gherkin 2.4.21-x86-mswin32 → 2.5.0-x86-mswin32

data/lib/gherkin/formatter/json_formatter.rb

@@ -29,14 +29,17 @@ module Gherkin
 
       def background(background)
         feature_elements << background.to_hash
+        @step_index = 0
       end
 
       def scenario(scenario)
         feature_elements << scenario.to_hash
+        @step_index = 0
       end
 
       def scenario_outline(scenario_outline)
         feature_elements << scenario_outline.to_hash
+        @step_index = 0
       end
 
       def examples(examples)
@@ -48,11 +51,16 @@ module Gherkin
       end
 
       def match(match)
-        last_step['match'] = match.to_hash
+        current_steps[@step_index]['match'] = match.to_hash
       end
 
       def result(result)
-        last_step['result'] = result.to_hash
+        current_steps[@step_index]['result'] = result.to_hash
+        @step_index += 1
+      end
+
+      def last_step
+        current_steps[-1]
       end
 
       def embedding(mime_type, data)
@@ -81,10 +89,6 @@ module Gherkin
         feature_element['steps'] ||= []
       end
 
-      def last_step
-        current_steps[-1]
-      end
-
       def embeddings
         last_step['embeddings'] ||= []
       end

data/lib/gherkin/formatter/model.rb

@@ -112,15 +112,15 @@ module Gherkin
       class Step < BasicStatement
         native_impl('gherkin')
 
-        attr_accessor :multiline_arg
+        attr_accessor :rows
+        attr_accessor :doc_string
 
         def line_range
           range = super
-          case multiline_arg
-          when Array
-            range = range.first..multiline_arg[-1].line
-          when Model::DocString
-            range = range.first..multiline_arg.line_range.last
+          if(rows)
+            range = range.first..rows[-1].line
+          elsif(doc_string)
+            range = range.first..doc_string.line_range.last
           end
           range
         end
@@ -136,20 +136,6 @@ module Gherkin
             Argument.new(offset, val)
           end
         end
-
-        def to_hash
-          hash = super
-          if Array === @multiline_arg
-            hash['multiline_arg'] = {
-              'type' => 'table',
-              'value' => hash['multiline_arg']
-            }
-          elsif DocString === @multiline_arg
-            hash['multiline_arg']['type'] = 'doc_string'
-            hash['multiline_arg']['content_type'] = @multiline_arg.content_type
-          end
-          hash
-        end
       end
 
       class Comment < Hashable

data/lib/gherkin/formatter/pretty_formatter.rb

@@ -110,12 +110,9 @@ module Gherkin
         @io.write(text_format.text(step.keyword))
         @step_printer.write_step(@io, text_format, arg_format, step.name, arguments)
         @io.puts(indented_location(location, proceed))
-        case step.multiline_arg
-        when Model::DocString
-          doc_string(step.multiline_arg)
-        when Array
-          table(step.multiline_arg)
-        end
+        
+        doc_string(step.doc_string) if step.doc_string
+        table(step.rows) if step.rows
       end
 
       class MonochromeFormat

data/lib/gherkin/json_parser.rb

@@ -53,12 +53,11 @@ module Gherkin
     def step(o)
       step = Formatter::Model::Step.new(comments(o), keyword(o), name(o), line(o))
 
-      if(ma = o['multiline_arg'])
-        if(ma['type'] == 'table')
-          step.multiline_arg = rows(ma['value'])
-        else
-          step.multiline_arg = Formatter::Model::DocString.new(ma['content_type'].to_s, ma['value'], ma['line'])
-        end
+      if(o['rows'])
+        step.rows = rows(o['rows'])
+      elsif(o['doc_string'])
+        ds = o['doc_string']
+        step.doc_string = Formatter::Model::DocString.new(ds['content_type'].to_s, ds['value'], ds['line'])
       end
 
       step

data/lib/gherkin/listener/formatter_listener.rb

@@ -98,7 +98,11 @@ module Gherkin
 
       def replay_step_or_examples
         if(@step_statement)
-          @step_statement.multiline_arg = grab_doc_string! || grab_rows!
+          if(doc_string = grab_doc_string!)
+            @step_statement.doc_string = doc_string
+          elsif(rows = grab_rows!)
+            @step_statement.rows = rows
+          end
           @formatter.step(@step_statement)
           @step_statement = nil
         end

data/spec/gherkin/fixtures/complex.json

@@ -29,14 +29,9 @@
       "steps": [
         { "name": "A step with a table",
           "keyword": "Given ",
-          "multiline_arg": {
-            "type": "table",
-            "value" : [
-              {"cells":
-                [ "a","row","for","a","step" ]
-              }
-            ]
-          }
+          "rows" : [
+            {"cells": [ "a","row","for","a","step" ]}
+          ]
         }
       ],
       "examples": [
@@ -79,41 +74,35 @@
       "steps" : [
         { "name" : "a third step with a table",
           "keyword": "Given ",
-          "multiline_arg": {
-            "type": "table",
-            "value": [
-              {
-                "cells" : [ "a","b" ],
-                "line" : 987
-              },
-              { "cells" :
-                [ "c","d" ]
-              },
-              { "cells" :
-                [ "e", "f" ]
-              }
-            ]
-          }
+          "rows": [
+            {
+              "cells" : [ "a","b" ],
+              "line" : 987
+            },
+            { "cells" :
+              [ "c","d" ]
+            },
+            { "cells" :
+              [ "e", "f" ]
+            }
+          ]
         },
         { "name" : "I am still testing things",
           "keyword": "Given ",
-          "multiline_arg": {
-            "type": "table",
-            "value": [
-              { "cells" :
-                [ "g","h" ]
-              },
-              { "cells" :
-                [ "e","r" ]
-              },
-              { "cells" :
-                [ "k", "i" ]
-              },
-              { "cells" :
-                [ "n", "" ]
-              }
-            ]
-          }
+          "rows": [
+            { "cells" :
+              [ "g","h" ]
+            },
+            { "cells" :
+              [ "e","r" ]
+            },
+            { "cells" :
+              [ "k", "i" ]
+            },
+            { "cells" :
+              [ "n", "" ]
+            }
+          ]
         },
         { "name" : "I am done testing these tables",
           "keyword": "Given " },
@@ -128,8 +117,7 @@
       "steps" : [
         { "name" : "All work and no play", 
           "keyword": "Given ",
-          "multiline_arg": {
-            "type": "doc_string",
+          "doc_string": {
             "content_type": "text",
             "value": "Makes Homer something something\nAnd something else",
             "line": 777

data/spec/gherkin/formatter/json_formatter_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+require 'stringio'
+require 'gherkin/formatter/json_formatter'
+require 'gherkin/formatter/model'
+
+module Gherkin
+  module Formatter
+    describe JSONFormatter do
+      it "renders results" do
+        io = StringIO.new
+        f = JSONFormatter.new(io)
+        f.uri("f.feature")
+        f.feature(Model::Feature.new([], [], "Feature", "f", "", 1))
+        f.scenario(Model::Scenario.new([], [], "Feature", "f", "", 2))
+        f.step(Model::Step.new([], "Given ", "g", 3))
+        f.step(Model::Step.new([], "When ", "w", 4))
+
+        f.match(Model::Match.new([], "def.rb:33"))
+        f.result(Model::Result.new(:passed, 1, nil))
+
+        f.match(Model::Match.new([], "def.rb:44"))
+        f.result(Model::Result.new(:passed, 1, nil))
+
+        f.eof
+        
+        expected = %{
+          {
+            "keyword": "Feature",
+            "name": "f",
+            "line": 1,
+            "description": "",
+            "elements": [
+              {
+                "keyword": "Feature",
+                "name": "f",
+                "line": 2,
+                "description": "",
+                "type": "scenario",
+                "steps": [
+                  {
+                    "keyword": "Given ",
+                    "name": "g",
+                    "line": 3,
+                    "match": {
+                      "location": "def.rb:33"
+                    },
+                    "result": {
+                      "status": "passed",
+                      "duration": 1
+                    }
+                  },
+                  {
+                    "keyword": "When ",
+                    "name": "w",
+                    "line": 4,
+                    "match": {
+                      "location": "def.rb:44"
+                    },
+                    "result": {
+                      "status": "passed",
+                      "duration": 1
+                    }
+                  }
+                ]
+              }
+            ]
+          }
+        }
+
+        JSON.parse(expected).should == JSON.parse(io.string)
+      end
+    end
+  end
+end