diff options
| author | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2017-07-27 07:29:38 +0900 |
|---|---|---|
| committer | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2017-07-28 12:18:14 +0900 |
| commit | 65a1733545cee9d426abdb57736e2565a7776ba8 (patch) | |
| tree | e026ef80195152b6a0902a56e26ed34f31ee0a98 /railties/test | |
| parent | 6f9b01c056cd2f3a4761baf78df207e1154f1b06 (diff) | |
| download | rails-65a1733545cee9d426abdb57736e2565a7776ba8.tar.gz rails-65a1733545cee9d426abdb57736e2565a7776ba8.tar.bz2 rails-65a1733545cee9d426abdb57736e2565a7776ba8.zip | |
Fix `warning: method redefined;`
This fixes the following warning:
```
/tmp/d20170727-7039-kmdtb1/app/app/models/user.rb:5: warning: method redefined; discarding old model_name
rails/activemodel/lib/active_model/naming.rb:222: warning: previous definition of model_name was here
```
Diffstat (limited to 'railties/test')
| -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 |