Merge pull request rspec#1436 from jdax/master

Resolving rspec#1430 by relocating

Author: cupakromer

Changelog.md

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

lib/rspec/rails/configuration.rb

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