From 0983e8efff3e6878ba7fbf30a692723a8f3a8222 Mon Sep 17 00:00:00 2001 From: Pedro Paiva Date: Thu, 3 Jun 2021 19:29:55 -0300 Subject: [PATCH 1/2] Bring CHANGELOG up to date --- CHANGELOG.md | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e5b82fd9..c98335592 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,45 @@ # Changelog +## Unreleased + +### Bug fixes + +* Replace in?, method from ActiveSupport, with include? to prevent exception "undefined method `in?`" on non-Rails app. ([#1405]) + +[#1405]: https://github.com/thoughtbot/shoulda-matchers/pull/1405 + +### Features + +* Add support for Rails 6.1. No new Rails 6.1 features are supported, but only + existing features that broke with the upgrade.([#1418]) + +* Add support for RVM (Ruby Version Manager) to setting up local environment. ([#1424]) + +* Add support for alias in matcher define_enum. ([#1419]) + +* Add support for Ruby 3.0. ([#1406], [#1427]) + +[#1406]: https://github.com/thoughtbot/shoulda-matchers/pull/1406 +[#1418]: https://github.com/thoughtbot/shoulda-matchers/pull/1418 +[#1419]: https://github.com/thoughtbot/shoulda-matchers/pull/1419 +[#1424]: https://github.com/thoughtbot/shoulda-matchers/pull/1424 +[#1427]: https://github.com/thoughtbot/shoulda-matchers/pull/1427 + +### Backward-incompatible changes + +* Drop support for Rails 4.2, 5.0 and 5.1 as well as Ruby 2.4 and 2.5 + they've been end-of-lifed. The gem now supports Ruby 2.6+ and Rails 5.2+.([#1412], [#1415], [#1422], [#1428],[#1429]) + +* Remove deprecated matchers: `use_before_filter`, `use_after_filter`, `use_around_filter` and `allow_mass_assignment_of`. ([#1430], [#1431]) + +[#1412]: https://github.com/thoughtbot/shoulda-matchers/pull/1412 +[#1415]: https://github.com/thoughtbot/shoulda-matchers/pull/1415 +[#1422]: https://github.com/thoughtbot/shoulda-matchers/pull/1422 +[#1428]: https://github.com/thoughtbot/shoulda-matchers/pull/1428 +[#1429]: https://github.com/thoughtbot/shoulda-matchers/pull/1429 +[#1430]: https://github.com/thoughtbot/shoulda-matchers/pull/1430 +[#1431]: https://github.com/thoughtbot/shoulda-matchers/pull/1431 + ## 4.5.1 - 2021-01-15 ### Bug fixes From 0f354d2563b788d6602c4338831155a3e59e1a86 Mon Sep 17 00:00:00 2001 From: Pedro Paiva Date: Thu, 3 Jun 2021 21:32:18 -0300 Subject: [PATCH 2/2] Update CHANGELOG --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c98335592..50646d66a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,14 +4,14 @@ ### Bug fixes -* Replace in?, method from ActiveSupport, with include? to prevent exception "undefined method `in?`" on non-Rails app. ([#1405]) +* Replace `in?`, method from ActiveSupport, with `include?` to prevent exception "undefined method `in?`" on non-Rails app. ([#1405]) [#1405]: https://github.com/thoughtbot/shoulda-matchers/pull/1405 ### Features * Add support for Rails 6.1. No new Rails 6.1 features are supported, but only - existing features that broke with the upgrade.([#1418]) + existing features that broke with the upgrade. ([#1418]) * Add support for RVM (Ruby Version Manager) to setting up local environment. ([#1424]) @@ -28,7 +28,7 @@ ### Backward-incompatible changes * Drop support for Rails 4.2, 5.0 and 5.1 as well as Ruby 2.4 and 2.5 - they've been end-of-lifed. The gem now supports Ruby 2.6+ and Rails 5.2+.([#1412], [#1415], [#1422], [#1428],[#1429]) + they've been end-of-lifed. The gem now supports Ruby 2.6+ and Rails 5.2+.([#1412], [#1415], [#1422], [#1428], [#1429]) * Remove deprecated matchers: `use_before_filter`, `use_after_filter`, `use_around_filter` and `allow_mass_assignment_of`. ([#1430], [#1431])