Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-09-22 05:50:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

update gems

Browse source
This commit is contained in:
Reinier Balt 2013-02-23 15:16:03 +01:00
parent 9edde5c789
commit 402b078c02
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Gemfile
View file

@ -47,8 +47,11 @@ group :test do
gem "factory_girl_rails" gem "factory_girl_rails"
gem "capybara" gem "capybara"
gem "cucumber-rails", :require => false gem "cucumber-rails", :require => false
gem "rspec-expectations"
gem "database_cleaner" gem "database_cleaner"
gem "aruba"
# aruba 0.5 conflics with newer gems
# gem "aruba", :require => false
gem "simplecov" gem "simplecov"
gem "timecop" gem "timecop"

14
Gemfile.lock
View file

@ -32,10 +32,6 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
acts_as_list (0.1.9) acts_as_list (0.1.9)
arel (3.0.2) arel (3.0.2)
aruba (0.5.1)
childprocess (~> 0.3.6)
cucumber (>= 1.1.1)
rspec-expectations (>= 2.7.0)
bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1)
bluecloth (2.2.0) bluecloth (2.2.0)
builder (3.0.4) builder (3.0.4)
@ -78,7 +74,7 @@ GEM
factory_girl_rails (4.2.1) factory_girl_rails (4.2.1)
factory_girl (~> 4.2.0) factory_girl (~> 4.2.0)
railties (>= 3.0.0) railties (>= 3.0.0)
ffi (1.3.1) ffi (1.4.0)
formatize (1.1.0) formatize (1.1.0)
RedCloth (~> 4.2) RedCloth (~> 4.2)
actionpack (~> 3.0) actionpack (~> 3.0)
@ -136,15 +132,15 @@ GEM
rspec-expectations (2.12.1) rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3) diff-lcs (~> 1.1.3)
rubyzip (0.9.9) rubyzip (0.9.9)
safe_yaml (0.7.1) safe_yaml (0.8.3)
sanitize (2.0.3) sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6) nokogiri (>= 1.4.4, < 1.6)
sass (3.2.5) sass (3.2.6)
sass-rails (3.2.6) sass-rails (3.2.6)
railties (~> 3.2.0) railties (~> 3.2.0)
sass (>= 3.1.10) sass (>= 3.1.10)
tilt (~> 1.3) tilt (~> 1.3)
selenium-webdriver (2.29.0) selenium-webdriver (2.30.0)
childprocess (>= 0.2.5) childprocess (>= 0.2.5)
multi_json (~> 1.0) multi_json (~> 1.0)
rubyzip rubyzip
@ -192,7 +188,6 @@ DEPENDENCIES
RedCloth RedCloth
aasm aasm
acts_as_list acts_as_list
aruba
bcrypt-ruby bcrypt-ruby
bullet bullet
cache_digests cache_digests
@ -208,6 +203,7 @@ DEPENDENCIES
rack-mini-profiler rack-mini-profiler
rails (~> 3.2) rails (~> 3.2)
rails_autolink rails_autolink
rspec-expectations
sanitize sanitize
sass-rails sass-rails
selenium-webdriver selenium-webdriver

3
features/support/tracks_cucumber_settings.rb
View file

@ -1,4 +1,5 @@
require 'aruba/cucumber' # commented out because aruba 0.5 conflics
# require 'aruba/cucumber'
require 'capybara/rails' require 'capybara/rails'
require 'capybara/cucumber' require 'capybara/cucumber'