Merge pull request #14174 from kuldeepaggarwal/fix-resource_generator_test

fix test cases

railties/lib/rails/generators/model_helpers.rb

@@ -3,7 +3,7 @@
 module Rails
   module Generators
     module ModelHelpers # :nodoc:
-      PLURAL_MODEL_NAME_WARN_MESSAGE = "The model name '%s' was recognized as a plural, using the singular '%s'. " \
+      PLURAL_MODEL_NAME_WARN_MESSAGE = "[WARNING] The model name '%s' was recognized as a plural, using the singular '%s' instead. " \
                                        "Override with --force-plural or setup custom inflection rules for this noun before running the generator."
       mattr_accessor :skip_warn
 

railties/test/generators/model_generator_test.rb

@@ -38,7 +38,7 @@ def test_plural_names_are_singularized
     content = run_generator ["accounts".freeze]
     assert_file "app/models/account.rb", /class Account < ActiveRecord::Base/
     assert_file "test/models/account_test.rb", /class AccountTest/
-    assert_match(/The model name 'accounts' was recognized as a plural, using the singular 'account'\. Override with --force-plural or setup custom inflection rules for this noun before running the generator\./, content)
+    assert_match(/\[WARNING\] The model name 'accounts' was recognized as a plural, using the singular 'account' instead\. Override with --force-plural or setup custom inflection rules for this noun before running the generator\./, content)
   end
 
   def test_model_with_underscored_parent_option

railties/test/generators/resource_generator_test.rb

@@ -63,19 +63,19 @@ def test_plural_names_are_singularized
     content = run_generator ["accounts".freeze]
     assert_file "app/models/account.rb", /class Account < ActiveRecord::Base/
     assert_file "test/models/account_test.rb", /class AccountTest/
-    assert_match(/The model name 'accounts' was recognized as a plural, using the singular 'account'\. Override with --force-plural or setup custom inflection rules for this noun before running the generator\./, content)
+    assert_match(/\[WARNING\] The model name 'accounts' was recognized as a plural, using the singular 'account' instead\. Override with --force-plural or setup custom inflection rules for this noun before running the generator\./, content)
   end
 
   def test_plural_names_can_be_forced
     content = run_generator ["accounts", "--force-plural"]
     assert_file "app/models/accounts.rb", /class Accounts < ActiveRecord::Base/
     assert_file "test/models/accounts_test.rb", /class AccountsTest/
-    assert_no_match(/Plural version of the model detected/, content)
+    assert_no_match(/\[WARNING\]/, content)
   end
 
   def test_mass_nouns_do_not_throw_warnings
     content = run_generator ["sheep".freeze]
-    assert_no_match(/Plural version of the model detected/, content)
+    assert_no_match(/\[WARNING\]/, content)
   end
 
   def test_route_is_removed_on_revoke