rspec-rails 4.0.0.beta4 → 4.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51903b359e44b4d8c3323a4af3caa9de3495e02009b61da605af24d7ae588b0b
-  data.tar.gz: 11e9ff4ad45a88a32e9f0a4294cd6c8f7c75febd5ba07c1382fed86ebdcd64aa
+  metadata.gz: 2cf0a532366cef497e1b49006e7091da23b57071c1c4748b91dc7e4fb1f1b382
+  data.tar.gz: 8ae957b352b26a7bec08b5c07aab62906d662996aba06398d19f036016b09477
 SHA512:
-  metadata.gz: 8e9b40e1404bb29508e00c460db05b7d499ca86daa332cbe3e517dfd922ec860302023e6f71e15e7445f07c7eb39979306cd98ef296b7794ae2c87e3d5865b59
-  data.tar.gz: bb8b7f0411f6d1eff0550b952117bbd58aa59ca082c54d2a145e808fc14a400de0885bb8a8b5503b04baef787527b50a08054e471444123e433d3138c8b45fe1
+  metadata.gz: c9992d5aea4659d31b69b48e741c87d50deb3df2151bef86adb6084a3b6feb421d20408d52b0157481dce4e9b0aef31ebdeacfa71efdb97bedc26f7f310f211e
+  data.tar.gz: f6f524c072df299e3566abcb99d603eafefe8edc47440bc13e31fa87cf84a2f325c7cd8519eeecedf8cee4c647cbbdccac806e1cc905f9c6068b38a84bfbf025

data/Capybara.md

@@ -1,58 +1,19 @@
 rspec-rails supports integration with Capybara out of the box by adding
 its Capybara::DSL (visit/page) and Capybara::RSpecMatchers to the
-examples in the applicable directories, which differ slightly between
-Capybara 1.x and Capybara >= 2.x.
+examples in the applicable directories.
 
 ## Capybara::DSL
 
 Adds the `visit` and `page` methods, which work together to simulate a
 GET request and provide access to the result (via `page`).
 
-## Capybara::RSpecMatchers
-
-Exposes matchers used to specify expected HTML content (e.g. `should_not have_selector` will work correctly).
-
-## Capybara 1.x
-
-Capybara::DSL is added to examples in:
-
-* spec/requests    # included by Capybara
-* spec/controllers
-
-Capybara::RSpecMatchers is added to examples in:
-
-* spec/requests    # included by Capybara
-* spec/controllers
-* spec/views
-* spec/helpers
-* spec/mailers
-
-## Capybara 2.0
-
-To use Capybara 2.0, you need rspec-rails-2.11.1 or greater.
-
 Capybara::DSL is added to examples in:
 
 * spec/features
 
-Capybara::RSpecMatchers is added to examples in:
-
-* spec/features
-* spec/controllers
-* spec/views
-* spec/helpers
-* spec/mailers
-
-## Upgrading to Capybara-2.0
-
-Many users have been confused by the co-existence of the the
-Capybara::DSL (visit/page) alongside the rack-test DSL
-(get|post|put|delete|head/response.body) in examples in spec/requests
-and spec/controllers. As of rspec-rails-2.11.1 and capybara-2.0.0.beta2, these
-are separated as follows:
+## Capybara::RSpecMatchers
 
-* Capybara::DSL is included `spec/features`
-* rack-test DSL is included in `spec/requests` and `spec/controllers`
+Exposes matchers used to specify expected HTML content (e.g. `should_not have_selector` will work correctly).
 
 Capybara::RSpecMatchers is added to examples in:
 
@@ -62,16 +23,6 @@ Capybara::RSpecMatchers is added to examples in:
 * spec/helpers
 * spec/mailers
 
-If you're upgrading to Capybara-2.0 and you used visit/page in
-spec/requests you'll want to move those examples to spec/features and
-they should just work.
-
-If you want to leave those examples in spec/requests, you can include
-Capybara::DSL in those examples yourself as follows, but this is
-absolutely not recommended as you will be overriding the intended
-behavior and accepting the risks associated with doing so:
+## Upgrading to Capybara-3.x
 
-    # not recommended!
-    RSpec.configure do |c|
-      c.include Capybara::DSL, file_path: "spec/requests"
-    end
+Consult the official [Upgrading from Capybara 2.x to 3.x](https://github.com/teamcapybara/capybara/blob/master/UPGRADING.md#upgrading-from-capybara-2x-to-3x) guide.

data/Changelog.md

@@ -1,3 +1,22 @@
+### 4.0.0.rc1 / 2020-03-13
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v4.0.0.beta4...v4.0.0.rc1)
+
+Enhancements:
+
+* Allow `ActiveJob` matchers `#on_queue` modifier to take symbolic queue names. (Nils Sommer, #2283)
+* The scaffold generator now generates request specs in preference to controller specs.
+  (Luka Lüdicke, #2288)
+* Add configuration option to disable ActiveRecord. (Jon Rowe, Phil Pirozhkov, Hermann Mayer, #2266)
+
+Bug Fixes:
+
+* Restore previous conditional check for setting `default_url_options` in feature
+  specs, prevents a `NoMethodError` in some scenarios. (Eugene Kenny, #2277)
+* Allow changing `ActiveJob::Base.queue_adapter` inside a system spec.
+  (Jonathan Rochkind, #2242)
+* `rails generate generator` command now creates related spec file (Joel Azemar, #2217)
+* Relax upper `capybara` version constraint to allow for Capybara 3.x (Phil Pirozhkov, #2281)
+
 ### 4.0.0.beta4
 [Full Changelog](https://github.com/rspec/rspec-rails/compare/v4.0.0.beta3...v4.0.0.beta4)
 

data/README.md

@@ -361,7 +361,7 @@ you can run the specs and Cucumber features, or submit a pull request.
 ### Recommended third-party extensions
 
 * [FactoryBot](https://github.com/thoughtbot/factory_bot)
-* [Capybara](https://github.com/jnicklas/capybara)
+* [Capybara](https://github.com/teamcapybara/capybara)
   (Included by default in Rails 5.1+.
   Note that [additional configuration is required][] to use the Capybara DSL
   anywhere other than system specs and feature specs.)

data/lib/generators/rspec/{generators → generator}/generator_generator.rb

@@ -3,8 +3,8 @@ require 'generators/rspec'
 module Rspec
   module Generators
     # @private
-    class GeneratorsGenerator < Base
-      class_option :generator_specs, type: :boolean, default: false,  desc: "Generate generator specs"
+    class GeneratorGenerator < Base
+      class_option :generator_specs, type: :boolean, default: true,  desc: "Generate generator specs"
 
       def generate_generator_spec
         return unless options[:generator_specs]

data/lib/generators/rspec/install/templates/spec/rails_helper.rb

@@ -20,7 +20,7 @@ require 'rspec/rails'
 # directory. Alternatively, in the individual `*_spec.rb` files, manually
 # require only the support files necessary.
 #
-# Dir[Rails.root.join('spec', 'support', '**', '*.rb')].each { |f| require f }
+# Dir[Rails.root.join('spec', 'support', '**', '*.rb')].sort.each { |f| require f }
 
 <% if RSpec::Rails::FeatureCheck.has_active_record_migration? -%>
 # Checks for pending migrations and applies them before tests are run.
@@ -42,6 +42,20 @@ RSpec.configure do |config|
   # instead of true.
   config.use_transactional_fixtures = true
 
+  # You can uncomment this line to turn off ActiveRecord support entirely.
+  # config.use_active_record = false
+
+<% else -%>
+  # Remove this line to enable support for ActiveRecord
+  config.use_active_record = false
+
+  # If you enable ActiveRecord support you should unncomment these lines,
+  # note if you'd prefer not to run each example within a transaction, you
+  # should set use_transactional_fixtures to false.
+  #
+  # config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  # config.use_transactional_fixtures = true
+
 <% end -%>
   # RSpec Rails can automatically mix in different behaviours to your tests
   # based on their file location, for example enabling you to call `get` and

data/lib/generators/rspec/scaffold/scaffold_generator.rb

@@ -14,7 +14,8 @@ module Rspec
       class_option :singleton, type: :boolean, desc: "Supply to create a singleton controller"
       class_option :api, type: :boolean, desc: "Skip specs unnecessary for API-only apps"
 
-      class_option :controller_specs, type: :boolean, default: true,  desc: "Generate controller specs"
+      class_option :controller_specs, type: :boolean, default: false, desc: "Generate controller specs"
+      class_option :request_specs,    type: :boolean, default: true,  desc: "Generate request specs"
       class_option :view_specs,       type: :boolean, default: true,  desc: "Generate view specs"
       class_option :helper_specs,     type: :boolean, default: true,  desc: "Generate helper specs"
       class_option :routing_specs,    type: :boolean, default: true,  desc: "Generate routing specs"
@@ -27,15 +28,20 @@ module Rspec
       def generate_controller_spec
         return unless options[:controller_specs]
 
-        template_file = File.join(
-          'spec/controllers',
-          controller_class_path,
-          "#{controller_file_name}_controller_spec.rb"
-        )
         if options[:api]
-          template 'api_controller_spec.rb', template_file
+          template 'api_controller_spec.rb', template_file(folder: 'controllers', suffix: '_controller')
+        else
+          template 'controller_spec.rb', template_file(folder: 'controllers', suffix: '_controller')
+        end
+      end
+
+      def generate_request_spec
+        return unless options[:request_specs]
+
+        if options[:api]
+          template 'api_request_spec.rb', template_file(folder: 'requests')
         else
-          template 'controller_spec.rb', template_file
+          template 'request_spec.rb', template_file(folder: 'requests')
         end
       end
 
@@ -60,8 +66,6 @@ module Rspec
         template 'routing_spec.rb', template_file
       end
 
-      hook_for :integration_tool, as: :integration
-
     protected
 
       attr_reader :generator_args
@@ -116,6 +120,10 @@ module Rspec
         end
       end
 
+      def template_file(folder:, suffix: '')
+        File.join('spec', folder, controller_class_path, "#{controller_file_name}#{suffix}_spec.rb")
+      end
+
       def banner
         self.class.banner
       end

data/lib/generators/rspec/scaffold/templates/api_request_spec.rb

@@ -0,0 +1,131 @@
+require 'rails_helper'
+
+# This spec was generated by rspec-rails when you ran the scaffold generator.
+# It demonstrates how one might use RSpec to test the controller code that
+# was generated by Rails when you ran the scaffold generator.
+#
+# It assumes that the implementation code is generated by the rails scaffold
+# generator. If you are using any extension libraries to generate different
+# controller code, this generated spec may or may not pass.
+#
+# It only uses APIs available in rails and/or rspec-rails. There are a number
+# of tools you can use to make these specs even more expressive, but we're
+# sticking to rails and rspec-rails APIs to keep things simple and stable.
+
+<% module_namespacing do -%>
+RSpec.describe "/<%= name.underscore.pluralize %>", <%= type_metatag(:request) %> do
+  # This should return the minimal set of attributes required to create a valid
+  # <%= class_name %>. As you add validations to <%= class_name %>, be sure to
+  # adjust the attributes here as well.
+  let(:valid_attributes) {
+    skip("Add a hash of attributes valid for your model")
+  }
+
+  let(:invalid_attributes) {
+    skip("Add a hash of attributes invalid for your model")
+  }
+
+  # This should return the minimal set of values that should be in the headers
+  # in order to pass any filters (e.g. authentication) defined in
+  # <%= controller_class_name %>Controller, or in your router and rack
+  # middleware. Be sure to keep this updated too.
+  let(:valid_headers) {
+    {}
+  }
+
+<% unless options[:singleton] -%>
+  describe "GET /index" do
+    it "renders a successful response" do
+      <%= class_name %>.create! valid_attributes
+      get <%= index_helper %>_url, headers: valid_headers, as: :json
+      expect(response).to be_successful
+    end
+  end
+<% end -%>
+
+  describe "GET /show" do
+    it "renders a successful response" do
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      get <%= show_helper.tr('@', '') %>, as: :json
+      expect(response).to be_successful
+    end
+  end
+
+  describe "POST /create" do
+    context "with valid parameters" do
+      it "creates a new <%= class_name %>" do
+        expect {
+          post <%= index_helper %>_url,
+               params: { <%= ns_file_name %>: valid_attributes }, headers: valid_headers, as: :json
+        }.to change(<%= class_name %>, :count).by(1)
+      end
+
+      it "renders a JSON response with the new <%= ns_file_name %>" do
+        post <%= index_helper %>_url,
+             params: { <%= ns_file_name %>: valid_attributes }, headers: valid_headers, as: :json
+        expect(response).to have_http_status(:created)
+        expect(response.content_type).to match(a_string_including("application/json"))
+      end
+    end
+
+    context "with invalid parameters" do
+      it "does not create a new <%= class_name %>" do
+        expect {
+          post <%= index_helper %>_url,
+               params: { <%= ns_file_name %>: invalid_attributes }, as: :json
+        }.to change(<%= class_name %>, :count).by(0)
+      end
+
+      it "renders a JSON response with errors for the new <%= ns_file_name %>" do
+        post <%= index_helper %>_url,
+             params: { <%= ns_file_name %>: invalid_attributes }, headers: valid_headers, as: :json
+        expect(response).to have_http_status(:unprocessable_entity)
+        expect(response.content_type).to eq("application/json")
+      end
+    end
+  end
+
+  describe "PATCH /update" do
+    context "with valid parameters" do
+      let(:new_attributes) {
+        skip("Add a hash of attributes valid for your model")
+      }
+
+      it "updates the requested <%= ns_file_name %>" do
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+        patch <%= show_helper.tr('@', '') %>,
+              params: { <%= singular_table_name %>: invalid_attributes }, headers: valid_headers, as: :json
+        <%= file_name %>.reload
+        skip("Add assertions for updated state")
+      end
+
+      it "renders a JSON response with the <%= ns_file_name %>" do
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+        patch <%= show_helper.tr('@', '') %>,
+              params: { <%= singular_table_name %>: invalid_attributes }, headers: valid_headers, as: :json
+        expect(response).to have_http_status(:ok)
+        expect(response.content_type).to eq("application/json")
+      end
+    end
+
+    context "with invalid parameters" do
+      it "renders a JSON response with errors for the <%= ns_file_name %>" do
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+        patch <%= show_helper.tr('@', '') %>,
+              params: { <%= singular_table_name %>: invalid_attributes }, headers: valid_headers, as: :json
+        expect(response).to have_http_status(:unprocessable_entity)
+        expect(response.content_type).to eq("application/json")
+      end
+    end
+  end
+
+  describe "DELETE /destroy" do
+    it "destroys the requested <%= ns_file_name %>" do
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      expect {
+        delete <%= show_helper.tr('@', '') %>, headers: valid_headers, as: :json
+      }.to change(<%= class_name %>, :count).by(-1)
+    end
+  end
+end
+<% end -%>

data/lib/generators/rspec/scaffold/templates/request_spec.rb

@@ -0,0 +1,133 @@
+ require 'rails_helper'
+
+# This spec was generated by rspec-rails when you ran the scaffold generator.
+# It demonstrates how one might use RSpec to test the controller code that
+# was generated by Rails when you ran the scaffold generator.
+#
+# It assumes that the implementation code is generated by the rails scaffold
+# generator. If you are using any extension libraries to generate different
+# controller code, this generated spec may or may not pass.
+#
+# It only uses APIs available in rails and/or rspec-rails. There are a number
+# of tools you can use to make these specs even more expressive, but we're
+# sticking to rails and rspec-rails APIs to keep things simple and stable.
+
+<% module_namespacing do -%>
+RSpec.describe "/<%= name.underscore.pluralize %>", <%= type_metatag(:request) %> do
+  # <%= class_name %>. As you add validations to <%= class_name %>, be sure to
+  # adjust the attributes here as well.
+  let(:valid_attributes) {
+    skip("Add a hash of attributes valid for your model")
+  }
+
+  let(:invalid_attributes) {
+    skip("Add a hash of attributes invalid for your model")
+  }
+
+<% unless options[:singleton] -%>
+  describe "GET /index" do
+    it "renders a successful response" do
+      <%= class_name %>.create! valid_attributes
+      get <%= index_helper %>_url
+      expect(response).to be_successful
+    end
+  end
+<% end -%>
+
+  describe "GET /show" do
+    it "renders a successful response" do
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      get <%= show_helper.tr('@', '') %>
+      expect(response).to be_successful
+    end
+  end
+
+  describe "GET /new" do
+    it "renders a successful response" do
+      get <%= new_helper %>
+      expect(response).to be_successful
+    end
+  end
+
+  describe "GET /edit" do
+    it "render a successful response" do
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      get <%= edit_helper.tr('@','') %>
+      expect(response).to be_successful
+    end
+  end
+
+  describe "POST /create" do
+    context "with valid parameters" do
+      it "creates a new <%= class_name %>" do
+        expect {
+          post <%= index_helper %>_url, params: { <%= ns_file_name %>: valid_attributes }
+        }.to change(<%= class_name %>, :count).by(1)
+      end
+
+      it "redirects to the created <%= ns_file_name %>" do
+        post <%= index_helper %>_url, params: { <%= ns_file_name %>: valid_attributes }
+        expect(response).to redirect_to(<%= show_helper.gsub("\@#{file_name}", class_name+".last") %>)
+      end
+    end
+
+    context "with invalid parameters" do
+      it "does not create a new <%= class_name %>" do
+        expect {
+          post <%= index_helper %>_url, params: { <%= ns_file_name %>: invalid_attributes }
+        }.to change(<%= class_name %>, :count).by(0)
+      end
+
+      it "renders a successful response (i.e. to display the 'new' template)" do
+        post <%= index_helper %>_url, params: { <%= ns_file_name %>: invalid_attributes }
+        expect(response).to be_successful
+      end
+    end
+  end
+
+  describe "PATCH /update" do
+    context "with valid parameters" do
+      let(:new_attributes) {
+        skip("Add a hash of attributes valid for your model")
+      }
+
+      it "updates the requested <%= ns_file_name %>" do
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+        patch <%= show_helper.tr('@', '') %>, params: { <%= singular_table_name %>: new_attributes }
+        <%= file_name %>.reload
+        skip("Add assertions for updated state")
+      end
+
+      it "redirects to the <%= ns_file_name %>" do
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+        patch <%= show_helper.tr('@', '') %>, params: { <%= singular_table_name %>: new_attributes }
+        <%= file_name %>.reload
+        expect(response).to redirect_to(<%= singular_table_name %>_url(<%= file_name %>))
+      end
+    end
+
+    context "with invalid parameters" do
+      it "renders a successful response (i.e. to display the 'edit' template)" do
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+        patch <%= show_helper.tr('@', '') %>, params: { <%= singular_table_name %>: invalid_attributes }
+        expect(response).to be_successful
+      end
+    end
+  end
+
+  describe "DELETE /destroy" do
+    it "destroys the requested <%= ns_file_name %>" do
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      expect {
+        delete <%= show_helper.tr('@', '') %>
+      }.to change(<%= class_name %>, :count).by(-1)
+    end
+
+    it "redirects to the <%= table_name %> list" do
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      delete <%= show_helper.tr('@', '') %>
+      expect(response).to redirect_to(<%= index_helper %>_url)
+    end
+  end
+end
+<% end -%>

data/lib/rspec-rails.rb

@@ -31,8 +31,8 @@ module RSpec
       # sets the default for the `preview_path`
       initializer "rspec_rails.action_mailer",
                   before: "action_mailer.set_configs" do |app|
-        setup_preview_path(app)
-      end
+                    setup_preview_path(app)
+                  end
 
     private
 

data/lib/rspec/rails/adapters.rb

@@ -146,9 +146,9 @@ module RSpec
         # examples without exposing non-assertion methods in Test::Unit or
         # Minitest.
         def assertion_method_names
-          ::RSpec::Rails::Assertions.
-            public_instance_methods.
-            select do |m|
+          ::RSpec::Rails::Assertions
+            .public_instance_methods
+            .select do |m|
               m.to_s =~ /^(assert|flunk|refute)/
             end
         end

data/lib/rspec/rails/configuration.rb

@@ -55,8 +55,7 @@ module RSpec
     end
 
     # @private
-    # rubocop:disable Metrics/MethodLength
-    def self.initialize_configuration(config)
+    def self.initialize_configuration(config) # rubocop:disable Metrics/MethodLength
       config.backtrace_exclusion_patterns << /vendor\//
       config.backtrace_exclusion_patterns << %r{lib/rspec/rails}
 
@@ -64,6 +63,7 @@ module RSpec
       config.add_setting :infer_base_class_for_anonymous_controllers, default: true
 
       # fixture support
+      config.add_setting :use_active_record, default: true
       config.add_setting :use_transactional_fixtures, alias_with: :use_transactional_examples
       config.add_setting :use_instantiated_fixtures
       config.add_setting :global_fixtures
@@ -151,7 +151,6 @@ module RSpec
         config.include RSpec::Rails::MailboxExampleGroup, type: :mailbox
       end
     end
-    # rubocop:enable Metrics/MethodLength
 
     initialize_configuration RSpec.configuration
   end

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

@@ -34,7 +34,7 @@ if RSpec::Rails::FeatureCheck.has_action_cable_testing?
               next if klass <= ::ActionCable::Channel::Base
 
               raise "Described class is not a channel class.\n" \
-                    "Specify the channel class in the `describe` statement "\
+                    "Specify the channel class in the `describe` statement " \
                     "or set it manually using `tests MyChannelClass`"
             end
           end
@@ -45,7 +45,7 @@ if RSpec::Rails::FeatureCheck.has_action_cable_testing?
               next if klass <= ::ActionCable::Connection::Base
 
               raise "Described class is not a connection class.\n" \
-                    "Specify the connection class in the `describe` statement "\
+                    "Specify the connection class in the `describe` statement " \
                     "or set it manually using `tests MyConnectionClass`"
             end
           end

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

@@ -15,7 +15,9 @@ module RSpec
           include app.routes.url_helpers     if app.routes.respond_to?(:url_helpers)
           include app.routes.mounted_helpers if app.routes.respond_to?(:mounted_helpers)
 
-          default_url_options[:host] ||= ::RSpec::Rails::FeatureExampleGroup::DEFAULT_HOST
+          if respond_to?(:default_url_options)
+            default_url_options[:host] ||= ::RSpec::Rails::FeatureExampleGroup::DEFAULT_HOST
+          end
         end
       end
 
@@ -38,34 +40,14 @@ unless RSpec.respond_to?(:feature)
     capybara_feature: true,
     type: :feature,
     skip: <<-EOT.squish
-      Feature specs require the Capybara (https://github.com/jnicklas/capybara)
-      gem, version 2.2.0 or later. We recommend version 2.4.0 or later to avoid
-      some deprecation warnings and have support for
-      `config.expose_dsl_globally = false`.
+      Feature specs require the Capybara (https://github.com/teamcapybara/capybara)
+      gem, version 2.13.0 or later.
     EOT
   }
 
-  # Capybara's monkey patching causes us to have to jump through some hoops
-  top_level = self
-  main_feature = nil
-  if defined?(Capybara) && ::Capybara::VERSION.to_f < 2.4
-    # Capybara 2.2 and 2.3 do not use `alias_example_xyz`
-    opts[:skip] = <<-EOT.squish
-      Capybara < 2.4.0 does not support RSpec's namespace or
-      `config.expose_dsl_globally = false`. Upgrade to Capybara >= 2.4.0.
-    EOT
-    main_feature = top_level.method(:feature) if top_level.respond_to?(:feature)
-  end
-
   RSpec.configure do |c|
-    main_feature = nil unless c.expose_dsl_globally?
     c.alias_example_group_to :feature, opts
     c.alias_example_to :scenario
     c.alias_example_to :xscenario, skip: 'Temporarily skipped with xscenario'
   end
-
-  # Due to load order issues and `config.expose_dsl_globally?` defaulting to
-  # `true` we need to put Capybara's monkey patch method back. Otherwise,
-  # app upgrades have a high likelyhood of having all feature specs skipped.
-  top_level.define_singleton_method(:feature, &main_feature) if main_feature
 end

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

@@ -71,7 +71,6 @@ module RSpec
         original_after_teardown =
           ::ActionDispatch::SystemTesting::TestHelpers::SetupAndTeardown.instance_method(:after_teardown)
 
-        other.include ActionDispatch::IntegrationTest::Behavior
         other.include ::ActionDispatch::SystemTesting::TestHelpers::SetupAndTeardown
         other.include ::ActionDispatch::SystemTesting::TestHelpers::ScreenshotHelper
         other.include BlowAwayTeardownHooks

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

@@ -149,7 +149,7 @@ module RSpec
           # the original string.
           match = path_regex.match(_default_file_to_render)
 
-          render_options = { template: match[:template] }
+          render_options = {template: match[:template]}
           render_options[:handlers] = [match[:handler]] if match[:handler]
           render_options[:formats] = [match[:format].to_sym] if match[:format]
           render_options[:locales] = [match[:locale]] if match[:locale]

data/lib/rspec/rails/fixture_support.rb

@@ -10,42 +10,53 @@ module RSpec
         include ActiveRecord::TestFixtures
 
         included do
-          self.fixture_path = RSpec.configuration.fixture_path
-          if ::Rails::VERSION::STRING > '5'
-            self.use_transactional_tests = RSpec.configuration.use_transactional_fixtures
-          else
-            self.use_transactional_fixtures = RSpec.configuration.use_transactional_fixtures
+          if RSpec.configuration.use_active_record?
+            include Fixtures
+
+            self.fixture_path = RSpec.configuration.fixture_path
+            if ::Rails::VERSION::STRING > '5'
+              self.use_transactional_tests = RSpec.configuration.use_transactional_fixtures
+            else
+              self.use_transactional_fixtures = RSpec.configuration.use_transactional_fixtures
+            end
+            self.use_instantiated_fixtures = RSpec.configuration.use_instantiated_fixtures
+
+            fixtures RSpec.configuration.global_fixtures if RSpec.configuration.global_fixtures
           end
-          self.use_instantiated_fixtures = RSpec.configuration.use_instantiated_fixtures
+        end
 
-          def self.fixtures(*args)
-            orig_methods = private_instance_methods
-            super.tap do
-              new_methods = private_instance_methods - orig_methods
-              new_methods.each do |method_name|
-                proxy_method_warning_if_called_in_before_context_scope(method_name)
+        module Fixtures
+          extend ActiveSupport::Concern
+
+          class_methods do
+            def fixtures(*args)
+              orig_methods = private_instance_methods
+              super.tap do
+                new_methods = private_instance_methods - orig_methods
+                new_methods.each do |method_name|
+                  proxy_method_warning_if_called_in_before_context_scope(method_name)
+                end
               end
             end
-          end
 
-          def self.proxy_method_warning_if_called_in_before_context_scope(method_name)
-            orig_implementation = instance_method(method_name)
-            define_method(method_name) do |*args, &blk|
-              if inspect.include?("before(:context)")
-                RSpec.warn_with("Calling fixture method in before :context ")
-              else
-                orig_implementation.bind(self).call(*args, &blk)
+            def proxy_method_warning_if_called_in_before_context_scope(method_name)
+              orig_implementation = instance_method(method_name)
+              define_method(method_name) do |*args, &blk|
+                if inspect.include?("before(:context)")
+                  RSpec.warn_with("Calling fixture method in before :context ")
+                else
+                  orig_implementation.bind(self).call(*args, &blk)
+                end
               end
             end
           end
 
           if ::Rails.version.to_f >= 6.1
+            # @private return the example name for TestFixtures
             def name
               @example
             end
           end
-
-          fixtures RSpec.configuration.global_fixtures if RSpec.configuration.global_fixtures
         end
       end
     end

data/lib/rspec/rails/matchers/action_cable/have_broadcasted_to.rb

@@ -8,15 +8,15 @@ module RSpec
           def initialize(target, channel:)
             @target = target
             @channel = channel
-            @block = Proc.new {}
+            @block = proc { }
             @data = nil
             set_expected_number(:exactly, 1)
           end
 
-          def with(data = nil)
+          def with(data = nil, &block)
             @data = data
             @data = @data.with_indifferent_access if @data.is_a?(Hash)
-            @block = Proc.new if block_given?
+            @block = block if block
             self
           end
 

data/lib/rspec/rails/matchers/active_job.rb

@@ -15,7 +15,7 @@ module RSpec
             @args = []
             @queue = nil
             @at = nil
-            @block = Proc.new {}
+            @block = proc { }
             set_expected_number(:exactly, 1)
           end
 
@@ -26,7 +26,7 @@ module RSpec
           end
 
           def on_queue(queue)
-            @queue = queue
+            @queue = queue.to_s
             self
           end
 

data/lib/rspec/rails/matchers/have_enqueued_mail.rb

@@ -93,7 +93,7 @@ module RSpec
         end
 
         def yield_mail_args(block)
-          Proc.new { |*job_args| block.call(*(job_args - base_mailer_args)) }
+          proc { |*job_args| block.call(*(job_args - base_mailer_args)) }
         end
 
         def check_active_job_adapter

data/lib/rspec/rails/matchers/routing_matchers.rb

@@ -26,7 +26,7 @@ module RSpec
               path, query = *verb_to_path_map.values.first.split('?')
               @scope.assert_recognizes(
                 @expected,
-                { method: verb_to_path_map.keys.first, path: path },
+                {method: verb_to_path_map.keys.first, path: path},
                 Rack::Utils.parse_nested_query(query)
               )
             end
@@ -115,7 +115,7 @@ module RSpec
           # Shorthand method for matching this type of route.
           %w[get post put patch delete options head].each do |method|
             define_method method do |path|
-              { method.to_sym => path }
+              {method.to_sym => path}
             end
           end
         end

data/lib/rspec/rails/tasks/rspec.rake

@@ -12,10 +12,10 @@ RSpec::Core::RakeTask.new(spec: "spec:prepare")
 
 namespace :spec do
   types = begin
-            dirs = Dir['./spec/**/*_spec.rb'].
-              map { |f| f.sub(/^\.\/(spec\/\w+)\/.*/, '\\1') }.
-              uniq.
-              select { |f| File.directory?(f) }
+            dirs = Dir['./spec/**/*_spec.rb']
+              .map { |f| f.sub(/^\.\/(spec\/\w+)\/.*/, '\\1') }
+              .uniq
+              .select { |f| File.directory?(f) }
             Hash[dirs.map { |d| [d.split('/').last, d] }]
           end
 

data/lib/rspec/rails/vendor/capybara.rb

@@ -9,11 +9,6 @@ rescue LoadError
 end
 
 if defined?(Capybara)
-  require 'rspec/support/comparable_version'
-  unless RSpec::Support::ComparableVersion.new(Capybara::VERSION) >= '2.2.0'
-    raise "You are using capybara #{Capybara::VERSION}. RSpec requires >= 2.2.0."
-  end
-
   RSpec.configure do |c|
     if defined?(Capybara::DSL)
       c.include Capybara::DSL, type: :feature

data/lib/rspec/rails/version.rb

@@ -3,7 +3,7 @@ module RSpec
     # Version information for RSpec Rails.
     module Version
       # Current version of RSpec Rails, in semantic versioning format.
-      STRING = '4.0.0.beta4'
+      STRING = '4.0.0.rc1'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rails
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta4
+  version: 4.0.0.rc1
 platform: ruby
 authors:
 - David Chelimsky
@@ -44,10 +44,10 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2020-01-12 00:00:00.000000000 Z
+date: 2020-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -61,7 +61,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -145,19 +145,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.9'
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: ammeter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -173,19 +173,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.14.12
 - !ruby/object:Gem::Dependency
-  name: ammeter
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.3.5
 description: rspec-rails is a testing framework for Rails 5+.
 email: rspec@googlegroups.com
 executables: []
@@ -209,8 +209,8 @@ files:
 - lib/generators/rspec/feature/feature_generator.rb
 - lib/generators/rspec/feature/templates/feature_singular_spec.rb
 - lib/generators/rspec/feature/templates/feature_spec.rb
-- lib/generators/rspec/generators/generator_generator.rb
-- lib/generators/rspec/generators/templates/generator_spec.rb
+- lib/generators/rspec/generator/generator_generator.rb
+- lib/generators/rspec/generator/templates/generator_spec.rb
 - lib/generators/rspec/helper/helper_generator.rb
 - lib/generators/rspec/helper/templates/helper_spec.rb
 - lib/generators/rspec/install/install_generator.rb
@@ -231,10 +231,12 @@ files:
 - lib/generators/rspec/request/request_generator.rb
 - lib/generators/rspec/scaffold/scaffold_generator.rb
 - lib/generators/rspec/scaffold/templates/api_controller_spec.rb
+- lib/generators/rspec/scaffold/templates/api_request_spec.rb
 - lib/generators/rspec/scaffold/templates/controller_spec.rb
 - lib/generators/rspec/scaffold/templates/edit_spec.rb
 - lib/generators/rspec/scaffold/templates/index_spec.rb
 - lib/generators/rspec/scaffold/templates/new_spec.rb
+- lib/generators/rspec/scaffold/templates/request_spec.rb
 - lib/generators/rspec/scaffold/templates/routing_spec.rb
 - lib/generators/rspec/scaffold/templates/show_spec.rb
 - lib/generators/rspec/system/system_generator.rb
@@ -294,7 +296,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rspec/rspec-rails/issues
-  changelog_uri: https://github.com/rspec/rspec-rails/blob/v4.0.0.beta4/Changelog.md
+  changelog_uri: https://github.com/rspec/rspec-rails/blob/v4.0.0.rc1/Changelog.md
   documentation_uri: https://rspec.info/documentation/
   mailing_list_uri: https://groups.google.com/forum/#!forum/rspec
   source_code_uri: https://github.com/rspec/rspec-rails