Tests pass again

2 files changed, 4 insertions, 4 deletions

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 943c939757..26a55a73e1 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -41,13 +41,13 @@ module Rails
       end
 
       def new
-        initializers.run
+        run_initializers
         self
       end
     end
 
     initializer :initialize_rails do
-      Rails.initializers.run
+      Rails.run_initializers
     end
 
     # Set the <tt>$LOAD_PATH</tt> based on the value of
diff --git a/railties/lib/rails/initializable.rb b/railties/lib/rails/initializable.rb
index affa29239f..c491d5e012 100644
--- a/railties/lib/rails/initializable.rb
+++ b/railties/lib/rails/initializable.rb
@@ -15,7 +15,7 @@ module Rails
     class Collection < Array
       def initialize(klasses)
         klasses.each do |klass|
-          klass.added_initializers.each do |initializer|
+          (klass.added_initializers || []).each do |initializer|
             index = if initializer.before
               index_for(initializer.before)
             elsif initializer.after
@@ -44,7 +44,7 @@ module Rails
     #
     # The #initializers method is set up to return the right list of
     # initializers for the context in question.
-    def initialize!
+    def run_initializers
       return if @_initialized
 
       initializers.each {|initializer| instance_eval(&initializer.block) }