Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

update testing gems to try fixing occasional integration test error

Browse source
This commit is contained in:
wvengen 2013-10-29 21:31:07 +01:00
parent 201f23381b
commit 7779c15dc9
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Gemfile
View file

@ -78,10 +78,9 @@ group :test do
gem 'rspec-rails' gem 'rspec-rails'
gem 'factory_girl_rails', '~> 4.0' gem 'factory_girl_rails', '~> 4.0'
gem 'faker' gem 'faker'
# version requirements to avoid problem http://stackoverflow.com/questions/18114544 gem 'capybara'
gem 'capybara', '~> 2.1.0'
# webkit and poltergeist don't seem to work yet # webkit and poltergeist don't seem to work yet
gem 'selenium-webdriver', '~> 2.35.1' gem 'selenium-webdriver'
gem 'database_cleaner' gem 'database_cleaner'
gem 'simplecov', require: false gem 'simplecov', require: false
# need to include rspec components before i18n-spec or rake fails in test environment # need to include rspec components before i18n-spec or rake fails in test environment

14
Gemfile.lock
View file

@ -251,7 +251,7 @@ GEM
rspec-mocks (~> 2.14.0) rspec-mocks (~> 2.14.0)
ruby-prof (0.13.0) ruby-prof (0.13.0)
ruby-rc4 (0.1.5) ruby-rc4 (0.1.5)
rubyzip (0.9.9) rubyzip (1.0.0)
sass (3.2.12) sass (3.2.12)
sass-rails (3.2.6) sass-rails (3.2.6)
railties (~> 3.2.0) railties (~> 3.2.0)
@ -259,10 +259,10 @@ GEM
tilt (~> 1.3) tilt (~> 1.3)
select2-rails (3.5.0) select2-rails (3.5.0)
thor (~> 0.14) thor (~> 0.14)
selenium-webdriver (2.35.1) selenium-webdriver (2.37.0)
childprocess (>= 0.2.5) childprocess (>= 0.2.5)
multi_json (~> 1.0) multi_json (~> 1.0)
rubyzip (< 1.0.0) rubyzip (~> 1.0.0)
websocket (~> 1.0.4) websocket (~> 1.0.4)
simple-navigation (3.11.0) simple-navigation (3.11.0)
activesupport (>= 2.3.2) activesupport (>= 2.3.2)
@ -308,9 +308,9 @@ GEM
rails (>= 3.1) rails (>= 3.1)
railties (>= 3.1) railties (>= 3.1)
tzinfo (0.3.38) tzinfo (0.3.38)
uglifier (2.2.1) uglifier (2.3.0)
execjs (>= 0.3.0) execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2) json (>= 1.8.0)
uniform_notifier (1.3.0) uniform_notifier (1.3.0)
vegas (0.1.11) vegas (0.1.11)
rack (>= 1.0.0) rack (>= 1.0.0)
@ -336,7 +336,7 @@ DEPENDENCIES
bullet bullet
capistrano (= 2.13.5) capistrano (= 2.13.5)
capistrano-ext capistrano-ext
capybara (~> 2.1.0) capybara
client_side_validations client_side_validations
client_side_validations-simple_form client_side_validations-simple_form
coffee-rails (~> 3.2.1) coffee-rails (~> 3.2.1)
@ -369,7 +369,7 @@ DEPENDENCIES
ruby-prof ruby-prof
sass-rails (~> 3.2.3) sass-rails (~> 3.2.3)
select2-rails select2-rails
selenium-webdriver (~> 2.35.1) selenium-webdriver
simple-navigation simple-navigation
simple-navigation-bootstrap simple-navigation-bootstrap
simple_form simple_form