diff options
| -rw-r--r-- | Gemfile | 7 | ||||
| -rw-r--r-- | Gemfile.lock | 19 |
2 files changed, 17 insertions, 9 deletions
@@ -28,8 +28,6 @@ gem 'recaptcha', '~> 0.3.1', :require => 'recaptcha/rails' gem 'rmagick', :require => 'RMagick' gem 'routing-filter', '~> 0.2.4' gem 'rake', '0.9.2.2' -gem 'rspec', '~> 1.3.2' -gem 'rspec-rails', '~> 1.3.4' gem 'ruby-msg', '~> 1.5.0' gem 'vpim' gem 'will_paginate', '~> 2.3.11' @@ -45,7 +43,6 @@ gem 'globalize3' group :test do gem 'fakeweb' - gem 'rspec-rails', '~> 1.3.4' gem 'test-unit', '~> 1.2.3', :platforms => :ruby_19 end @@ -60,3 +57,7 @@ group :develop do gem 'compass' gem 'annotate' end + +group :test, :development do + gem 'rspec-rails' +end diff --git a/Gemfile.lock b/Gemfile.lock index 9adad8168..36623e018 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,6 +48,7 @@ GEM fssm (>= 0.2.7) sass (~> 3.1) daemons (1.1.9) + diff-lcs (1.1.3) erubis (2.6.6) abstract (>= 1.0.0) eventmachine (1.0.0) @@ -134,10 +135,17 @@ GEM rmagick (2.13.1) routing-filter (0.2.4) actionpack - rspec (1.3.2) - rspec-rails (1.3.4) - rack (>= 1.0.0) - rspec (~> 1.3.1) + rspec-core (2.12.1) + rspec-expectations (2.12.0) + diff-lcs (~> 1.1.3) + rspec-mocks (2.12.0) + rspec-rails (2.12.0) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 2.12.0) + rspec-expectations (~> 2.12.0) + rspec-mocks (~> 2.12.0) ruby-debug (0.10.4) columnize (>= 0.1) ruby-debug-base (~> 0.10.4.0) @@ -218,8 +226,7 @@ DEPENDENCIES recaptcha (~> 0.3.1) rmagick routing-filter (~> 0.2.4) - rspec (~> 1.3.2) - rspec-rails (~> 1.3.4) + rspec-rails ruby-debug ruby-debug19 ruby-msg (~> 1.5.0) |