aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-11-05 14:45:53 -0800
committerYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-11-05 14:45:53 -0800
commit43694269934540de2a73130d7ff47bd1a25ed3e4 (patch)
treec1f0cdeb90bdccd217c88c645a2ebd78c4d0e772 /railties/test
parent897164ddb70ed6f51b026e5c91f2bf3f7aa46ba6 (diff)
downloadrails-43694269934540de2a73130d7ff47bd1a25ed3e4.tar.gz
rails-43694269934540de2a73130d7ff47bd1a25ed3e4.tar.bz2
rails-43694269934540de2a73130d7ff47bd1a25ed3e4.zip
Add the ability to merge initializers from various objects in order.
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/initializable_test.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/railties/test/initializable_test.rb b/railties/test/initializable_test.rb
index 463fdc03c0..2920883132 100644
--- a/railties/test/initializable_test.rb
+++ b/railties/test/initializable_test.rb
@@ -94,7 +94,11 @@ module InitializableTests
include Rails::Initializable
initializer :startup, :before => :last do
- $arr << 2
+ $arr << two
+ end
+
+ def two
+ 2
end
end
@@ -109,7 +113,7 @@ module InitializableTests
end
def self.initializers
- super + MoreInitializers.initializers
+ super + MoreInitializers.new.initializers
end
end