mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Should fix a few Sam Ruby fails.
This commit is contained in:
parent
c1304098cc
commit
96e0638ce2
4 changed files with 45 additions and 44 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
|
@ -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'
|
||||
|
|
|
@ -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
|
Loading…
Reference in a new issue