spec/spec_helper.rb in shoulda-matchers-2.6.2 vs spec/spec_helper.rb in shoulda-matchers-2.7.0

@@ -26,18 +26,17 @@
 require 'shoulda-matchers'
 require 'rspec/rails'
 
 PROJECT_ROOT = File.expand_path('../..', __FILE__)
 $LOAD_PATH << File.join(PROJECT_ROOT, 'lib')
-Dir[ File.join(PROJECT_ROOT, 'spec/support/**/*.rb') ].each { |file| require file }
 
+Dir[ File.join(PROJECT_ROOT, 'spec/support/**/*.rb') ].each { |file| require file }
 RSpec.configure do |config|
   config.expect_with :rspec do |c|
     c.syntax = :expect
   end
 
   config.mock_with :mocha
-  config.include Shoulda::Matchers::ActionController,
-                 example_group: { file_path: /action_controller/ }
+  config.include Shoulda::Matchers::ActionController, type: :controller
 end
 
 $VERBOSE = true