aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/new_render_test.rb2
-rw-r--r--actionpack/test/template/scriptaculous_helper_test.rb9
2 files changed, 1 insertions, 10 deletions
diff --git a/actionpack/test/controller/new_render_test.rb b/actionpack/test/controller/new_render_test.rb
index cb42142611..0208912ece 100644
--- a/actionpack/test/controller/new_render_test.rb
+++ b/actionpack/test/controller/new_render_test.rb
@@ -490,7 +490,7 @@ class NewRenderTest < Test::Unit::TestCase
def test_update_page
get :update_page
assert_template nil
- assert_equal 'text/javascript', @response.headers['Content-type']
+ assert_equal 'text/javascript', @response.headers['Content-Type']
assert_equal 2, @response.body.split($/).length
end
diff --git a/actionpack/test/template/scriptaculous_helper_test.rb b/actionpack/test/template/scriptaculous_helper_test.rb
index b42d8f7f04..779b5aa13b 100644
--- a/actionpack/test/template/scriptaculous_helper_test.rb
+++ b/actionpack/test/template/scriptaculous_helper_test.rb
@@ -40,15 +40,6 @@ class ScriptaculousHelperTest < Test::Unit::TestCase
end
- def test_parallel_effects
- actual = parallel_effects(:duration => 2) do
- visual_effect(:highlight, "posts") +
- visual_effect(:fade, "fademe", :duration => 4.0)
- end
-
- assert_equal "new Effect.Parallel([new Effect.Highlight('posts',{});new Effect.Fade('fademe',{duration:4.0});], {duration:2})", actual
- end
-
def test_sortable_element
assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nSortable.create('mylist', {onUpdate:function(){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize('mylist')})}})\n//]]>\n</script>),
sortable_element("mylist", :url => { :action => "order" })