Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #1 from Benny1992/master

Updated Dependencies
  • Loading branch information...
commit d7d9c7365aeba289f5adbd1d58a3fc7c88bdebe0 2 parents 8d51eb2 + 1448023
@josepjaume josepjaume authored
Showing with 23 additions and 31 deletions.
  1. +22 −31 Gemfile.lock
  2. +1 −0  features/support/env.rb
View
53 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 (~> 0.1.4)
- childprocess (0.2.2)
- ffi (~> 1.0.6)
- colorize (0.5.8)
- ffi (1.0.9)
- gherkin (2.5.4)
- json (>= 1.4.6)
- json (1.6.1)
- json_pure (1.6.1)
- mime-types (1.16)
- nokogiri (1.5.0)
- rack (1.3.5)
- rack-protection (1.1.4)
+ xpath (~> 2.0)
+ colorize (0.7.3)
+ gherkin-ruby (0.3.2)
+ json (1.8.1)
+ mime-types (2.3)
+ mini_portile (0.6.0)
+ nokogiri (1.6.3.1)
+ mini_portile (= 0.6.0)
+ rack (1.5.2)
+ rack-protection (1.5.3)
rack
- rack-test (0.6.1)
+ rack-test (0.6.2)
rack (>= 1.0)
- rake (0.9.2)
- rubyzip (0.9.4)
- selenium-webdriver (2.9.1)
- childprocess (>= 0.2.1)
- ffi (= 1.0.9)
- json_pure
- 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)
+ rake (10.3.2)
+ sinatra (1.4.5)
+ rack (~> 1.4)
+ rack-protection (~> 1.4)
+ tilt (~> 1.3, >= 1.3.4)
+ spinach (0.8.10)
colorize
- gherkin
- tilt (1.3.3)
- xpath (0.1.4)
+ gherkin-ruby (>= 0.3.2)
+ json
+ tilt (1.4.1)
+ xpath (2.0.0)
nokogiri (~> 1.3)
PLATFORMS
View
1  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
Please sign in to comment.
Something went wrong with that request. Please try again.