Merge branch 'master' of git://github.com/rails/rails

Conflicts:
	actionmailer/lib/action_mailer/mail_helper.rb
	railties/lib/rails/configuration.rb

1 files changed, 11 insertions, 17 deletions

diff --git a/railties/test/initializable_test.rb b/railties/test/initializable_test.rb
index e308cbcb0e..0c7378cb64 100644
--- a/railties/test/initializable_test.rb
+++ b/railties/test/initializable_test.rb
@@ -10,14 +10,14 @@ module InitializableTests
       attr_accessor :foo, :bar
     end
 
-    initializer :omg, :global => true do
+    initializer :omg do
       @foo ||= 0
       @foo += 1
     end
   end
 
   class Bar < Foo
-    initializer :bar, :global => true do
+    initializer :bar do
       @bar ||= 0
       @bar += 1
     end
@@ -26,7 +26,7 @@ module InitializableTests
   module Word
     include Rails::Initializable
 
-    initializer :word, :global => true do
+    initializer :word do
       $word = "bird"
     end
   end
@@ -34,11 +34,11 @@ module InitializableTests
   class Parent
     include Rails::Initializable
 
-    initializer :one, :global => true do
+    initializer :one do
       $arr << 1
     end
 
-    initializer :two, :global => true do
+    initializer :two do
       $arr << 2
     end
   end
@@ -46,17 +46,17 @@ module InitializableTests
   class Child < Parent
     include Rails::Initializable
 
-    initializer :three, :before => :one, :global => true do
+    initializer :three, :before => :one do
       $arr << 3
     end
 
-    initializer :four, :after => :one, :global => true do
+    initializer :four, :after => :one do
       $arr << 4
     end
   end
 
   class Parent
-    initializer :five, :before => :one, :global => true do
+    initializer :five, :before => :one do
       $arr << 5
     end
   end
@@ -72,11 +72,11 @@ module InitializableTests
       $arr << 2
     end
 
-    initializer :three, :global => true do
+    initializer :three do
       $arr << 3
     end
 
-    initializer :four, :global => true do
+    initializer :four do
       $arr << 4
     end
   end
@@ -181,13 +181,7 @@ module InitializableTests
       $arr = []
       instance = Instance.new
       instance.run_initializers
-      assert_equal [1, 2], $arr
-    end
-
-    test "running globals" do
-      $arr = []
-      Instance.run_initializers
-      assert_equal [3, 4], $arr
+      assert_equal [1, 2, 3, 4], $arr
     end
   end