Skip to content

Resolving #1430 by relocating #1436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 1, 2015
Merged

Resolving #1430 by relocating #1436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e19524b
Merge branch 'master' of https://github.com/rspec/rspec-rails
jdax Aug 1, 2015
081276e
Resolves #1430. Moving config.include's
jdax Aug 1, 2015
459909c
Merge branch 'master' of https://github.com/rspec/rspec-rails
jdax Aug 1, 2015
7c54346
Note fix in Changelog. [ci skip]
jdax Aug 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
### 3.4.0 Development
[Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.3.3...master)

Bug Fixes:

* Fix another load order issued which causes an undefined method `fixture_path` error
when loading rspec-rails after a spec has been created. (Nikki Murray, #1430)

### 3.3.3 / 2015-07-15
[Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.3.2...v3.3.3)

Expand Down
32 changes: 16 additions & 16 deletions lib/rspec/rails/configuration.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,6 @@ def self.initialize_configuration(config)
config.backtrace_exclusion_patterns << /vendor\//
config.backtrace_exclusion_patterns << %r{ lib/rspec/rails }

config.include RSpec::Rails::ControllerExampleGroup, :type => :controller
config.include RSpec::Rails::HelperExampleGroup, :type => :helper
config.include RSpec::Rails::ModelExampleGroup, :type => :model
config.include RSpec::Rails::RequestExampleGroup, :type => :request
config.include RSpec::Rails::RoutingExampleGroup, :type => :routing
config.include RSpec::Rails::ViewExampleGroup, :type => :view
config.include RSpec::Rails::FeatureExampleGroup, :type => :feature

if defined?(ActionMailer)
config.include RSpec::Rails::MailerExampleGroup, :type => :mailer
end

if defined?(ActiveJob)
config.include RSpec::Rails::JobExampleGroup, :type => :job
end

# controller settings
config.add_setting :infer_base_class_for_anonymous_controllers, :default => true

Expand Down Expand Up @@ -106,6 +90,22 @@ def infer_spec_type_from_file_location!
end
end
end

config.include RSpec::Rails::ControllerExampleGroup, :type => :controller
config.include RSpec::Rails::HelperExampleGroup, :type => :helper
config.include RSpec::Rails::ModelExampleGroup, :type => :model
config.include RSpec::Rails::RequestExampleGroup, :type => :request
config.include RSpec::Rails::RoutingExampleGroup, :type => :routing
config.include RSpec::Rails::ViewExampleGroup, :type => :view
config.include RSpec::Rails::FeatureExampleGroup, :type => :feature

if defined?(ActionMailer)
config.include RSpec::Rails::MailerExampleGroup, :type => :mailer
end

if defined?(ActiveJob)
config.include RSpec::Rails::JobExampleGroup, :type => :job
end
end

initialize_configuration RSpec.configuration
Expand Down