rspec-rails 2.99.0.beta2 → 2.99.0.rc1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzY3ODRlMWU4ZjJkNDI5NjU1M2NhZGM2ZTJjM2EyMGUzYjdkMDFhNA==
-  data.tar.gz: !binary |-
-    ODJlYTA0ZTU4M2NlOWJhMzU1NDk3NjJhMDAzNDNjMTJlYjg1MzQyMw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YWU5ZWVhNWFiYzdiZWY1ZWQ0OWYyMjEyZTIwOTJjZDIxODBjM2Q1ZTljMDg1
-    MTdhYzFjZjlhYjBhNjlmNTk1YTFkMGU1YTk0M2ZjM2NmMDE5NTNlOTI0MmQ3
-    OGVhMDRjZjRjNjI2NWJkZGY3YzU2Yjc3ZGI0NTM1YjFkYzU4MDQ=
-  data.tar.gz: !binary |-
-    OGJjZTRhNWZjMWQyMGUzYzcyNzc5OTNjZWVkMTVjMDBjZWJmN2NjNjQ0NWJh
-    ZTk2M2M4MTVkNWJkMTliZDY2YWViODIwNDIwYzRlOTMzOTVmNjJjZTIzYTc3
-    Yjg4ZWFhZDY5OTEyZmE3N2Y0ZGVhMmIwYmQ3NmFmOTVhYmZmYmE=
+SHA1:
+  metadata.gz: b93f5ce3e1a3da43f65e8a266e931ddae467fef5
+  data.tar.gz: 1a2ff9f79df901ae083e7ae865143979e092322a
+SHA512:
+  metadata.gz: 767517cd2fd72a646b645c72efbaf023889e26e92137399f44e35730fb7bfa18aae11aff2bdf3e7ad945866d5cda166047e7f36518eba3645972aad9921a2c14
+  data.tar.gz: 95f96d3834dd209ca27e2926b8a62c984da753d9e2ea38bd3632fb06afd6cb3885c4b5075caf2c9420968b20cfd61fc80142403ca2c5cd82731bda1a529289a9

data/Changelog.md

@@ -1,5 +1,22 @@
+### 2.99.0.rc1 / 2014-05-18
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.99.0.beta2...v2.99.0.rc1)
+
+Deprecations
+
+* Deprecates `stub_model` and `mock_model` in favor of the
+  `rspec-activemodel-mocks` gem. (Thomas Holmes)
+* Issue a deprecation to instruct users to configure
+  `config.infer_spec_type_from_file_location!` during the
+  upgrade process since spec type inference is opt-in in 3.0.
+  (Jon Rowe)
+* Issue a deprecation when `described_class` is accessed in a controller
+  example group that has used the `controller { }` macro to generate an
+  anonymous controller class, since in 2.x, `described_class` would
+  return that generated class but in 3.0 it will continue returning the
+  class passed to `describe`. (Myron Marston)
+
 ### 2.99.0.beta2 / 2014-02-17
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.99.0.beta1...v2.99.0.beta2)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.99.0.beta1...v2.99.0.beta2)
 
 Bug fixes
 
@@ -17,7 +34,7 @@ Deprecations
   instead. (Andy Lindeman)
 
 ### 2.99.0.beta1 / 2013-11-07
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.14.0...v2.99.0.beta1)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.14.0...v2.99.0.beta1)
 
 Deprecations
 
@@ -39,7 +56,7 @@ Bug fixes
   in all of `rails` to use `rspec-rails`. (John Firebaugh)
 
 ### 2.14.0 / 2013-07-06
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.14.0.rc1...v2.14.0)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.14.0.rc1...v2.14.0)
 
 Bug fixes
 
@@ -51,7 +68,7 @@ Bug fixes
   Rails 4. (Andy Lindeman)
 
 ### 2.14.0.rc1 / 2013-05-27
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.13.2...v2.14.0.rc1)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.13.2...v2.14.0.rc1)
 
 Enhancements
 
@@ -64,7 +81,7 @@ Bug fixes
   spec/ directory. (Benjamin Fleischer)
 
 ### 2.13.2 / 2013-05-18
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.13.1...v2.13.2)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.13.1...v2.13.2)
 
 Bug fixes
 
@@ -75,7 +92,7 @@ Bug fixes
   not fully loaded. (Andy Lindeman)
 
 ### 2.13.1 / 2013-04-27
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.13.0...v2.13.1)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.13.0...v2.13.1)
 
 Bug fixes
 
@@ -89,7 +106,7 @@ Bug fixes
 * Fix spacing in the install generator template (Taiki ONO)
 
 ### 2.13.0 / 2013-02-23
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.12.2...v2.13.0)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.12.2...v2.13.0)
 
 Enhancements
 
@@ -104,7 +121,7 @@ Enhancements
   (Rudolf Schmidt)
 
 ### 2.12.2 / 2013-01-12
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.12.1...v2.12.2)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.12.1...v2.12.2)
 
 Bug fixes
 
@@ -116,7 +133,7 @@ Bug fixes
   Lindeman)
 
 ### 2.12.1 / 2013-01-07
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.12.0...v2.12.1)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.12.0...v2.12.1)
 
 Bug fixes
 
@@ -131,7 +148,7 @@ Bug fixes
   and generation of URLs from other contexts. (Andy Lindeman)
 
 ### 2.12.0 / 2012-11-12
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.11.4...v2.12.0)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.11.4...v2.12.0)
 
 Enhancements
 
@@ -152,7 +169,7 @@ Bug fixes
 * Failures message for `be_new_record` are more useful (Andy Lindeman)
 
 ### 2.11.4 / 2012-10-14
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.11.0...v2.11.4)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.11.0...v2.11.4)
 
 Capybara-2.0 integration support:
 
@@ -166,7 +183,7 @@ for background.
 2.11.1, .2, .3 were yanked due to errant documentation.
 
 ### 2.11.0 / 2012-07-07
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.10.1...v2.11.0)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.10.1...v2.11.0)
 
 Enhancements
 
@@ -185,7 +202,7 @@ Bug fixes
   loads (Andy Lindeman)
 
 ### 2.10.1 / 2012-05-03
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.10.0...v2.10.1)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.10.0...v2.10.1)
 
 Bug fixes
 
@@ -195,7 +212,7 @@ Bug fixes
   Rails already does this (Jack Dempsey)
 
 ### 2.10.0 / 2012-05-03
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.9.0...v2.10.0)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.9.0...v2.10.0)
 
 Bug fixes
 
@@ -210,7 +227,7 @@ Bug fixes
   Strother)
 
 ### 2.9.0 / 2012-03-17
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.8.1...v2.9.0)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.8.1...v2.9.0)
 
 Enhancements
 
@@ -225,7 +242,7 @@ Bug fixes
 
 ### 2.8.1 / 2012-01-04
 
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.8.0...v2.8.1)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.8.0...v2.8.1)
 
 NOTE: there was a change in rails-3.2.0.rc2 which broke compatibility with
 stub_model in rspec-rails. This release fixes that issue, but it means that
@@ -238,7 +255,7 @@ you'll have to upgrade to rspec-rails-2.8.1 when you upgrade to rails >=
 
 ### 2.8.0 / 2012-01-04
 
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.8.0.rc2...v2.8.0)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.8.0.rc2...v2.8.0)
 
 * Enhancements
     * Eliminate deprecation warnings in generated view specs in Rails 3.2
@@ -248,7 +265,7 @@ you'll have to upgrade to rspec-rails-2.8.1 when you upgrade to rails >=
 
 ### 2.8.0.rc2 / 2011-12-19
 
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.8.0.rc1...v2.8.0.rc2)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.8.0.rc1...v2.8.0.rc2)
 
 * Enhancements
     * Add session hash to generated controller specs (Thiago Almeida)
@@ -260,7 +277,7 @@ you'll have to upgrade to rspec-rails-2.8.1 when you upgrade to rails >=
 
 ### 2.8.0.rc1 / 2011-11-06
 
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.7.0...v2.8.0.rc1)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.7.0...v2.8.0.rc1)
 
 * Enhancements
     * Removed unnecessary "config.mock_with :rspec" from spec_helper.rb (Paul
@@ -276,7 +293,7 @@ you'll have to upgrade to rspec-rails-2.8.1 when you upgrade to rails >=
 
 ### 2.7.0 / 2011-10-16
 
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.6.1...v2.7.0)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.6.1...v2.7.0)
 
 * Enhancements
   * `ActiveRecord::Relation` can use the `=~` matcher (Andy Lindeman)
@@ -301,7 +318,7 @@ you'll have to upgrade to rspec-rails-2.8.1 when you upgrade to rails >=
 
 ### 2.6.1 / 2011-05-25
 
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.6.0...v2.6.1)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.6.0...v2.6.1)
 
 This release is compatible with rails-3.1.0.rc1, but not rails-3.1.0.beta1
 
@@ -312,7 +329,7 @@ This release is compatible with rails-3.1.0.rc1, but not rails-3.1.0.beta1
 
 ### 2.6.0 / 2011-05-12
 
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.5.0...v2.6.0)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.5.0...v2.6.0)
 
 * Enhancements
   * rails 3 shortcuts for routing specs (Joe Fiorini)
@@ -336,7 +353,7 @@ This release is compatible with rails-3.1.0.rc1, but not rails-3.1.0.beta1
 
 ### 2.5.0 / 2011-02-05
 
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.4.1...v2.5.0)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.4.1...v2.5.0)
 
 * Enhancements
   * use index_helper instead of table_name when generating specs (Reza
@@ -351,7 +368,7 @@ This release is compatible with rails-3.1.0.rc1, but not rails-3.1.0.beta1
 
 ### 2.4.1 / 2011-01-03
 
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.4.0...v2.4.1)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.4.0...v2.4.1)
 
 * Bug fixes
   * fixed bug caused by including some Rails modules before RSpec's
@@ -359,7 +376,7 @@ This release is compatible with rails-3.1.0.rc1, but not rails-3.1.0.beta1
 
 ### 2.4.0 / 2011-01-02
 
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.3.1...v2.4.0)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.3.1...v2.4.0)
 
 * Enhancements
   * include ApplicationHelper in helper object in helper specs
@@ -379,7 +396,7 @@ This release is compatible with rails-3.1.0.rc1, but not rails-3.1.0.beta1
 
 ### 2.3.1 / 2010-12-16
 
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.3.0...v2.3.1)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.3.0...v2.3.1)
 
 * Bug fixes
   * respond_to? correctly handles 2 args
@@ -387,7 +404,7 @@ This release is compatible with rails-3.1.0.rc1, but not rails-3.1.0.beta1
 
 ### 2.3.0 / 2010-12-12
 
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.2.1...v2.3.0)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.2.1...v2.3.0)
 
 * Changes
   * Generator no longer generates autotest/autodiscover.rb, as it is no longer
@@ -395,7 +412,7 @@ This release is compatible with rails-3.1.0.rc1, but not rails-3.1.0.beta1
 
 ### 2.2.1 / 2010-12-01
 
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.2.0...v2.2.1)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.2.0...v2.2.1)
 
 * Bug fixes
   * Depend on railties, activesupport, and actionpack instead of rails (Piotr
@@ -407,7 +424,7 @@ This release is compatible with rails-3.1.0.rc1, but not rails-3.1.0.beta1
 
 ### 2.2.0 / 2010-11-28
 
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.1.0...v2.2.0)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.1.0...v2.2.0)
 
 * Enhancements
   * Added stub_template in view specs
@@ -422,7 +439,7 @@ This release is compatible with rails-3.1.0.rc1, but not rails-3.1.0.beta1
 
 ### 2.1.0 / 2010-11-07
 
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.0.1...v2.1.0)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.0.1...v2.1.0)
 
 * Enhancements
   * Move errors_on to ActiveModel to support other AM-compliant ORMs
@@ -433,7 +450,7 @@ This release is compatible with rails-3.1.0.rc1, but not rails-3.1.0.beta1
 
 ### 2.0.1 / 2010-10-15
 
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.0.0...v2.0.1)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.0.0...v2.0.1)
 
 * Enhancements
   * Add option to not generate request spec (--skip-request-specs)
@@ -446,7 +463,7 @@ This release is compatible with rails-3.1.0.rc1, but not rails-3.1.0.beta1
 
 ### 2.0.0 / 2010-10-10
 
-[full changelog](https://github.com/rspec/rspec-rails/compare/ea6bdef...v2.0.0)
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/ea6bdef...v2.0.0)
 
 * Enhancements
   * ControllerExampleGroup uses controller as the implicit subject by default (Paul Rosania)

data/lib/generators/rspec/install/templates/spec/spec_helper.rb.tt

@@ -3,11 +3,21 @@ ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
 
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
+# Requires supporting ruby files with custom matchers and macros, etc, in
+# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
+# run as spec files by default. This means that files in spec/support that end
+# in _spec.rb will both be required and run as specs, causing the specs to be
+# run twice. It is recommended that you do not name files matching this glob to
+# end with _spec.rb. You can configure this pattern with with the --pattern
+# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
 Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
 
-<% if ::Rails::VERSION::STRING >= '4' -%>
+<% if ::Rails::VERSION::STRING >= '4.1' -%>
+# Checks for pending migrations before tests are run.
+# If you are not using ActiveRecord, you can remove this line.
+ActiveRecord::Migration.maintain_test_schema!
+
+<% elsif ::Rails::VERSION::STRING >= '4' -%>
 # Checks for pending migrations before tests are run.
 # If you are not using ActiveRecord, you can remove this line.
 ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
@@ -40,4 +50,19 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = "random"
+
+  # RSpec Rails can automatically mix in different behaviours to your tests
+  # based on their file location, for example enabling you to call `get` and
+  # `post` in specs under `spec/controllers`.
+  #
+  # You can disable this behaviour by removing the line below, and instead
+  # explictly tag your specs with their type, e.g.:
+  #
+  #     describe UsersController, :type => :controller do
+  #       # ...
+  #     end
+  #
+  # The different available types are documented in the features, such as in
+  # https://relishapp.com/rspec/rspec-rails/v/3-0/docs
+  config.infer_spec_type_from_file_location!
 end

data/lib/rspec/rails.rb

@@ -11,8 +11,12 @@ require 'rspec/rails/view_rendering'
 require 'rspec/rails/adapters'
 require 'rspec/rails/matchers'
 require 'rspec/rails/fixture_support'
+
+# Load rspec-activemodel-mocks if available; otherwise fall back
+# to the deprecated mock methods
 require 'rspec/rails/mocks'
 require 'rspec/rails/module_inclusion'
 require 'rspec/rails/example'
+require 'rspec/rails/infer_type_configuration'
 require 'rspec/rails/vendor/capybara'
 require 'rspec/rails/vendor/webrat'

data/lib/rspec/rails/example/controller_example_group.rb

@@ -59,11 +59,16 @@ module RSpec::Rails
         base_class ||= RSpec.configuration.infer_base_class_for_anonymous_controllers? ?
                          controller_class :
                          root_controller
+        base_class ||= root_controller
 
-        metadata[:example_group][:described_class] = Class.new(base_class) do
+        new_controller_class = Class.new(base_class) do
           def self.name; "AnonymousController"; end
         end
-        metadata[:example_group][:described_class].class_eval(&body)
+        new_controller_class.class_eval(&body)
+
+        (class << self; self; end).__send__(:define_method, :controller_class) { new_controller_class }
+        metadata[:example_group].delete(:described_class)
+        metadata[:example_group].extend DescribedClassDeprecation.new(new_controller_class)
 
         before do
           @orig_routes = self.routes
@@ -78,6 +83,25 @@ module RSpec::Rails
         end
       end
 
+      class DescribedClassDeprecation < Module
+        def initialize(value)
+          module_eval do
+            define_method :store_computed do |key|
+              return super(key) unless key == :described_class
+
+              RSpec.warn_deprecation(<<-EOS.gsub(/^\s+\|/,''))
+                |In RSpec 3, the `controller { }` macro no longer changes
+                |`described_class` to refer to the generated anonymous controller
+                |class. Instead of `described_class`, use `controller_class` to
+                |access the generated anonymous class.
+                |(`described_class` called from #{::RSpec::CallerFilter.first_non_rspec_line}.)
+              EOS
+              store(:described_class, value)
+            end
+          end
+        end
+      end
+
       # Specifies the routeset that will be used for the example group. This
       # is most useful when testing Rails engines.
       #

data/lib/rspec/rails/infer_type_configuration.rb

@@ -0,0 +1,26 @@
+RSpec.configure do |config|
+  def config.infer_spec_type_from_file_location!
+    @infer_spec_type_from_file_location = true
+  end
+
+  def config.infer_spec_type_from_file_location?
+    @infer_spec_type_from_file_location ||= false
+  end
+
+  config.before do
+    unless config.infer_spec_type_from_file_location?
+      RSpec.warn_deprecation(<<-EOS.gsub(/^\s+\|/,''))
+       |rspec-rails 3 will no longer automatically infer an example group's spec type
+       |from the file location. You can explicitly opt-in to this feature using this
+       |snippet:
+       |
+       |RSpec.configure do |config|
+       |  config.infer_spec_type_from_file_location!
+       |end
+       |
+       |If you wish to manually label spec types via metadata you can safely ignore
+       |this warning and continue upgrading to RSpec 3 without addressing it.
+      EOS
+    end
+  end
+end

data/lib/rspec/rails/mocks.rb

@@ -87,12 +87,13 @@ module RSpec
       #   * A String representing a Class that extends ActiveModel::Naming
       #   * A Class that extends ActiveModel::Naming
       def mock_model(string_or_model_class, stubs = {})
+        RSpec.deprecate("`mock_model`", :replacement => "the `rspec-activemodel-mocks` gem")
         if String === string_or_model_class
           if Object.const_defined?(string_or_model_class)
             model_class = Object.const_get(string_or_model_class)
           else
             model_class = Object.const_set(string_or_model_class, Class.new do
-              extend ActiveModel::Naming
+              extend ::ActiveModel::Naming
               def self.primary_key; :id; end
             end)
           end
@@ -100,7 +101,7 @@ module RSpec
           model_class = string_or_model_class
         end
 
-        unless model_class.kind_of? ActiveModel::Naming
+        unless model_class.kind_of? ::ActiveModel::Naming
           raise ArgumentError.new <<-EOM
 The mock_model method can only accept as its first argument:
   * A String representing a Class that does not exist
@@ -122,8 +123,8 @@ EOM
           m.singleton_class.class_eval do
             include ActiveModelInstanceMethods
             include ActiveRecordInstanceMethods if defined?(ActiveRecord)
-            include ActiveModel::Conversion
-            include ActiveModel::Validations
+            include ::ActiveModel::Conversion
+            include ::ActiveModel::Validations
           end
           if defined?(ActiveRecord)
             [:save, :update_attributes, :update].each do |key|
@@ -149,6 +150,10 @@ EOM
               #{model_class}.respond_to?(:column_names) && #{model_class}.column_names.include?(method_name.to_s)
             end
 
+            def @object.has_attribute?(attr_name)
+              __model_class_has_column?(attr_name)
+            end unless #{stubs.has_key?(:has_attribute?)}
+
             def @object.respond_to?(method_name, include_private=false)
               __model_class_has_column?(method_name) ? true : super
             end unless #{stubs.has_key?(:respond_to?)}
@@ -230,6 +235,7 @@ EOM
       #     stub_model(Person, :to_param => 37)
       #     stub_model(Person) {|person| person.first_name = "David"}
       def stub_model(model_class, stubs={})
+        RSpec.deprecate("`stub_model`", :replacement => "the `rspec-activemodel-mocks` gem")
         model_class.new.tap do |m|
           m.extend ActiveModelStubExtensions
           if defined?(ActiveRecord) && model_class < ActiveRecord::Base
@@ -267,4 +273,12 @@ EOM
   end
 end
 
-RSpec.configuration.include RSpec::Rails::Mocks
+# We need to check if rspec-activemodel-mocks is in use on this side due
+# to Rails defaults. Because rspec-activemodel-mocks does not depend on
+# rspec-rails, bundler is likely to require rspec-activemodel-mocks before
+# rspec-rails when Bundler.require is performed. This will result in the
+# user still getting a deprecation message even when they are doing
+# everything right.
+unless defined?(RSpec::ActiveModel::Mocks::Mocks)
+  RSpec.configuration.include RSpec::Rails::Mocks
+end