Merge commit 'mainstream/master'

1 files changed, 3 insertions, 3 deletions

diff --git a/railties/test/backtrace_cleaner_test.rb b/railties/test/backtrace_cleaner_test.rb
index 7a1b361440..c3e4f970fe 100644
--- a/railties/test/backtrace_cleaner_test.rb
+++ b/railties/test/backtrace_cleaner_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-require 'initializer'
+require 'rails/initializer'
 require 'rails/backtrace_cleaner'
 
 if defined? Test::Unit::Util::BacktraceFilter
@@ -14,13 +14,13 @@ if defined? Test::Unit::Util::BacktraceFilter
       @test = TestWithBacktrace.new
       @backtrace = [ './test/rails/benchmark_test.rb', './test/rails/dependencies.rb', '/opt/local/lib/ruby/kernel.rb' ]
     end
-    
+
     test "test with backtrace should use the rails backtrace cleaner to clean" do
       Rails.stubs(:backtrace_cleaner).returns(stub(:clean))
       Rails.backtrace_cleaner.expects(:clean).with(@backtrace, nil)
       @test.filter_backtrace(@backtrace)
     end
-    
+
     test "filter backtrace should have the same arity as Test::Unit::Util::BacktraceFilter" do
       assert_nothing_raised do
         @test.filter_backtrace(@backtrace, '/opt/local/lib')