diff options
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/controller/capture_test.rb | 20 | ||||
-rw-r--r-- | actionpack/test/fixtures/test/block_content_for.erb | 2 | ||||
-rw-r--r-- | actionpack/test/fixtures/test/erb_content_for.erb | 2 |
3 files changed, 1 insertions, 23 deletions
diff --git a/actionpack/test/controller/capture_test.rb b/actionpack/test/controller/capture_test.rb index aaafea3920..2604844b84 100644 --- a/actionpack/test/controller/capture_test.rb +++ b/actionpack/test/controller/capture_test.rb @@ -11,16 +11,8 @@ class CaptureController < ActionController::Base def content_for_with_parameter render :layout => "talk_from_action" end - - def content_for_concatenated - render :layout => "talk_from_action" - end - def erb_content_for - render :layout => "talk_from_action" - end - - def block_content_for + def content_for_concatenated render :layout => "talk_from_action" end @@ -62,21 +54,11 @@ class CaptureTest < Test::Unit::TestCase assert_equal expected_content_for_output, @response.body end - def test_erb_content_for - get :erb_content_for - assert_equal expected_content_for_output, @response.body - end - def test_should_set_content_for_with_parameter get :content_for_with_parameter assert_equal expected_content_for_output, @response.body end - def test_block_content_for - get :block_content_for - assert_equal expected_content_for_output, @response.body - end - def test_non_erb_block_content_for get :non_erb_block_content_for assert_equal expected_content_for_output, @response.body diff --git a/actionpack/test/fixtures/test/block_content_for.erb b/actionpack/test/fixtures/test/block_content_for.erb deleted file mode 100644 index 9510337365..0000000000 --- a/actionpack/test/fixtures/test/block_content_for.erb +++ /dev/null @@ -1,2 +0,0 @@ -<% block_content_for :title do 'Putting stuff in the title!' end %> -Great stuff!
\ No newline at end of file diff --git a/actionpack/test/fixtures/test/erb_content_for.erb b/actionpack/test/fixtures/test/erb_content_for.erb deleted file mode 100644 index c3bdd13643..0000000000 --- a/actionpack/test/fixtures/test/erb_content_for.erb +++ /dev/null @@ -1,2 +0,0 @@ -<% erb_content_for :title do %>Putting stuff in the title!<% end %> -Great stuff!
\ No newline at end of file |