Skip to content
This repository has been archived by the owner on Dec 16, 2022. It is now read-only.

Commit

Permalink
Bump capybara-webkit and Rails
Browse files Browse the repository at this point in the history
  • Loading branch information
mhoran committed Jan 14, 2013
1 parent 644c732 commit dfbc44d
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 57 deletions.
4 changes: 2 additions & 2 deletions Gemfile
@@ -1,12 +1,12 @@
source 'https://rubygems.org'

gem 'rails', '3.2.2'
gem 'rails'

gem 'json'

group :test do
gem 'cucumber-rails'
gem 'capybara-webkit', github: 'thoughtbot/capybara-webkit'
gem 'capybara-webkit'
end

group :test, :development do
Expand Down
106 changes: 51 additions & 55 deletions Gemfile.lock
@@ -1,51 +1,46 @@
GIT
remote: git://github.com/thoughtbot/capybara-webkit.git
revision: 808e23a20827d6856450171280130d30ffdb82c6
specs:
capybara-webkit (0.13.0)
capybara (>= 2.0.1)
json

GEM
remote: https://rubygems.org/
specs:
actionmailer (3.2.2)
actionpack (= 3.2.2)
mail (~> 2.4.0)
actionpack (3.2.2)
activemodel (= 3.2.2)
activesupport (= 3.2.2)
actionmailer (3.2.11)
actionpack (= 3.2.11)
mail (~> 2.4.4)
actionpack (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.1)
journey (~> 1.0.4)
rack (~> 1.4.0)
rack-cache (~> 1.1)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.1.2)
activemodel (3.2.2)
activesupport (= 3.2.2)
sprockets (~> 2.2.1)
activemodel (3.2.11)
activesupport (= 3.2.11)
builder (~> 3.0.0)
activerecord (3.2.2)
activemodel (= 3.2.2)
activesupport (= 3.2.2)
activerecord (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.2)
activemodel (= 3.2.2)
activesupport (= 3.2.2)
activesupport (3.2.2)
activeresource (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
activesupport (3.2.11)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.3.2)
arel (3.0.2)
builder (3.0.0)
capybara (2.0.1)
builder (3.0.4)
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 (~> 1.0.0)
capybara-webkit (0.14.1)
capybara (~> 2.0, >= 2.0.2)
json
childprocess (0.3.6)
ffi (~> 1.0, >= 1.0.6)
cucumber (1.1.9)
Expand All @@ -60,16 +55,16 @@ GEM
nokogiri (>= 1.5.0)
diff-lcs (1.1.3)
erubis (2.7.0)
ffi (1.2.0)
ffi (1.3.1)
gherkin (2.9.0)
json (>= 1.4.6)
hike (1.2.1)
i18n (0.6.0)
journey (1.0.3)
i18n (0.6.1)
journey (1.0.4)
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
json (1.7.5)
json (1.7.6)
libwebsocket (0.1.7.1)
addressable
websocket
Expand All @@ -78,32 +73,32 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.19)
multi_json (1.4.0)
nokogiri (1.5.5)
multi_json (1.5.0)
nokogiri (1.5.6)
polyglot (0.3.3)
rack (1.4.1)
rack (1.4.4)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.2)
actionmailer (= 3.2.2)
actionpack (= 3.2.2)
activerecord (= 3.2.2)
activeresource (= 3.2.2)
activesupport (= 3.2.2)
rails (3.2.11)
actionmailer (= 3.2.11)
actionpack (= 3.2.11)
activerecord (= 3.2.11)
activeresource (= 3.2.11)
activesupport (= 3.2.11)
bundler (~> 1.0)
railties (= 3.2.2)
railties (3.2.2)
actionpack (= 3.2.2)
activesupport (= 3.2.2)
railties (= 3.2.11)
railties (3.2.11)
actionpack (= 3.2.11)
activesupport (= 3.2.11)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2.2)
thor (>= 0.14.6, < 2.0)
rake (10.0.3)
rdoc (3.12)
json (~> 1.4)
rspec (2.8.0)
Expand All @@ -120,33 +115,34 @@ GEM
railties (>= 3.0)
rspec (~> 2.8.0)
rubyzip (0.9.9)
selenium-webdriver (2.27.1)
selenium-webdriver (2.27.2)
childprocess (>= 0.2.5)
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
sprockets (2.1.3)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
term-ansicolor (1.0.7)
thor (0.14.6)
thor (0.16.0)
tilt (1.3.3)
treetop (1.4.10)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.33)
websocket (1.0.4)
tzinfo (0.3.35)
websocket (1.0.6)
xpath (1.0.0)
nokogiri (~> 1.3)

PLATFORMS
ruby

DEPENDENCIES
capybara-webkit!
capybara-webkit
cucumber-rails
jquery-rails
json
rails (= 3.2.2)
rails
rspec-rails

0 comments on commit dfbc44d

Please sign in to comment.