From 015f3642d05e1bcc803503b615334fa5b87335ac Mon Sep 17 00:00:00 2001
From: Julien Biezemans <jb@jbpros.com>
Date: Fri, 8 May 2015 11:55:45 +0200
Subject: [PATCH] Bump Cucumber gem to 2.0.0

---
 Gemfile                                     |  2 +-
 Gemfile.lock                                | 21 +++++++++++++--------
 features/step_definitions/cucumber_steps.rb |  2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index c4a7b29ee..8f65259dd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 group :test do
   gem "rake", "10.4.2"
   gem "aruba", "0.4.11"
-  gem "cucumber", "<2.0.0"
+  gem "cucumber", "2.0.0"
 end
 
 group :dev do
diff --git a/Gemfile.lock b/Gemfile.lock
index 2f3ade538..285c7da04 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,25 +6,30 @@ GEM
       cucumber (>= 1.1.1)
       ffi (>= 1.0.11)
       rspec (>= 2.7.0)
-    builder (3.1.3)
+    builder (3.2.2)
     childprocess (0.3.5)
       ffi (~> 1.0, >= 1.0.6)
-    cucumber (1.2.1)
+    cucumber (2.0.0)
       builder (>= 2.1.2)
+      cucumber-core (~> 1.1.3)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+    cucumber-core (1.1.3)
+      gherkin (~> 2.12.0)
     diff-lcs (1.1.3)
     ffi (1.1.5)
-    gherkin (2.11.3)
-      json (>= 1.4.6)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
     guard (1.4.0)
       listen (>= 0.4.2)
       thor (>= 0.14.6)
     guard-jasmine-node (0.0.5)
       guard (>= 0.4)
-    json (1.7.5)
     listen (0.5.3)
+    multi_json (1.11.0)
+    multi_test (0.1.2)
     rake (10.4.2)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
@@ -41,6 +46,6 @@ PLATFORMS
 
 DEPENDENCIES
   aruba (= 0.4.11)
-  cucumber (< 2.0.0)
+  cucumber (= 2.0.0)
   guard-jasmine-node (= 0.0.5)
   rake (= 10.4.2)
diff --git a/features/step_definitions/cucumber_steps.rb b/features/step_definitions/cucumber_steps.rb
index 33a44c0a5..43bed04b7 100644
--- a/features/step_definitions/cucumber_steps.rb
+++ b/features/step_definitions/cucumber_steps.rb
@@ -93,7 +93,7 @@
 end
 
 Then /^it outputs this json:$/ do |json|
-  assert_json_output json
+  assert_json_output json.to_s
 end
 
 Then /^it outputs this text:$/ do |json|