Skip to content

Commit

Permalink
Remove run_initializers from class methods.
Browse files Browse the repository at this point in the history
  • Loading branch information
josevalim committed Jun 24, 2010
1 parent 5eb3b4d commit e061a12
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 33 deletions.
8 changes: 0 additions & 8 deletions railties/lib/rails/initializable.rb
Expand Up @@ -79,14 +79,6 @@ def initializer(name, opts = {}, &blk)
opts[:after] ||= initializers.last.name unless initializers.empty? || initializers.find { |i| i.name == opts[:before] }
initializers << Initializer.new(name, nil, opts, &blk)
end

def run_initializers(*args)
return if @ran
initializers_chain.tsort.each do |initializer|
instance_exec(*args, &initializer.block)
end
@ran = true
end
end
end
end
39 changes: 14 additions & 25 deletions railties/test/initializable_test.rb
Expand Up @@ -5,10 +5,7 @@ module InitializableTests

class Foo
include Rails::Initializable

class << self
attr_accessor :foo, :bar
end
attr_accessor :foo, :bar

initializer :start do
@foo ||= 0
Expand Down Expand Up @@ -158,30 +155,22 @@ class Basic < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation

test "initializers run" do
Foo.run_initializers
assert_equal 1, Foo.foo
foo = Foo.new
foo.run_initializers
assert_equal 1, foo.foo
end

test "initializers are inherited" do
Bar.run_initializers
assert_equal [1, 1], [Bar.foo, Bar.bar]
bar = Bar.new
bar.run_initializers
assert_equal [1, 1], [bar.foo, bar.bar]
end

test "initializers only get run once" do
Foo.run_initializers
Foo.run_initializers
assert_equal 1, Foo.foo
end

test "running initializers on children does not effect the parent" do
Bar.run_initializers
assert_nil Foo.foo
assert_nil Foo.bar
end

test "initializing with modules" do
Word.run_initializers
assert_equal "bird", $word
foo = Foo.new
foo.run_initializers
foo.run_initializers
assert_equal 1, foo.foo
end

test "creating initializer without a block raises an error" do
Expand All @@ -198,19 +187,19 @@ class Basic < ActiveSupport::TestCase
class BeforeAfter < ActiveSupport::TestCase
test "running on parent" do
$arr = []
Parent.run_initializers
Parent.new.run_initializers
assert_equal [5, 1, 2], $arr
end

test "running on child" do
$arr = []
Child.run_initializers
Child.new.run_initializers
assert_equal [5, 3, 1, 4, 2], $arr
end

test "handles dependencies introduced before all initializers are loaded" do
$arr = []
Interdependent::Application.run_initializers
Interdependent::Application.new.run_initializers
assert_equal [1, 2, 3, 4], $arr
end
end
Expand Down

0 comments on commit e061a12

Please sign in to comment.