Permalink
Browse files

move assert_template tests to their own test case [#4501 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
  • Loading branch information...
1 parent 849ab92 commit b3dcbedc67f49ef64f33570f3e24ac00a47c0181 @dchelimsky dchelimsky committed with josevalim Apr 29, 2010
Showing with 46 additions and 41 deletions.
  1. +46 −41 actionpack/test/controller/action_pack_assertions_test.rb
View
87 actionpack/test/controller/action_pack_assertions_test.rb
@@ -344,47 +344,6 @@ def test_flash_have_nots
end
end
- def test_assert_template_with_partial
- get :partial
- assert_template :partial => '_partial'
- end
-
- def test_assert_template_with_nil_passes_when_no_template_rendered
- get :nothing
- assert_template nil
- end
-
- def test_assert_template_with_nil_fails_when_template_rendered
- get :hello_world
- assert_raise(ActiveSupport::TestCase::Assertion) do
- assert_template nil
- end
- end
-
- def test_assert_template_passes_with_correct_string
- get :hello_world
- assert_template 'hello_world'
- assert_template 'test/hello_world'
- end
-
- def test_assert_template_passes_with_correct_symbol
- get :hello_world
- assert_template :hello_world
- end
-
- def test_assert_template_fails_with_incorrect_string
- get :hello_world
- assert_raise(ActiveSupport::TestCase::Assertion) do
- assert_template 'hello_planet'
- end
- end
-
- def test_assert_template_fails_with_incorrect_symbol
- get :hello_world
- assert_raise(ActiveSupport::TestCase::Assertion) do
- assert_template :hello_planet
- end
- end
# check if we were rendered by a file-based template?
def test_rendered_action
@@ -559,6 +518,52 @@ def test_assert_response_failure_response_with_no_exception
end
end
+class AssertTemplateTest < ActionController::TestCase
+ tests ActionPackAssertionsController
+
+ def test_with_partial
+ get :partial
+ assert_template :partial => '_partial'
+ end
+
+ def test_with_nil_passes_when_no_template_rendered
+ get :nothing
+ assert_template nil
+ end
+
+ def test_with_nil_fails_when_template_rendered
+ get :hello_world
+ assert_raise(ActiveSupport::TestCase::Assertion) do
+ assert_template nil
+ end
+ end
+
+ def test_passes_with_correct_string
+ get :hello_world
+ assert_template 'hello_world'
+ assert_template 'test/hello_world'
+ end
+
+ def test_passes_with_correct_symbol
+ get :hello_world
+ assert_template :hello_world
+ end
+
+ def test_fails_with_incorrect_string
+ get :hello_world
+ assert_raise(ActiveSupport::TestCase::Assertion) do
+ assert_template 'hello_planet'
+ end
+ end
+
+ def test_fails_with_incorrect_symbol
+ get :hello_world
+ assert_raise(ActiveSupport::TestCase::Assertion) do
+ assert_template :hello_planet
+ end
+ end
+end
+
class ActionPackHeaderTest < ActionController::TestCase
tests ActionPackAssertionsController

0 comments on commit b3dcbed

Please sign in to comment.