4 files changed, 45 insertions, 44 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index 12e781b6c3..eec4040bcc 100644
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -25,7 +25,6 @@ actionpack_path = "#{File.dirname(__FILE__)}/../../actionpack/lib"
 $:.unshift(actionpack_path) if File.directory?(actionpack_path)
 require 'action_controller'
 require 'action_view'
-require 'active_support/autoload'
 
 module ActionMailer
   extend ::ActiveSupport::Autoload
diff --git a/actionpack/lib/action_dispatch/testing/performance_test.rb b/actionpack/lib/action_dispatch/testing/performance_test.rb
index b1ed9d31f4..1b9a6c18b7 100644
--- a/actionpack/lib/action_dispatch/testing/performance_test.rb
+++ b/actionpack/lib/action_dispatch/testing/performance_test.rb
@@ -1,15 +1,17 @@
 require 'active_support/testing/performance'
 require 'active_support/testing/default'
 
-module ActionDispatch
-  # An integration test that runs a code profiler on your test methods.
-  # Profiling output for combinations of each test method, measurement, and
-  # output format are written to your tmp/performance directory.
-  #
-  # By default, process_time is measured and both flat and graph_html output
-  # formats are written, so you'll have two output files per test method.
-  class PerformanceTest < ActionDispatch::IntegrationTest
-    include ActiveSupport::Testing::Performance
-    include ActiveSupport::Testing::Default
+if defined?(ActiveSupport::Testing::Performance)
+  module ActionDispatch
+    # An integration test that runs a code profiler on your test methods.
+    # Profiling output for combinations of each test method, measurement, and
+    # output format are written to your tmp/performance directory.
+    #
+    # By default, process_time is measured and both flat and graph_html output
+    # formats are written, so you'll have two output files per test method.
+    class PerformanceTest < ActionDispatch::IntegrationTest
+      include ActiveSupport::Testing::Performance
+      include ActiveSupport::Testing::Default
+    end
   end
-end
+end
+\ No newline at end of file
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index 0478ae4ebc..9e21b3faf3 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -34,7 +34,38 @@ module ActiveSupport
   end
 end
 
-require 'active_support/autoload'
+require "active_support/dependencies/autoload"
+
+module ActiveSupport
+  extend ActiveSupport::Autoload
+
+  autoload :BacktraceCleaner
+  autoload :Base64
+  autoload :BasicObject
+  autoload :Benchmarkable
+  autoload :BufferedLogger
+  autoload :Cache
+  autoload :Callbacks
+  autoload :Concern
+  autoload :Configurable
+  autoload :DeprecatedCallbacks
+  autoload :Deprecation
+  autoload :Gzip
+  autoload :Inflector
+  autoload :Memoizable
+  autoload :MessageEncryptor
+  autoload :MessageVerifier
+  autoload :Multibyte
+  autoload :OptionMerger
+  autoload :OrderedHash
+  autoload :OrderedOptions
+  autoload :Notifications
+  autoload :Rescuable
+  autoload :SecureRandom
+  autoload :StringInquirer
+  autoload :XmlMini
+end
+
 require 'active_support/vendor'
 
 require 'i18n'
diff --git a/activesupport/lib/active_support/autoload.rb b/activesupport/lib/active_support/autoload.rb
deleted file mode 100644
index e57cf24b25..0000000000
--- a/activesupport/lib/active_support/autoload.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require "active_support/dependencies/autoload"
-
-module ActiveSupport
-  extend ActiveSupport::Autoload
-
-  autoload :BacktraceCleaner
-  autoload :Base64
-  autoload :BasicObject
-  autoload :Benchmarkable
-  autoload :BufferedLogger
-  autoload :Cache
-  autoload :Callbacks
-  autoload :Concern
-  autoload :Configurable
-  autoload :DeprecatedCallbacks
-  autoload :Deprecation
-  autoload :Gzip
-  autoload :Inflector
-  autoload :Memoizable
-  autoload :MessageEncryptor
-  autoload :MessageVerifier
-  autoload :Multibyte
-  autoload :OptionMerger
-  autoload :OrderedHash
-  autoload :OrderedOptions
-  autoload :Notifications
-  autoload :Rescuable
-  autoload :SecureRandom
-  autoload :StringInquirer
-  autoload :XmlMini
-end