diff options
author | Sean Griffin <sean@seantheprogrammer.com> | 2015-01-31 21:16:33 -0700 |
---|---|---|
committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-01-31 21:16:33 -0700 |
commit | ad83233eee3a5beb48919a91b4c109ff8c145f6b (patch) | |
tree | 2aef8dd1b83a5729118fe829836207ff91fb3045 /actionview/test | |
parent | f6160cf0506fb49d4340f0e9b7bfe0430a9750d3 (diff) | |
parent | ce8efcf296479b506ff36695398f6c88ea3c9e72 (diff) | |
download | rails-ad83233eee3a5beb48919a91b4c109ff8c145f6b.tar.gz rails-ad83233eee3a5beb48919a91b4c109ff8c145f6b.tar.bz2 rails-ad83233eee3a5beb48919a91b4c109ff8c145f6b.zip |
Merge pull request #18767 from robertomiranda/ruby-2.2
Use public Module#include, in favor of https://bugs.ruby-lang.org/issues/8846
Diffstat (limited to 'actionview/test')
-rw-r--r-- | actionview/test/abstract_unit.rb | 2 | ||||
-rw-r--r-- | actionview/test/activerecord/controller_runtime_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionview/test/abstract_unit.rb b/actionview/test/abstract_unit.rb index 4aa56f60f7..fc1ca9efdf 100644 --- a/actionview/test/abstract_unit.rb +++ b/actionview/test/abstract_unit.rb @@ -268,7 +268,7 @@ class Rack::TestCase < ActionDispatch::IntegrationTest end end -ActionView::RoutingUrlFor.send(:include, ActionDispatch::Routing::UrlFor) +ActionView::RoutingUrlFor.include(ActionDispatch::Routing::UrlFor) module ActionController class Base diff --git a/actionview/test/activerecord/controller_runtime_test.rb b/actionview/test/activerecord/controller_runtime_test.rb index 469adff39a..af91348d76 100644 --- a/actionview/test/activerecord/controller_runtime_test.rb +++ b/actionview/test/activerecord/controller_runtime_test.rb @@ -4,7 +4,7 @@ require 'fixtures/project' require 'active_support/log_subscriber/test_helper' require 'action_controller/log_subscriber' -ActionController::Base.send :include, ActiveRecord::Railties::ControllerRuntime +ActionController::Base.include(ActiveRecord::Railties::ControllerRuntime) class ControllerRuntimeLogSubscriberTest < ActionController::TestCase class LogSubscriberController < ActionController::Base |