diff options
| author | Richard Schneeman <richard.schneeman+no-recruiters@gmail.com> | 2018-07-25 16:00:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-25 16:00:33 -0500 |
| commit | 91fd679710118482f718ea710710561f1cfb0b70 (patch) | |
| tree | 9169aa6ea2315b16f77e530dd2c6a4eda1816769 /actionview | |
| parent | ab8847c92092a57df6433f4fc72682074359531f (diff) | |
| parent | d108288c2f684233298f97f18ac00de0b016deaa (diff) | |
| download | rails-91fd679710118482f718ea710710561f1cfb0b70.tar.gz rails-91fd679710118482f718ea710710561f1cfb0b70.tar.bz2 rails-91fd679710118482f718ea710710561f1cfb0b70.zip | |
Merge pull request #32381 from q-centrix/update-codeclimate-configs
Turn on performance based cops
Diffstat (limited to 'actionview')
| -rw-r--r-- | actionview/test/template/form_helper/form_with_test.rb | 3 | ||||
| -rw-r--r-- | actionview/test/template/form_helper_test.rb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/actionview/test/template/form_helper/form_with_test.rb b/actionview/test/template/form_helper/form_with_test.rb index f07e494ee3..c30176349c 100644 --- a/actionview/test/template/form_helper/form_with_test.rb +++ b/actionview/test/template/form_helper/form_with_test.rb @@ -318,7 +318,8 @@ class FormWithActsLikeFormForTest < FormWithTest @url_for_options = object if object.is_a?(Hash) && object[:use_route].blank? && object[:controller].blank? - object.merge!(controller: "main", action: "index") + object[:controller] = "main" + object[:action] = "index" end super diff --git a/actionview/test/template/form_helper_test.rb b/actionview/test/template/form_helper_test.rb index 5244204e42..38bb1e1d24 100644 --- a/actionview/test/template/form_helper_test.rb +++ b/actionview/test/template/form_helper_test.rb @@ -168,7 +168,8 @@ class FormHelperTest < ActionView::TestCase @url_for_options = object if object.is_a?(Hash) && object[:use_route].blank? && object[:controller].blank? - object.merge!(controller: "main", action: "index") + object[:controller] = "main" + object[:action] = "index" end super |