Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-28 11:46:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix the conflict between aruba and unit/functional tests by backporting a fix from newer versions of aruba

Browse source 
gemspec changes to comment out dep on cucumber 
lib/aruba.rb emptied

We need to move forward to recent versions of rails/cucumber/etc
This commit is contained in:
Reinier Balt 2012-03-19 19:59:04 +01:00
parent 50741162af
commit 322248963b
20 changed files with 873 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -54,7 +54,7 @@ group :test do
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 "cucumber-rails", "~>0.3.2"
gem "aruba"
gem "aruba", "0.2.2", :path => "vendor/gems/aruba-0.2.2"
# uncomment to use the webkit option. This depends on Qt to be installed
#gem "capybara-webkit"