Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-18 13:18:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

update gems and fix capybara

Browse source
This commit is contained in:
Reinier Balt 2012-12-15 19:40:10 +01:00
parent 0d53c094ea
commit 8b4fa784e3
2 changed files with 38 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -50,7 +50,7 @@ group :test do
gem "rspec-rails", "~>1.3.3" gem "rspec-rails", "~>1.3.3"
gem "thoughtbot-factory_girl" gem "thoughtbot-factory_girl"
gem 'memory_test_fix', '~>0.1.3' gem 'memory_test_fix', '~>0.1.3'
gem "capybara", ">=0.3.5" gem "capybara", "~>1.1.2"
gem "selenium-webdriver" # Note that > 2.14 has problems: https://code.google.com/p/selenium/issues/detail?id=3075 gem "selenium-webdriver" # Note that > 2.14 has problems: https://code.google.com/p/selenium/issues/detail?id=3075
gem "database_cleaner", ">=0.5.0" gem "database_cleaner", ">=0.5.0"
gem "cucumber-rails", "~>0.3.2" gem "cucumber-rails", "~>0.3.2"

71
Gemfile.lock
View file

@ -14,7 +14,7 @@ GEM
remote: http://gems.github.com/ remote: http://gems.github.com/
specs: specs:
RedCloth (4.2.8) RedCloth (4.2.8)
ZenTest (4.6.2) ZenTest (4.8.3)
aasm (2.2.1) aasm (2.2.1)
actionmailer (2.3.14) actionmailer (2.3.14)
actionpack (= 2.3.14) actionpack (= 2.3.14)
@ -27,9 +27,10 @@ GEM
activesupport (= 2.3.14) activesupport (= 2.3.14)
activesupport (2.3.14) activesupport (2.3.14)
acts_as_list (0.1.4) acts_as_list (0.1.4)
addressable (2.3.2)
bcrypt-ruby (2.1.4) bcrypt-ruby (2.1.4)
builder (3.0.0) builder (3.1.4)
capybara (1.1.2) capybara (1.1.4)
mime-types (>= 1.16) mime-types (>= 1.16)
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
rack (>= 1.0.0) rack (>= 1.0.0)
@ -37,53 +38,55 @@ GEM
selenium-webdriver (~> 2.0) selenium-webdriver (~> 2.0)
xpath (~> 0.1.4) xpath (~> 0.1.4)
cgi_multipart_eof_fix (2.5.0) cgi_multipart_eof_fix (2.5.0)
childprocess (0.3.1) childprocess (0.3.6)
ffi (~> 1.0.6) ffi (~> 1.0, >= 1.0.6)
columnize (0.3.6) columnize (0.3.6)
cucumber (1.1.4) cucumber (1.2.1)
builder (>= 2.1.2) builder (>= 2.1.2)
diff-lcs (>= 1.1.2) diff-lcs (>= 1.1.3)
gherkin (~> 2.7.1) gherkin (~> 2.11.0)
json (>= 1.4.6) json (>= 1.4.6)
term-ansicolor (>= 1.0.6)
cucumber-rails (0.3.2) cucumber-rails (0.3.2)
cucumber (>= 0.8.0) cucumber (>= 0.8.0)
daemons (1.1.8) daemons (1.1.9)
database_cleaner (0.7.1) database_cleaner (0.9.1)
diff-lcs (1.1.3) diff-lcs (1.1.3)
fastthread (1.0.7) fastthread (1.0.7)
ffi (1.0.11) ffi (1.2.0)
flexmock (0.9.0) flexmock (1.2.0)
gem_plugin (0.2.3) gem_plugin (0.2.3)
gherkin (2.7.7) gherkin (2.11.5)
json (>= 1.4.6) json (>= 1.4.6)
highline (1.5.2) highline (1.5.2)
hoe (2.13.1) hoe (3.3.1)
rake (~> 0.8) rake (>= 0.8, < 11.0)
hpricot (0.8.6) hpricot (0.8.6)
htmlentities (4.3.1) htmlentities (4.3.1)
httpclient (2.2.4) httpclient (2.3.0.1)
i18n (0.6.0) i18n (0.6.1)
json (1.6.5) json (1.7.5)
libwebsocket (0.1.7.1)
addressable
websocket
linecache (0.46) linecache (0.46)
rbx-require-relative (> 0.0.4) rbx-require-relative (> 0.0.4)
mail (2.4.1) mail (2.5.3)
i18n (>= 0.4.0) i18n (>= 0.4.0)
mime-types (~> 1.16) mime-types (~> 1.16)
treetop (~> 1.4.8) treetop (~> 1.4.8)
memory_test_fix (0.1.3) memory_test_fix (0.1.3)
mime-types (1.17.2) mime-types (1.19)
mongrel (1.1.5) mongrel (1.1.5)
cgi_multipart_eof_fix (>= 2.4) cgi_multipart_eof_fix (>= 2.4)
daemons (>= 1.0.3) daemons (>= 1.0.3)
fastthread (>= 1.0.1) fastthread (>= 1.0.1)
gem_plugin (>= 0.2.3) gem_plugin (>= 0.2.3)
multi_json (1.1.0) multi_json (1.5.0)
mysql (2.8.1) mysql (2.9.0)
nokogiri (1.4.7) nokogiri (1.4.7)
polyglot (0.3.3) polyglot (0.3.3)
rack (1.1.0) rack (1.1.0)
rack-test (0.6.1) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rails (2.3.14) rails (2.3.14)
actionmailer (= 2.3.14) actionmailer (= 2.3.14)
@ -93,7 +96,7 @@ GEM
activesupport (= 2.3.14) activesupport (= 2.3.14)
rake (>= 0.8.3) rake (>= 0.8.3)
rake (0.8.7) rake (0.8.7)
rbx-require-relative (0.0.5) rbx-require-relative (0.0.9)
rspec (1.3.2) rspec (1.3.2)
rspec-rails (1.3.4) rspec-rails (1.3.4)
rack (>= 1.0.0) rack (>= 1.0.0)
@ -103,35 +106,35 @@ GEM
ruby-debug-base (~> 0.10.4.0) ruby-debug-base (~> 0.10.4.0)
ruby-debug-base (0.10.4) ruby-debug-base (0.10.4)
linecache (>= 0.3) linecache (>= 0.3)
ruby-openid (2.1.8) ruby-openid (2.2.2)
rubycas-client (2.2.1) rubycas-client (2.2.1)
activesupport activesupport
rubyjedi-actionwebservice (2.3.5.20100714122544) rubyjedi-actionwebservice (2.3.5.20100714122544)
actionpack (~> 2.3.0) actionpack (~> 2.3.0)
activerecord (~> 2.3.0) activerecord (~> 2.3.0)
activesupport (~> 2.3.0) activesupport (~> 2.3.0)
rubyzip (0.9.6.1) rubyzip (0.9.9)
sanitize (1.2.1) sanitize (1.2.1)
nokogiri (~> 1.4.1) nokogiri (~> 1.4.1)
selenium-webdriver (2.20.0) selenium-webdriver (2.27.2)
childprocess (>= 0.2.5) childprocess (>= 0.2.5)
ffi (~> 1.0) libwebsocket (~> 0.1.3)
multi_json (~> 1.0) multi_json (~> 1.0)
rubyzip rubyzip
soap4r (1.5.8) soap4r (1.5.8)
httpclient (>= 2.1.1) httpclient (>= 2.1.1)
sqlite3 (1.3.5) sqlite3 (1.3.6)
term-ansicolor (1.0.7)
test-unit (1.2.3) test-unit (1.2.3)
hoe (>= 1.5.1) hoe (>= 1.5.1)
thoughtbot-factory_girl (1.2.2) thoughtbot-factory_girl (1.2.2)
treetop (1.4.10) treetop (1.4.12)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
websocket (1.0.4)
will_paginate (2.3.16) will_paginate (2.3.16)
xpath (0.1.4) xpath (0.1.4)
nokogiri (~> 1.3) nokogiri (~> 1.3)
yard (0.7.5) yard (0.8.3)
PLATFORMS PLATFORMS
ruby ruby
@ -143,7 +146,7 @@ DEPENDENCIES
acts_as_list (= 0.1.4) acts_as_list (= 0.1.4)
aruba (= 0.2.2)! aruba (= 0.2.2)!
bcrypt-ruby (~> 2.1.4) bcrypt-ruby (~> 2.1.4)
capybara (>= 0.3.5) capybara (~> 1.1.2)
cucumber-rails (~> 0.3.2) cucumber-rails (~> 0.3.2)
database_cleaner (>= 0.5.0) database_cleaner (>= 0.5.0)
flexmock flexmock