diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-09-30 09:18:14 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-30 09:18:14 +0900 |
| commit | c97a5ad56892c5a19848b9e3803da1d16c131d86 (patch) | |
| tree | 2ec3095cbb78323c2a928ed83e2df8ed8800b4c3 /railties | |
| parent | 325c06fbc499aa4da1ce50d9b85dbf5c6ed3321e (diff) | |
| parent | 8154c34805cdac7021b779742ea1c6f0fb560dfa (diff) | |
| download | rails-c97a5ad56892c5a19848b9e3803da1d16c131d86.tar.gz rails-c97a5ad56892c5a19848b9e3803da1d16c131d86.tar.bz2 rails-c97a5ad56892c5a19848b9e3803da1d16c131d86.zip | |
Merge pull request #30755 from y-yagi/fix_method_refined_warning
Fix "warning: method redefined; discarding old test_scaffold_plural_names"
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/test/generators/named_base_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/generators/named_base_test.rb b/railties/test/generators/named_base_test.rb index 64e9909859..967754c813 100644 --- a/railties/test/generators/named_base_test.rb +++ b/railties/test/generators/named_base_test.rb @@ -59,7 +59,7 @@ class NamedBaseTest < Rails::Generators::TestCase ActiveRecord::Base.pluralize_table_names = original_pluralize_table_names end - def test_scaffold_plural_names + def test_namespaced_scaffold_plural_names g = generator ["admin/foo"] assert_name g, "admin/foos", :controller_name assert_name g, %w(admin), :controller_class_path @@ -69,7 +69,7 @@ class NamedBaseTest < Rails::Generators::TestCase assert_name g, "admin.foos", :controller_i18n_scope end - def test_scaffold_plural_names_as_ruby + def test_namespaced_scaffold_plural_names_as_ruby g = generator ["Admin::Foo"] assert_name g, "Admin::Foos", :controller_name assert_name g, %w(admin), :controller_class_path |