Fix deprecation message for `SOURCE_ANNOTATION_DIRECTORIES`

Also, added a test that a deprecated message will be output.

2 files changed, 4 insertions, 1 deletions

diff --git a/railties/lib/rails/commands/notes/notes_command.rb b/railties/lib/rails/commands/notes/notes_command.rb
index a0faaeff8f..64b339b3cd 100644
--- a/railties/lib/rails/commands/notes/notes_command.rb
+++ b/railties/lib/rails/commands/notes/notes_command.rb
@@ -28,7 +28,7 @@ module Rails
 
         def deprecation_warning
           return if source_annotation_directories.empty?
-          ActiveSupport::Deprecation.warn("`SOURCE_ANNOTATION_DIRECTORIES` will be deprecated in Rails 6.1. You can add default directories by using config.annotations.register_directories instead.")
+          ActiveSupport::Deprecation.warn("`SOURCE_ANNOTATION_DIRECTORIES` is deprecated and will be removed in Rails 6.1. You can add default directories by using config.annotations.register_directories instead.")
         end
 
         def source_annotation_directories
diff --git a/railties/test/application/rake/notes_test.rb b/railties/test/application/rake/notes_test.rb
index d73e5cdfa3..999155fa93 100644
--- a/railties/test/application/rake/notes_test.rb
+++ b/railties/test/application/rake/notes_test.rb
@@ -87,6 +87,9 @@ module ApplicationTests
 
           assert_equal 6, lines.size
           assert_equal [4], lines.map(&:size).uniq
+
+          log = File.read(Rails.application.config.paths["log"].first)
+          assert_match(/`SOURCE_ANNOTATION_DIRECTORIES` is deprecated/, log)
         end
       end