diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-07-30 15:58:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-30 15:58:49 +0200 |
| commit | a78e591d1040544531cb436510134fd0daaaa10c (patch) | |
| tree | b87f07aa76ec66148dc39cd642ed2a3153f9d0da | |
| parent | 0e94a1d3380b50f01b3217bbc5a5edc154ebfc4c (diff) | |
| parent | 65a1733545cee9d426abdb57736e2565a7776ba8 (diff) | |
| download | rails-a78e591d1040544531cb436510134fd0daaaa10c.tar.gz rails-a78e591d1040544531cb436510134fd0daaaa10c.tar.bz2 rails-a78e591d1040544531cb436510134fd0daaaa10c.zip | |
Merge pull request #29963 from y-yagi/fix_ruby_warnings
Fix `warning: method redefined;`
| -rw-r--r-- | railties/test/application/routing_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb index 6742da20cc..bc7580d6f4 100644 --- a/railties/test/application/routing_test.rb +++ b/railties/test/application/routing_test.rb @@ -293,7 +293,7 @@ module ApplicationTests extend ActiveModel::Naming include ActiveModel::Conversion - def model_name + def self.model_name @_model_name ||= ActiveModel::Name.new(self.class, nil, "User") end @@ -430,7 +430,7 @@ module ApplicationTests extend ActiveModel::Naming include ActiveModel::Conversion - def model_name + def self.model_name @_model_name ||= ActiveModel::Name.new(self.class, nil, "User") end @@ -542,7 +542,7 @@ module ApplicationTests extend ActiveModel::Naming include ActiveModel::Conversion - def model_name + def self.model_name @_model_name ||= ActiveModel::Name.new(self.class, nil, "User") end |