rspec-rails 4.0.0.beta3 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ae59820fb98850c1f67442c749ce42e76895fca3a17f952ac36d752903fd986
-  data.tar.gz: 713bb7441b6d66036dc73f2f9fa448419390627890ab0bf6a535c84800758939
+  metadata.gz: e4fdfac614970485c2587ffc56aa4f4f5a79fc2bb2bd49045d607c61fb5bc510
+  data.tar.gz: 0b8dabeb32e7b2d9a18c50d722f6c8ebda39610d35e8b45d329e26ff59f9046b
 SHA512:
-  metadata.gz: 691dc937903a8aaac3e23feff435710e521082a0ace9bddc00cba9bd9ecb52610104b66458c900ababcf19a74e341affa78c109eb589faa7c25f7320db82954a
-  data.tar.gz: 56d7c5dbd4a1e437f5f011274f084a6e1a835b0795d369fe56e53b993dbf4a199067b96f73e2ae2aad7b6c556ee6dcb6b24cd46fd12a967bfe15e50450367bce
+  metadata.gz: '09c2ebd8e132d6b98f84265e5175a475cf47cd9ac6145324c722f70fa82d328ce7feb5fc8b14e06a44ca18eb22bd66c124e8694ea84965d80ada15884bee4ac5'
+  data.tar.gz: 7a58ee48a4f590fde7c376019e531371cd576d7301318f38f1cb53baf817e75b29766d61b10f56fc367d764622478b7baf81c053e72ed63a558726c5dc35eb0e

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,5 +1,29 @@
-### Development
-[Full Changelog](https://github.com/rspec/rspec-rails/compare/v3.9.0...master)
+### 4.0.2 / 2020-12-26
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v4.0.1...v4.0.2)
+
+Bug Fixes:
+
+* Indent all extra failure lines output from system specs. (Alex Robbin, #2321)
+* Generated request spec for update now uses the correct let. (Paul Hanyzewski, #2344)
+* Return `true`/`false` from predicate methods in config rather than raw values.
+  (Phil Pirozhkov, Jon Rowe, #2353, #2354)
+* Remove old #fixture_path feature detection code which broke under newer Rails.
+  (Koen Punt, Jon Rowe, #2370)
+
+### 4.0.1 / 2020-05-16
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v4.0.0...v4.0.1)
+
+Bug Fixes:
+
+* Remove warning when calling `driven_by` in system specs. (Aubin Lorieux, #2302)
+* Fix comparison of times for `#at` in job matchers. (Jon Rowe, Markus Doits, #2304)
+* Allow `have_enqueued_mail` to match when a sub class of `ActionMailer::DeliveryJob`
+  is set using `<Class>.delivery_job=`. (Atsushi Yoshida #2305)
+* Restore Ruby 2.2.x compatibility. (Jon Rowe, #2332)
+* Add `required_ruby_version` to gem spec. (Marc-André Lafortune, #2319, #2338)
+
+### 4.0.0 / 2020-03-24
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v3.9.1...v4.0.0)
 
 Enhancements:
 
@@ -14,6 +38,18 @@ Enhancements:
 * Improve path parsing in view specs render options. (John Hawthorn, #2115)
 * Add routing spec template as an option for generating controller specs.
   (David Revelo, #2134)
+* Add argument matcher support to `have_enqueued_*` matchers. (Phil Pirozhkov, #2206)
+* Switch generated templates to use ruby 1.9 hash keys. (Tanbir Hasan, #2224)
+* Add `have_been_performed`/`have_performed_job`/`perform_job` ActiveJob
+  matchers (Isaac Seymour, #1785)
+* Default to generating request specs rather than controller specs when
+  generating a controller (Luka Lüdicke, #2222)
+* 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)
+*  Set `ActionDispatch::SystemTesting::Server.silence_puma = true` when running system specs.
+  (ta1kt0me, Benoit Tigeot, #2289)
 
 Bug Fixes:
 
@@ -27,13 +63,31 @@ Bug Fixes:
   are generated correctly. (Jon Rowe, #2164)
 * `ActionView::FixtureResolver#hash` has been renamed to `ActionView::FixtureResolver#data`.
   (Penelope Phippen, #2076)
-* Add missing require for `have_enqueued_mail` matcher.  (Ignatius Reza, #2117)
+* Prevent `driven_by(:selenium)` being called due to hook precedence.
+  (Takumi Shotoku, #2188)
+* Prevent a `WrongScopeError` being thrown during loading fixtures on Rails
+  6.1 development version. (Edouard Chin, #2215)
+* Fix Mocha mocking support with `should`. (Phil Pirozhkov, #2256)
+* 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)
+* Clear ActionMailer test mailbox after each example (Benoit Tigeot, #2293)
 
 Breaking Changes:
 
 * Drops support for Rails below 5.0
 * Drops support for Ruby below 2.3
 
+### 3.9.1 / 2020-03-10
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.9.0...v3.9.1)
+
+Bug Fixes:
+
+* Add missing require for have_enqueued_mail matcher. (Ignatius Reza, #2117)
+
 ### 3.9.0 / 2019-10-08
 [Full Changelog](https://github.com/rspec/rspec-rails/compare/v3.8.3...v3.9.0)
 
@@ -341,10 +395,10 @@ Enhancements:
 * Improve controller and routing spec calls to `routes` by using `yield`
   instead of `call`. (Anton Davydov, #1308)
 * Add support for `ActiveJob` specs as standard `RSpec::Rails::RailsExampleGoup`s
-  via both `:type => :job` and inferring type from spec directory `spec/jobs`.
+  via both `type: :job` and inferring type from spec directory `spec/jobs`.
   (Gabe Martin-Dempesy, #1361)
 * Include `RSpec::Rails::FixtureSupport` into example groups using metadata
-  `:use_fixtures => true`. (Aaron Kromer, #1372)
+  `use_fixtures: true`. (Aaron Kromer, #1372)
 * Include `rspec:request` generator for generating request specs; this is an
   alias of `rspec:integration` (Aaron Kromer, #1378)
 * Update `rails_helper` generator with a default check to abort the spec run
@@ -485,7 +539,7 @@ Enhancements:
 Bug Fixes:
 
 * Fix an inconsistency in the generated scaffold specs for a controller. (Andy Waite)
-* Ensure `config.before(:all, :type => <type>)` hooks run before groups
+* Ensure `config.before(:all, type: <type>)` hooks run before groups
   of the given type, even when the type is inferred by the file
   location. (Jon Rowe, Myron Marston)
 * Switch to parsing params with `Rack::Utils::parse_nested_query` to match Rails.
@@ -935,7 +989,7 @@ This release is compatible with rails-3.1.0.rc1, but not rails-3.1.0.beta1
 * Enhancements
   * include ApplicationHelper in helper object in helper specs
   * include request spec extensions in files in spec/integration
-  * include controller spec extensions in groups that use :type => :controller
+  * include controller spec extensions in groups that use type: :controller
     * same for :model, :view, :helper, :mailer, :request, :routing
 
 * Bug fixes

data/README.md

@@ -8,9 +8,10 @@ They’re also specifications (or _specs,_ for short):
 detailed explanations of how the application is supposed to behave,
 expressed in plain English.
 
+Use **[`rspec-rails` 3.x][]** for Rails earlier than 5.0.
 Use **[`rspec-rails` 1.x][]** for Rails 2.x.
 
-[Build Status]: https://secure.travis-ci.org/rspec/rspec-rails.svg?branch=master
+[Build Status]: https://secure.travis-ci.org/rspec/rspec-rails.svg?branch=main
 [travis-ci]: https://travis-ci.org/rspec/rspec-rails
 [Code Climate]: https://codeclimate.com/github/rspec/rspec-rails.svg
 [code-climate]: https://codeclimate.com/github/rspec/rspec-rails
@@ -19,6 +20,7 @@ Use **[`rspec-rails` 1.x][]** for Rails 2.x.
 [RSpec]: https://rspec.info/
 [Ruby on Rails]: https://rubyonrails.org/
 [`rspec-rails` 1.x]: https://github.com/dchelimsky/rspec-rails
+[`rspec-rails` 3.x]: https://github.com/rspec/rspec-rails/tree/3-9-maintenance
 
 ## Installation
 
@@ -28,14 +30,14 @@ Use **[`rspec-rails` 1.x][]** for Rails 2.x.
    ```ruby
    # Run against the latest stable release
    group :development, :test do
-     gem 'rspec-rails', '~> 3.8'
+     gem 'rspec-rails', '~> 4.0.1'
    end
 
-   # Or, run against the master branch
-   # (requires master-branch versions of all related RSpec libraries)
+   # Or, run against the main branch
+   # (requires main-branch versions of all related RSpec libraries)
    group :development, :test do
      %w[rspec-core rspec-expectations rspec-mocks rspec-rails rspec-support].each do |lib|
-       gem lib, :git => "https://github.com/rspec/#{lib}.git", :branch => 'master'
+       gem lib, git: "https://github.com/rspec/#{lib}.git", branch: 'main'
      end
    end
    ```
@@ -119,8 +121,7 @@ $ bundle exec rspec --help
 ```
 
 **Optional:** If `bundle exec rspec` is too verbose for you,
-you can generate a binstub at `bin/rspec`
-and use that instead (Rails 4+ only):
+you can generate a binstub at `bin/rspec` and use that instead:
 
  ```sh
  $ bundle binstubs rspec-core
@@ -183,17 +184,17 @@ In addition to [the matchers that come standard in RSpec][],
 here are some extras that make it easier
 to test the various parts of a Rails system:
 
-| RSpec matcher            | Delegates to      | Available in                    | Notes                                                    |
-| ------------------------ | ----------------- | ------------------------------- | -------------------------------------------------------- |
-| [`be_a_new`][]           |                   | all                             | primarily intended for controller specs                  |
-| [`render_template`][]    | `assert_template` | request / controller / view     | use with `expect(response).to`                           |
-| [`redirect_to`][]        | `assert_redirect` | request / controller            | use with `expect(response).to`                           |
-| [`route_to`]             | `assert_routing`  | routing / controller            | replaces `route_for` from version 1.x                    |
-| [`be_routable`]          |                   | routing / controller            | usu. for `expect(...).not_to be_routable`                |
-| [`have_http_status`][]   |                   | request / controller / feature  |                                                          |
-| [`match_array`][]        |                   | all                             | for comparing arrays of ActiveRecord objects             |
-| [`have_been_enqueued`][] |                   | all                             | requires config: `ActiveJob::Base.queue_adapter = :test` |
-| [`have_enqueued_job`][]  |                   | all                             | requires config: `ActiveJob::Base.queue_adapter = :test` |
+| RSpec matcher            | Delegates to        | Available in                    | Notes                                                    |
+| ------------------------ | ------------------- | ------------------------------- | -------------------------------------------------------- |
+| [`be_a_new`][]           |                     | all                             | primarily intended for controller specs                  |
+| [`render_template`][]    | `assert_template`   | request / controller / view     | use with `expect(response).to`                           |
+| [`redirect_to`][]        | `assert_redirect`   | request / controller            | use with `expect(response).to`                           |
+| [`route_to`]             | `assert_recognizes` | routing / controller            | use with `expect(...).to route_to`                       |
+| [`be_routable`]          |                     | routing / controller            | use with `expect(...).not_to be_routable`                |
+| [`have_http_status`][]   |                     | request / controller / feature  |                                                          |
+| [`match_array`][]        |                     | all                             | for comparing arrays of ActiveRecord objects             |
+| [`have_been_enqueued`][] |                     | all                             | requires config: `ActiveJob::Base.queue_adapter = :test` |
+| [`have_enqueued_job`][]  |                     | all                             | requires config: `ActiveJob::Base.queue_adapter = :test` |
 
 Follow the links above for examples of how each matcher is used.
 
@@ -362,7 +363,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.rb

@@ -18,12 +18,6 @@ module Rspec
           @_rspec_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'rspec', generator_name, 'templates'))
         end
       end
-
-      if ::Rails::VERSION::STRING < '3.1'
-        def module_namespacing
-          yield if block_given?
-        end
-      end
     end
   end
 end

data/lib/generators/rspec/controller/controller_generator.rb

@@ -4,12 +4,20 @@ module Rspec
   module Generators
     # @private
     class ControllerGenerator < Base
-      argument :actions, :type => :array, :default => [], :banner => "action action"
+      argument :actions, type: :array, default: [], banner: "action action"
 
-      class_option :template_engine, :desc => "Template engine to generate view files"
-      class_option :controller_specs, :type => :boolean, :default => true, :desc => "Generate controller specs"
-      class_option :view_specs,       :type => :boolean, :default => true, :desc => "Generate view specs"
-      class_option :routing_specs,    :type => :boolean, :default => false, :desc => "Generate routing specs"
+      class_option :template_engine,  desc: "Template engine to generate view files"
+      class_option :request_specs,    type: :boolean, default: true, desc: "Generate request specs"
+      class_option :controller_specs, type: :boolean, default: false, desc: "Generate controller specs"
+      class_option :view_specs,       type: :boolean, default: true, desc: "Generate view specs"
+      class_option :routing_specs,    type: :boolean, default: false, desc: "Generate routing specs"
+
+      def generate_request_spec
+        return unless options[:request_specs]
+
+        template 'request_spec.rb',
+                 File.join('spec/requests', class_path, "#{file_name}_request_spec.rb")
+      end
 
       def generate_controller_spec
         return unless options[:controller_specs]

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

@@ -0,0 +1,14 @@
+require 'rails_helper'
+
+RSpec.describe "<%= class_name.pluralize %>", <%= type_metatag(:request) %> do
+<% namespaced_path = regular_class_path.join('/') %>
+<% for action in actions -%>
+  describe "GET /<%= action %>" do
+    it "returns http success" do
+      get "<%= "/#{namespaced_path}" if namespaced_path != '' %>/<%= file_name %>/<%= action %>"
+      expect(response).to have_http_status(:success)
+    end
+  end
+
+<% end -%>
+end

data/lib/generators/rspec/controller/templates/routing_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe '<%= class_name %>Controller', <%= type_metatag(:routing) %> do
   describe 'routing' do
 <% for action in actions -%>
     it 'routes to #<%= action %>' do
-      expect(:get => "/<%= class_name.underscore %>/<%= action %>").to route_to("<%= class_name.underscore %>#<%= action  %>")
+      expect(get: "/<%= class_name.underscore %>/<%= action %>").to route_to("<%= class_name.underscore %>#<%= action  %>")
     end
 <% end -%>
   end

data/lib/generators/rspec/feature/feature_generator.rb

@@ -4,8 +4,8 @@ module Rspec
   module Generators
     # @private
     class FeatureGenerator < Base
-      class_option :feature_specs, :type => :boolean, :default => true,  :desc => "Generate feature specs"
-      class_option :singularize,   :type => :boolean, :default => false, :desc => "Singularize the generated feature"
+      class_option :feature_specs, type: :boolean, default: true,  desc: "Generate feature specs"
+      class_option :singularize,   type: :boolean, default: false, desc: "Singularize the generated feature"
 
       def generate_feature_spec
         return unless options[: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/helper/helper_generator.rb

@@ -4,7 +4,7 @@ module Rspec
   module Generators
     # @private
     class HelperGenerator < Base
-      class_option :helper_specs, :type => :boolean, :default => true
+      class_option :helper_specs, type: :boolean, default: true
 
       def generate_helper_spec
         return unless options[:helper_specs]

data/lib/generators/rspec/install/install_generator.rb

@@ -32,8 +32,8 @@ DESC
 
       def generate_rspec_init(tmpdir)
         initializer = ::RSpec::Core::ProjectInitializer.new(
-          :destination => tmpdir,
-          :report_stream => StringIO.new
+          destination: tmpdir,
+          report_stream: StringIO.new
         )
         initializer.run
 
@@ -47,7 +47,7 @@ DESC
         gsub_file spec_helper_path,
                   'rspec --init',
                   'rails generate rspec:install',
-                  :verbose => false
+                  verbose: false
       end
 
       def remove_warnings_configuration(spec_helper_path)
@@ -56,7 +56,7 @@ DESC
         gsub_file spec_helper_path,
                   /#{empty_line}(#{comment_line})+\s+config\.warnings = true\n/,
                   '',
-                  :verbose => false
+                  verbose: false
       end
     end
   end

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

@@ -1,11 +1,7 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 require 'spec_helper'
 ENV['RAILS_ENV'] ||= 'test'
-<% if RUBY_VERSION >= '2.0.0' %>
 require File.expand_path('../config/environment', __dir__)
-<% else %>
-require File.expand_path('../../config/environment', __FILE__)
-<% end %>
 # Prevent database truncation if the environment is production
 abort("The Rails environment is running in production mode!") if Rails.env.production?
 require 'rspec/rails'
@@ -24,9 +20,9 @@ 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.can_maintain_test_schema? -%>
+<% if RSpec::Rails::FeatureCheck.has_active_record_migration? -%>
 # Checks for pending migrations and applies them before tests are run.
 # If you are not using ActiveRecord, you can remove these lines.
 begin
@@ -35,15 +31,6 @@ rescue ActiveRecord::PendingMigrationError => e
   puts e.to_s.strip
   exit 1
 end
-<% elsif RSpec::Rails::FeatureCheck.can_check_pending_migrations? -%>
-# Checks for pending migrations before tests are run.
-# If you are not using ActiveRecord, you can remove these lines.
-begin
-  ActiveRecord::Migration.check_pending!
-rescue ActiveRecord::PendingMigrationError => e
-  puts e.to_s.strip
-  exit 1
-end
 <% end -%>
 RSpec.configure do |config|
 <% if RSpec::Rails::FeatureCheck.has_active_record? -%>
@@ -55,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
@@ -63,7 +64,7 @@ RSpec.configure do |config|
   # You can disable this behaviour by removing the line below, and instead
   # explicitly tag your specs with their type, e.g.:
   #
-  #     RSpec.describe UsersController, :type => :controller do
+  #     RSpec.describe UsersController, type: :controller do
   #       # ...
   #     end
   #