aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/capture_test.rb17
-rw-r--r--actionpack/test/template/deprecated_helper_test.rb36
-rw-r--r--actionpack/test/template/form_tag_helper_test.rb29
3 files changed, 3 insertions, 79 deletions
diff --git a/actionpack/test/controller/capture_test.rb b/actionpack/test/controller/capture_test.rb
index 300bdc3a84..42ec2568da 100644
--- a/actionpack/test/controller/capture_test.rb
+++ b/actionpack/test/controller/capture_test.rb
@@ -64,19 +64,8 @@ class CaptureTest < Test::Unit::TestCase
assert_equal expected_content_for_output, @response.body
end
- def test_update_element_with_capture
- assert_deprecated 'update_element_function' do
- get :update_element_with_capture
- end
- assert_equal(
- "<script type=\"text/javascript\">\n//<![CDATA[\n$('products').innerHTML = '\\n <p>Product 1</p>\\n <p>Product 2</p>\\n';\n\n//]]>\n</script>" +
- "\n\n$('status').innerHTML = '\\n <b>You bought something!</b>\\n';",
- @response.body.strip
- )
- end
-
private
- def expected_content_for_output
- "<title>Putting stuff in the title!</title>\n\nGreat stuff!"
- end
+ def expected_content_for_output
+ "<title>Putting stuff in the title!</title>\n\nGreat stuff!"
+ end
end
diff --git a/actionpack/test/template/deprecated_helper_test.rb b/actionpack/test/template/deprecated_helper_test.rb
deleted file mode 100644
index 1d4f7624f7..0000000000
--- a/actionpack/test/template/deprecated_helper_test.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require "#{File.dirname(__FILE__)}/../abstract_unit"
-
-class DeprecatedHelperTest < Test::Unit::TestCase
- include ActionView::Helpers::JavaScriptHelper
- include ActionView::Helpers::CaptureHelper
-
- def test_update_element_function
- assert_deprecated 'update_element_function' do
-
- assert_equal %($('myelement').innerHTML = 'blub';\n),
- update_element_function('myelement', :content => 'blub')
- assert_equal %($('myelement').innerHTML = 'blub';\n),
- update_element_function('myelement', :action => :update, :content => 'blub')
- assert_equal %($('myelement').innerHTML = '';\n),
- update_element_function('myelement', :action => :empty)
- assert_equal %(Element.remove('myelement');\n),
- update_element_function('myelement', :action => :remove)
-
- assert_equal %(new Insertion.Bottom('myelement','blub');\n),
- update_element_function('myelement', :position => 'bottom', :content => 'blub')
- assert_equal %(new Insertion.Bottom('myelement','blub');\n),
- update_element_function('myelement', :action => :update, :position => :bottom, :content => 'blub')
-
- _erbout = ""
- assert_equal %($('myelement').innerHTML = 'test';\n),
- update_element_function('myelement') { _erbout << "test" }
-
- _erbout = ""
- assert_equal %($('myelement').innerHTML = 'blockstuff';\n),
- update_element_function('myelement', :content => 'paramstuff') { _erbout << "blockstuff" }
-
- end
- end
-
-end
-
diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb
index b7db62993a..7750f41bd1 100644
--- a/actionpack/test/template/form_tag_helper_test.rb
+++ b/actionpack/test/template/form_tag_helper_test.rb
@@ -147,32 +147,3 @@ class FormTagHelperTest < Test::Unit::TestCase
assert_equal 1, 1
end
end
-
-class DeprecatedFormTagHelperTest < Test::Unit::TestCase
- include ActionView::Helpers::UrlHelper
- include ActionView::Helpers::TagHelper
- include ActionView::Helpers::FormTagHelper
- include ActionView::Helpers::TextHelper
- include ActionView::Helpers::CaptureHelper
-
- def setup
- @controller = Class.new do
- def url_for(options, *parameters_for_method_reference)
- "http://www.example.com"
- end
- end
- @controller = @controller.new
- end
-
- def test_start_form_tag_deprecation
- assert_deprecated /start_form_tag/ do
- start_form_tag
- end
- end
-
- def test_end_form_tag_deprecation
- assert_deprecated /end_form_tag/ do
- end_form_tag
- end
- end
-end