kotovalexarian-likes-github/thoughtbot--shoulda-matchers
1
0
Fork 0
mirror of https://github.com/thoughtbot/shoulda-matchers.git synced 2022-11-09 12:01:38 -05:00
Code Releases Activity

Require 'rspec/core' instead of 'rspec' in RSpec integration file

Browse source 
* See discussions in #248 and #259
This commit is contained in:
Ben Atkins 2013-03-20 12:38:45 -04:00 • committed by Melissa Xie
parent 22ecb04bf9
commit b3232e0966
9 changed files with 6 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Gemfile.lock
View file

@ -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!

4
README.md
View file

@ -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
```

4
features/rails_integration.feature
View file

@ -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:

6
features/step_definitions/rails_steps.rb
View file

@ -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

5
gemfiles/3.0.gemfile.lock
View file

@ -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!

5
gemfiles/3.1.gemfile.lock
View file

@ -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)

5
gemfiles/3.2.gemfile.lock
View file

@ -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)

2
lib/shoulda/matchers/integrations/rspec.rb
View file

@ -1,5 +1,5 @@
# :enddoc:
require 'rspec'
require 'rspec/core'
RSpec.configure do |config|
require 'shoulda/matchers/independent'

1
shoulda-matchers.gemspec
View file

@ -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