Update capybara, poltergeist, spinach, rspec-rails
This commit is contained in:
parent
af3138e801
commit
830da0c218
8
Gemfile
8
Gemfile
|
@ -134,9 +134,9 @@ end
|
|||
|
||||
group :development, :test do
|
||||
gem 'rails-dev-tweaks'
|
||||
gem 'spinach-rails'
|
||||
gem "rspec-rails"
|
||||
gem "capybara"
|
||||
gem 'spinach-rails', '0.2.0'
|
||||
gem "rspec-rails", '2.12.2'
|
||||
gem "capybara", '2.0.2'
|
||||
gem "pry"
|
||||
gem "awesome_print"
|
||||
gem "database_cleaner", ref: "f89c34300e114be99532f14c115b2799a3380ac6", git: "https://github.com/bmabey/database_cleaner.git"
|
||||
|
@ -153,7 +153,7 @@ group :development, :test do
|
|||
gem 'rb-inotify', require: linux_only('rb-inotify')
|
||||
|
||||
# PhantomJS driver for Capybara
|
||||
gem 'poltergeist', git: 'https://github.com/jonleighton/poltergeist.git', ref: '5c2e092001074a8cf09f332d3714e9ba150bc8ca'
|
||||
gem 'poltergeist', '1.1.0'
|
||||
end
|
||||
|
||||
group :test do
|
||||
|
|
58
Gemfile.lock
58
Gemfile.lock
|
@ -54,18 +54,6 @@ GIT
|
|||
specs:
|
||||
raphael-rails (2.1.0)
|
||||
|
||||
GIT
|
||||
remote: https://github.com/jonleighton/poltergeist.git
|
||||
revision: 5c2e092001074a8cf09f332d3714e9ba150bc8ca
|
||||
ref: 5c2e092001074a8cf09f332d3714e9ba150bc8ca
|
||||
specs:
|
||||
poltergeist (1.0.2)
|
||||
capybara (~> 1.1)
|
||||
childprocess (~> 0.3)
|
||||
faye-websocket (~> 0.4, >= 0.4.4)
|
||||
http_parser.rb (~> 0.5.3)
|
||||
multi_json (~> 1.0)
|
||||
|
||||
GEM
|
||||
remote: http://rubygems.org/
|
||||
specs:
|
||||
|
@ -110,13 +98,13 @@ GEM
|
|||
bootstrap-sass (2.2.1.1)
|
||||
sass (~> 3.2)
|
||||
builder (3.0.4)
|
||||
capybara (1.1.3)
|
||||
capybara (2.0.2)
|
||||
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)
|
||||
xpath (~> 1.0.0)
|
||||
carrierwave (0.7.1)
|
||||
activemodel (>= 3.2.0)
|
||||
activesupport (>= 3.2.0)
|
||||
|
@ -124,8 +112,8 @@ GEM
|
|||
facter (>= 1.6.12)
|
||||
timers (>= 1.0.0)
|
||||
charlock_holmes (0.6.9)
|
||||
childprocess (0.3.6)
|
||||
ffi (~> 1.0, >= 1.0.6)
|
||||
childprocess (0.3.8)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
chosen-rails (0.9.8)
|
||||
railties (~> 3.0)
|
||||
thor (~> 0.14)
|
||||
|
@ -169,10 +157,10 @@ GEM
|
|||
railties (>= 3.0.0)
|
||||
faraday (0.8.4)
|
||||
multipart-post (~> 1.1)
|
||||
faye-websocket (0.4.6)
|
||||
faye-websocket (0.4.7)
|
||||
eventmachine (>= 0.12.0)
|
||||
ffaker (1.15.0)
|
||||
ffi (1.1.5)
|
||||
ffi (1.4.0)
|
||||
font-awesome-sass-rails (3.0.0.1)
|
||||
railties (>= 3.1.1)
|
||||
sass-rails (>= 3.1.1)
|
||||
|
@ -249,8 +237,6 @@ GEM
|
|||
letter_opener (1.0.0)
|
||||
launchy (>= 2.0.4)
|
||||
libv8 (3.3.10.4)
|
||||
libwebsocket (0.1.6)
|
||||
websocket
|
||||
listen (0.5.3)
|
||||
lumberjack (1.0.2)
|
||||
mail (2.4.4)
|
||||
|
@ -261,12 +247,12 @@ GEM
|
|||
mime-types (1.21)
|
||||
modernizr (2.6.2)
|
||||
sprockets (~> 2.0)
|
||||
multi_json (1.5.1)
|
||||
multi_json (1.6.1)
|
||||
multi_xml (0.5.1)
|
||||
multipart-post (1.1.5)
|
||||
mysql2 (0.3.11)
|
||||
net-ldap (0.2.2)
|
||||
nokogiri (1.5.5)
|
||||
nokogiri (1.5.6)
|
||||
oauth (0.4.7)
|
||||
oauth2 (0.8.0)
|
||||
faraday (~> 0.8)
|
||||
|
@ -294,6 +280,10 @@ GEM
|
|||
omniauth-oauth (~> 1.0)
|
||||
orm_adapter (0.4.0)
|
||||
pg (0.14.1)
|
||||
poltergeist (1.1.0)
|
||||
capybara (~> 2.0, >= 2.0.1)
|
||||
faye-websocket (~> 0.4, >= 0.4.4)
|
||||
http_parser.rb (~> 0.5.3)
|
||||
polyglot (0.3.3)
|
||||
posix-spawn (0.3.6)
|
||||
progressbar (0.12.0)
|
||||
|
@ -364,7 +354,7 @@ GEM
|
|||
rspec-expectations (2.12.0)
|
||||
diff-lcs (~> 1.1.3)
|
||||
rspec-mocks (2.12.0)
|
||||
rspec-rails (2.12.0)
|
||||
rspec-rails (2.12.2)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
railties (>= 3.0)
|
||||
|
@ -384,11 +374,11 @@ GEM
|
|||
seed-fu (2.2.0)
|
||||
activerecord (~> 3.1)
|
||||
activesupport (~> 3.1)
|
||||
selenium-webdriver (2.26.0)
|
||||
selenium-webdriver (2.30.0)
|
||||
childprocess (>= 0.2.5)
|
||||
libwebsocket (~> 0.1.3)
|
||||
multi_json (~> 1.0)
|
||||
rubyzip
|
||||
websocket (~> 1.0.4)
|
||||
settingslogic (2.0.8)
|
||||
sexp_processor (4.1.3)
|
||||
shoulda-matchers (1.3.0)
|
||||
|
@ -412,11 +402,11 @@ GEM
|
|||
temple (~> 0.5.5)
|
||||
tilt (~> 1.3.3)
|
||||
slop (3.3.3)
|
||||
spinach (0.5.2)
|
||||
spinach (0.7.0)
|
||||
colorize
|
||||
gherkin-ruby (~> 0.2.0)
|
||||
spinach-rails (0.1.8)
|
||||
capybara (~> 1)
|
||||
spinach-rails (0.2.0)
|
||||
capybara (~> 2.0.0)
|
||||
railties (>= 3)
|
||||
spinach (>= 0.4)
|
||||
sprockets (2.2.2)
|
||||
|
@ -455,8 +445,8 @@ GEM
|
|||
webmock (1.9.0)
|
||||
addressable (>= 2.2.7)
|
||||
crack (>= 0.1.7)
|
||||
websocket (1.0.2)
|
||||
xpath (0.1.4)
|
||||
websocket (1.0.7)
|
||||
xpath (1.0.0)
|
||||
nokogiri (~> 1.3)
|
||||
yajl-ruby (1.1.0)
|
||||
|
||||
|
@ -470,7 +460,7 @@ DEPENDENCIES
|
|||
better_errors
|
||||
binding_of_caller
|
||||
bootstrap-sass (= 2.2.1.1)
|
||||
capybara
|
||||
capybara (= 2.0.2)
|
||||
carrierwave (~> 0.7.1)
|
||||
chosen-rails (= 0.9.8)
|
||||
coffee-rails (~> 3.2.2)
|
||||
|
@ -512,7 +502,7 @@ DEPENDENCIES
|
|||
omniauth-google-oauth2
|
||||
omniauth-twitter
|
||||
pg
|
||||
poltergeist!
|
||||
poltergeist (= 1.1.0)
|
||||
pry
|
||||
pygments.rb!
|
||||
quiet_assets (~> 1.0.1)
|
||||
|
@ -524,7 +514,7 @@ DEPENDENCIES
|
|||
rb-fsevent
|
||||
rb-inotify
|
||||
redcarpet (~> 2.2.2)
|
||||
rspec-rails
|
||||
rspec-rails (= 2.12.2)
|
||||
sass-rails (~> 3.2.5)
|
||||
sdoc
|
||||
seed-fu
|
||||
|
@ -535,7 +525,7 @@ DEPENDENCIES
|
|||
sinatra
|
||||
six
|
||||
slim
|
||||
spinach-rails
|
||||
spinach-rails (= 0.2.0)
|
||||
stamp
|
||||
state_machine
|
||||
test_after_commit
|
||||
|
|
Loading…
Reference in a new issue