diff options
author | Dmitry Polushkin <dmitry.polushkin@gmail.com> | 2011-10-05 17:35:59 +0100 |
---|---|---|
committer | Dmitry Polushkin <dmitry.polushkin@gmail.com> | 2011-10-05 17:35:59 +0100 |
commit | 84eece0a823e9c601ea99a8709f24605a19bcbfd (patch) | |
tree | 12ac66c6404f35faddd06617987ad6db76b11406 /railties/test/initializable_test.rb | |
parent | 19965402b2f868c79d78269ca17cb6282f271382 (diff) | |
parent | c495bfc127405f7ead0d1c275c4d75682a51e00e (diff) | |
download | rails-84eece0a823e9c601ea99a8709f24605a19bcbfd.tar.gz rails-84eece0a823e9c601ea99a8709f24605a19bcbfd.tar.bz2 rails-84eece0a823e9c601ea99a8709f24605a19bcbfd.zip |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/test/initializable_test.rb')
-rw-r--r-- | railties/test/initializable_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/initializable_test.rb b/railties/test/initializable_test.rb index 1dbcc249ab..c84c7f204c 100644 --- a/railties/test/initializable_test.rb +++ b/railties/test/initializable_test.rb @@ -209,7 +209,7 @@ module InitializableTests $arr = [] instance = Instance.new instance.run_initializers - assert_equal [1, 2, 3, 4], $arr + assert_equal [2, 3, 4], $arr end test "running locals with groups" do @@ -223,7 +223,7 @@ module InitializableTests class WithArgsTest < ActiveSupport::TestCase test "running initializers with args" do $with_arg = nil - WithArgs.new.run_initializers(nil, 'foo') + WithArgs.new.run_initializers(:default, 'foo') assert_equal 'foo', $with_arg end end |