Merge pull request #1 from Benny1992/master

Updated Dependencies
codegram · Sep 1, 2014 · d7d9c73 · d7d9c73
2 parents 8d51eb2 + 1448023
commit d7d9c73
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 31 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,44 +1,35 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    capybara (1.1.1)
+    capybara (2.4.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
+      xpath (~> 2.0)
-      xpath (~> 0.1.4)
+    colorize (0.7.3)
-    childprocess (0.2.2)
+    gherkin-ruby (0.3.2)
-      ffi (~> 1.0.6)
+    json (1.8.1)
-    colorize (0.5.8)
+    mime-types (2.3)
-    ffi (1.0.9)
+    mini_portile (0.6.0)
-    gherkin (2.5.4)
+    nokogiri (1.6.3.1)
-      json (>= 1.4.6)
+      mini_portile (= 0.6.0)
-    json (1.6.1)
+    rack (1.5.2)
-    json_pure (1.6.1)
+    rack-protection (1.5.3)
-    mime-types (1.16)
-    nokogiri (1.5.0)
-    rack (1.3.5)
-    rack-protection (1.1.4)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rake (0.9.2)
+    rake (10.3.2)
-    rubyzip (0.9.4)
+    sinatra (1.4.5)
-    selenium-webdriver (2.9.1)
+      rack (~> 1.4)
-      childprocess (>= 0.2.1)
+      rack-protection (~> 1.4)
-      ffi (= 1.0.9)
+      tilt (~> 1.3, >= 1.3.4)
-      json_pure
+    spinach (0.8.10)
-      rubyzip
-    sinatra (1.3.1)
-      rack (>= 1.3.4, ~> 1.3)
-      rack-protection (>= 1.1.2, ~> 1.1)
-      tilt (>= 1.3.3, ~> 1.3)
-    spinach (0.1.5.2)
       colorize
-      gherkin
+      gherkin-ruby (>= 0.3.2)
-    tilt (1.3.3)
+      json
-    xpath (0.1.4)
+    tilt (1.4.1)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS

diff --git a/features/support/env.rb b/features/support/env.rb
@@ -1,5 +1,6 @@
 require_relative '../../app'
 
 require 'spinach/capybara'
+require 'minitest/spec'
 Spinach::FeatureSteps.send(:include, Spinach::FeatureSteps::Capybara)
 Capybara.app = Sinatra::Application