diff --git a/Gemfile.lock b/Gemfile.lock index 788dce81..5a733b91 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -97,10 +97,6 @@ GEM rake (10.0.3) rdoc (3.12.2) json (~> 1.4) - rspec (2.13.0) - rspec-core (~> 2.13.0) - rspec-expectations (~> 2.13.0) - rspec-mocks (~> 2.13.0) rspec-core (2.13.1) rspec-expectations (2.13.0) diff-lcs (>= 1.1.3, < 2.0) @@ -144,7 +140,6 @@ DEPENDENCIES jruby-openssl rails (~> 3.0) rake (>= 0.9.2) - rspec (~> 2.13) rspec-rails (~> 2.13) shoulda-context (~> 1.0.0) shoulda-matchers! diff --git a/README.md b/README.md index 5fac7926..7082e01e 100644 --- a/README.md +++ b/README.md @@ -85,10 +85,8 @@ group :test do gem "shoulda-matchers" end -# rspec-rails needs to be in the development group so that Rails generators -# work. +# `rspec-rails` needs to be in the development group so that Rails generators work. group :development, :test do - gem "rspec" gem "rspec-rails" end ``` diff --git a/features/rails_integration.feature b/features/rails_integration.feature index 77405c77..0c90c7f6 100644 --- a/features/rails_integration.feature +++ b/features/rails_integration.feature @@ -62,7 +62,7 @@ Feature: integrate with Rails And the output should contain "ExamplesController should assign @example" Scenario: generate a rails application and use matchers in Rspec - When I configure the application to use rspec and rspec-rails + When I configure the application to use rspec-rails And I configure the application to use "shoulda-matchers" from this project And I run the rspec generator And I write to "spec/models/user_spec.rb" with: @@ -88,7 +88,7 @@ Feature: integrate with Rails And the output should contain "should assign @example" Scenario: generate a Rails application that mixes Rspec and Test::Unit - When I configure the application to use rspec and rspec-rails in test and development + When I configure the application to use rspec-rails in test and development And I configure the application to use "shoulda-matchers" from this project in test and development And I run the rspec generator And I write to "spec/models/user_spec.rb" with: diff --git a/features/step_definitions/rails_steps.rb b/features/step_definitions/rails_steps.rb index 4682eb68..4eb5dd1d 100644 --- a/features/step_definitions/rails_steps.rb +++ b/features/step_definitions/rails_steps.rb @@ -52,16 +52,14 @@ When 'I run the rspec generator' do } end -When 'I configure the application to use rspec and rspec-rails' do - append_to_gemfile %q(gem 'rspec', '~> 2.13') +When 'I configure the application to use rspec-rails' do append_to_gemfile %q(gem 'rspec-rails', '~> 2.13') steps %{And I run `bundle install --local`} end -When 'I configure the application to use rspec and rspec-rails in test and development' do +When 'I configure the application to use rspec-rails in test and development' do append_to_gemfile <<-GEMFILE group :test, :development do - gem 'rspec', '~> 2.13' gem 'rspec-rails', '~> 2.13' end GEMFILE diff --git a/gemfiles/3.0.gemfile.lock b/gemfiles/3.0.gemfile.lock index 9f25a606..4a2ff477 100644 --- a/gemfiles/3.0.gemfile.lock +++ b/gemfiles/3.0.gemfile.lock @@ -94,10 +94,6 @@ GEM rake (10.0.3) rdoc (3.12.2) json (~> 1.4) - rspec (2.13.0) - rspec-core (~> 2.13.0) - rspec-expectations (~> 2.13.0) - rspec-mocks (~> 2.13.0) rspec-core (2.13.1) rspec-expectations (2.13.0) diff-lcs (>= 1.1.3, < 2.0) @@ -135,7 +131,6 @@ DEPENDENCIES jruby-openssl rails (~> 3.0.17) rake (>= 0.9.2) - rspec (~> 2.13) rspec-rails (~> 2.13) shoulda-context (~> 1.0.0) shoulda-matchers! diff --git a/gemfiles/3.1.gemfile.lock b/gemfiles/3.1.gemfile.lock index 19bab97d..1efed0b3 100644 --- a/gemfiles/3.1.gemfile.lock +++ b/gemfiles/3.1.gemfile.lock @@ -102,10 +102,6 @@ GEM rake (10.0.3) rdoc (3.12.2) json (~> 1.4) - rspec (2.13.0) - rspec-core (~> 2.13.0) - rspec-expectations (~> 2.13.0) - rspec-mocks (~> 2.13.0) rspec-core (2.13.1) rspec-expectations (2.13.0) diff-lcs (>= 1.1.3, < 2.0) @@ -155,7 +151,6 @@ DEPENDENCIES jruby-openssl rails (~> 3.1.8) rake (>= 0.9.2) - rspec (~> 2.13) rspec-rails (~> 2.13) sass-rails shoulda-context (~> 1.0.0) diff --git a/gemfiles/3.2.gemfile.lock b/gemfiles/3.2.gemfile.lock index aff62b8c..a356b000 100644 --- a/gemfiles/3.2.gemfile.lock +++ b/gemfiles/3.2.gemfile.lock @@ -100,10 +100,6 @@ GEM rake (10.0.3) rdoc (3.12.2) json (~> 1.4) - rspec (2.13.0) - rspec-core (~> 2.13.0) - rspec-expectations (~> 2.13.0) - rspec-mocks (~> 2.13.0) rspec-core (2.13.1) rspec-expectations (2.13.0) diff-lcs (>= 1.1.3, < 2.0) @@ -153,7 +149,6 @@ DEPENDENCIES jruby-openssl rails (~> 3.2.8) rake (>= 0.9.2) - rspec (~> 2.13) rspec-rails (~> 2.13) sass-rails shoulda-context (~> 1.0.0) diff --git a/lib/shoulda/matchers/integrations/rspec.rb b/lib/shoulda/matchers/integrations/rspec.rb index 755a6568..271d4d90 100644 --- a/lib/shoulda/matchers/integrations/rspec.rb +++ b/lib/shoulda/matchers/integrations/rspec.rb @@ -1,5 +1,5 @@ # :enddoc: -require 'rspec' +require 'rspec/core' RSpec.configure do |config| require 'shoulda/matchers/independent' diff --git a/shoulda-matchers.gemspec b/shoulda-matchers.gemspec index c9c6e2ce..b7aca17d 100644 --- a/shoulda-matchers.gemspec +++ b/shoulda-matchers.gemspec @@ -27,7 +27,6 @@ Gem::Specification.new do |s| s.add_development_dependency('cucumber', '~> 1.1') s.add_development_dependency('rails', '~> 3.0') s.add_development_dependency('rake', '>= 0.9.2') - s.add_development_dependency('rspec', '~> 2.13') s.add_development_dependency('rspec-rails', '~> 2.13') s.add_development_dependency('strong_parameters') end