diff options
author | José Valim <jose.valim@gmail.com> | 2010-05-29 22:29:14 +0200 |
---|---|---|
committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-06-03 23:32:10 +1000 |
commit | 2740943634fe151fb3fb87e2af7881a93f5dd6b5 (patch) | |
tree | 4916366ccf706c49f7e2082a406a2a90471dff79 /actionpack/test | |
parent | 27939bd753b79c8205d1d3c1cdc7db6205642302 (diff) | |
download | rails-2740943634fe151fb3fb87e2af7881a93f5dd6b5.tar.gz rails-2740943634fe151fb3fb87e2af7881a93f5dd6b5.tar.bz2 rails-2740943634fe151fb3fb87e2af7881a93f5dd6b5.zip |
Remove the laziness from the middleware stack.
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/dispatch/middleware_stack_test.rb | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/actionpack/test/dispatch/middleware_stack_test.rb b/actionpack/test/dispatch/middleware_stack_test.rb index 7cf6365af3..170c5b8565 100644 --- a/actionpack/test/dispatch/middleware_stack_test.rb +++ b/actionpack/test/dispatch/middleware_stack_test.rb @@ -66,29 +66,14 @@ class MiddlewareStackTest < ActiveSupport::TestCase assert_equal BazMiddleware, @stack[0].klass end - test "active returns all only enabled middleware" do - assert_no_difference "@stack.active.size" do - assert_difference "@stack.size" do - @stack.use BazMiddleware, :if => lambda { false } - end - end - end - test "lazy evaluates middleware class" do assert_difference "@stack.size" do - @stack.use lambda { BazMiddleware } + @stack.use "MiddlewareStackTest::BazMiddleware" end assert_equal BazMiddleware, @stack.last.klass end - test "lazy evaluates middleware arguments" do - assert_difference "@stack.size" do - @stack.use BazMiddleware, lambda { :foo } - end - assert_equal [:foo], @stack.last.send(:build_args) - end - - test "lazy compares so unloaded constants can be loaded" do + test "lazy compares so unloaded constants are not loaded" do @stack.use "UnknownMiddleware" @stack.use :"MiddlewareStackTest::BazMiddleware" assert @stack.include?("::MiddlewareStackTest::BazMiddleware") |