diff --git a/guides/source/7_2_release_notes.md b/guides/source/7_2_release_notes.md index 7f191e76e9..75e092c8ad 100644 --- a/guides/source/7_2_release_notes.md +++ b/guides/source/7_2_release_notes.md @@ -28,6 +28,8 @@ Please refer to the [Changelog][railties] for detailed changes. ### Removals +* Remove deprecated `Rails::Generators::Testing::Behaviour`. + * Remove deprecated `Rails.application.secrets`. * Remove deprecated `Rails.config.enable_dependency_loading`. diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 2521aca918..bdd577548a 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,7 @@ +* Remove deprecated `Rails::Generators::Testing::Behaviour`. + + *Rafael Mendonça França* + * Remove deprecated `find_cmd_and_exec` console helper. *Rafael Mendonça França* diff --git a/railties/lib/rails/generators/testing/behavior.rb b/railties/lib/rails/generators/testing/behavior.rb index 53b48ba62c..8a66dca301 100644 --- a/railties/lib/rails/generators/testing/behavior.rb +++ b/railties/lib/rails/generators/testing/behavior.rb @@ -111,9 +111,6 @@ def migration_file_name(relative) Dir.glob("#{dirname}/[0-9]*_*.rb").grep(/\d+_#{file_name}.rb$/).first end end - - include ActiveSupport::Deprecation::DeprecatedConstantAccessor - deprecate_constant "Behaviour", "Rails::Generators::Testing::Behavior", deprecator: Rails.deprecator end end end diff --git a/railties/test/generators_test.rb b/railties/test/generators_test.rb index 66aa0fdcea..a9fdd7116e 100644 --- a/railties/test/generators_test.rb +++ b/railties/test/generators_test.rb @@ -253,10 +253,4 @@ def test_hide_namespace Rails::Generators.hide_namespace("special:namespace") assert_includes Rails::Generators.hidden_namespaces, "special:namespace" end - - def test_behaviour_aliases_behavior - assert_deprecated(Rails.deprecator) do - assert_same Rails::Generators::Testing::Behavior, Rails::Generators::Testing::Behaviour - end - end end