aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2012-08-02 18:44:25 +0200
committerXavier Noria <fxn@hashref.com>2012-08-02 21:59:22 +0200
commit5ea6b0df9a36d033f21b52049426257a4637028d (patch)
tree88208a852071af044c898660e82c3eff2ef3be8b /actionpack/test/controller
parent8f58d6e5074a623bed752d5ba38513305f03fae9 (diff)
downloadrails-5ea6b0df9a36d033f21b52049426257a4637028d.tar.gz
rails-5ea6b0df9a36d033f21b52049426257a4637028d.tar.bz2
rails-5ea6b0df9a36d033f21b52049426257a4637028d.zip
load active_support/core_ext/object/inclusion in active_support/rails
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/mime_responds_test.rb1
-rw-r--r--actionpack/test/controller/resources_test.rb1
2 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index c8e036b116..d093e31b3d 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -1,7 +1,6 @@
require 'abstract_unit'
require 'controller/fake_models'
require 'active_support/core_ext/hash/conversions'
-require 'active_support/core_ext/object/inclusion'
class StarStarMimeController < ActionController::Base
layout nil
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
index de1bff17eb..c7c367f18a 100644
--- a/actionpack/test/controller/resources_test.rb
+++ b/actionpack/test/controller/resources_test.rb
@@ -1,7 +1,6 @@
require 'abstract_unit'
require 'active_support/core_ext/object/try'
require 'active_support/core_ext/object/with_options'
-require 'active_support/core_ext/object/inclusion'
class ResourcesController < ActionController::Base
def index() render :nothing => true end