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

fix Gemfile (rspec would fail)

Browse source
This commit is contained in:
wvengen 2014-06-03 15:19:36 +02:00
parent c64a7ba3cd
commit f2c755d2fb
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -93,7 +93,7 @@ group :test do
gem 'database_cleaner' gem 'database_cleaner'
gem 'connection_pool' gem 'connection_pool'
# 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
gem 'rspec-core' gem 'rspec-core', '= 2.14.8' # version until we're ready for rspec 3.0
gem 'rspec-expectations' gem 'rspec-expectations'
gem 'rspec-rerun' gem 'rspec-rerun'
gem 'i18n-spec' gem 'i18n-spec'

14
Gemfile.lock
View file

@ -105,7 +105,7 @@ GEM
capistrano-rvm (0.1.1) capistrano-rvm (0.1.1)
capistrano (~> 3.0) capistrano (~> 3.0)
sshkit (~> 1.2) sshkit (~> 1.2)
capybara (2.2.1) capybara (2.3.0)
mime-types (>= 1.16) mime-types (>= 1.16)
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
rack (>= 1.0.0) rack (>= 1.0.0)
@ -134,7 +134,7 @@ GEM
thor thor
daemons (1.1.9) daemons (1.1.9)
database_cleaner (1.3.0) database_cleaner (1.3.0)
date_time_attribute (0.0.6) date_time_attribute (0.1.2)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
debug_inspector (0.0.2) debug_inspector (0.0.2)
deface (1.0.0) deface (1.0.0)
@ -173,9 +173,9 @@ GEM
i18n (0.6.9) i18n (0.6.9)
i18n-spec (0.4.1) i18n-spec (0.4.1)
iso iso
inherited_resources (1.4.1) inherited_resources (1.5.0)
has_scope (~> 0.6.0.rc) has_scope (~> 0.6.0.rc)
responders (~> 1.0.0.rc) responders (~> 1.0)
iso (0.2.1) iso (0.2.1)
i18n i18n
jquery-rails (3.1.0) jquery-rails (3.1.0)
@ -268,7 +268,7 @@ GEM
redis-namespace (1.4.1) redis-namespace (1.4.1)
redis (~> 3.0.4) redis (~> 3.0.4)
ref (1.0.5) ref (1.0.5)
responders (1.0.0) responders (1.1.0)
railties (>= 3.2, < 5) railties (>= 3.2, < 5)
resque (1.25.2) resque (1.25.2)
mono_logger (~> 1.0) mono_logger (~> 1.0)
@ -345,7 +345,7 @@ GEM
sqlite3 (1.3.9) sqlite3 (1.3.9)
sqlite3-ruby (1.3.3) sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3) sqlite3 (>= 1.3.3)
sshkit (1.5.0) sshkit (1.5.1)
colorize colorize
net-scp (>= 1.1.2) net-scp (>= 1.1.2)
net-ssh (>= 2.8.0) net-ssh (>= 2.8.0)
@ -440,7 +440,7 @@ DEPENDENCIES
rails-settings-cached (= 0.3.1) rails-settings-cached (= 0.3.1)
ransack ransack
resque resque
rspec-core rspec-core (= 2.14.8)
rspec-expectations rspec-expectations
rspec-rails rspec-rails
rspec-rerun rspec-rerun