Merge changelog for 4.0.0

Changelog.md

@@ -1,50 +1,9 @@
-### 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)
-*  Set `ActionDispatch::SystemTesting::Server.silence_puma = true` when running system specs.
-  (ta1kt0me, Benoit Tigeot, #2289)
-
-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)
-* Clear ActionMailer test mailbox after each example (Benoit Tigeot, #2293)
-
-### 4.0.0.beta4
-[Full Changelog](https://github.com/rspec/rspec-rails/compare/v4.0.0.beta3...v4.0.0.beta4)
-
-Enhancements:
-
-* 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)
-
-Bug Fixes:
-
-* 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)
-
-### 4.0.0.beta3
-[Full Changelog](https://github.com/rspec/rspec-rails/compare/v4.0.0.beta2...v4.0.0.beta3)
+### 4.0.0 / 2020-03-24
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v3.9.1...v4.0.0)
 
 Enhancements:
 
+* Adds support for Rails 6. (Penelope Phippen, Benoit Tigeot, Jon Rowe, #2071)
 * Adds support for JRuby on Rails 5.2 and 6
 * Add support for parameterised mailers (Ignatius Reza, #2125)
 * Add ActionMailbox spec helpers and test type (James Dabbs, #2119)
@@ -55,28 +14,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)
-
-Bug Fixes:
-
-* Replace `before_teardown` as well as `after_teardown` to ensure screenshots
-  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)
-
-### 4.0.0.beta2
-[Full Changelog](https://github.com/rspec/rspec-rails/compare/v4.0.0.beta1...v4.0.0.beta2)
-
-Bug Fixes:
-
-* Fix version dependencies in gemspec.
-
-### 4.0.0.beta1
-[Full Changelog](https://github.com/rspec/rspec-rails/compare/v3.9.0...v4.0.0.beta1)
-
-Enhancements:
-
-* Adds support for Rails 6. (Penelope Phippen, Benoit Tigeot, Jon Rowe, #2071)
+* 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:
 
@@ -86,12 +35,35 @@ Bug Fixes:
   deprecated. (Pavel Rosický, #2092)
 * `ActionView::Template#formats` has been deprecated and replaced by
   `ActionView::Template#format`(Seb Jacobs, #2100)
+* Replace `before_teardown` as well as `after_teardown` to ensure screenshots
+  are generated correctly. (Jon Rowe, #2164)
+* `ActionView::FixtureResolver#hash` has been renamed to `ActionView::FixtureResolver#data`.
+  (Penelope Phippen, #2076)
+* 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)
 

README.md

@@ -28,7 +28,7 @@ Use **[`rspec-rails` 1.x][]** for Rails 2.x.
    ```ruby
    # Run against the latest stable release
    group :development, :test do
-     gem 'rspec-rails', '~> 4.0'
+     gem 'rspec-rails', '~> 4.0.0'
    end
 
    # Or, run against the master branch