Merge #949 'stringifying location for more consistent json parsing'

Also update History.md.
cucumber · Feb 11, 2016 · 9d1115c · 9d1115c
2 parents c22c19f + 3153491
commit 9d1115c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/History.md b/History.md
@@ -1,6 +1,12 @@
-## [In Git](https://github.com/cucumber/cucumber-ruby/compare/v2.3.1...master)
+## [In Git](https://github.com/cucumber/cucumber-ruby/compare/v2.3.2...master)
 
-... your change here?
+### New Features
+
+### Bugfixes
+
+* Stringifying location in the JSON formatter for more consistent json parsing ([949](https://github.com/cucumber/cucumber-ruby/pull/949), [945](https://github.com/cucumber/cucumber-ruby/issues/945) @larryprice)
+
+### Refactoring
 
 ## [v2.3.2](https://github.com/cucumber/cucumber-ruby/compare/v2.3.1...v2.3.2)
 

diff --git a/lib/cucumber/formatter/json.rb b/lib/cucumber/formatter/json.rb
@@ -179,7 +179,7 @@ def add_failed_around_hook(result)
       end
 
       def create_match_hash(test_step, result)
-        { location: test_step.action_location }
+        { location: test_step.action_location.to_s }
       end
 
       def create_result_hash(result)