Changeset 9212

Timestamp:

04/02/08 12:48:59 (3 months ago)

Author:

pratik

Message:

Ensure RJS redirect_to doesn't html-escapes string argument. Closes #8546

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_view/helpers/prototype_helper.rb (modified) (1 diff)
• trunk/actionpack/test/controller/redirect_test.rb (modified) (2 diffs)
• trunk/actionpack/test/template/prototype_helper_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Ensure RJS redirect_to doesn't html-escapes string argument. Closes #8546 [josh, eventualbuddha, Pratik]
-
-* Support render :partial => collection of heterogeneous elements.  #11491 [Zach Dennis]

trunk/actionpack/lib/action_view/helpers/prototype_helper.rb

@@ -844 +844 @@
-          #  page.redirect_to(:controller => 'account', :action => 'signup')
-          def redirect_to(location)
-
+
+
-          end
-          

trunk/actionpack/test/controller/redirect_test.rb

@@ -64 +64 @@
-    @hello = "world"
-    redirect_to :action => "hello_world"
+  end
+
+  def redirect_to_url
+    redirect_to "http://www.rubyonrails.org/"
+  end
+
+  def redirect_to_url_with_unescaped_query_string
+    redirect_to "http://dev.rubyonrails.org/query?status=new"
-  end
-
@@ -194 +202 @@
-  end
-
+  def test_redirect_to_url
+    get :redirect_to_url
+    assert_response :redirect
+    assert_redirected_to "http://www.rubyonrails.org/"
+  end
+
+  def test_redirect_to_url_with_unescaped_query_string
+    get :redirect_to_url_with_unescaped_query_string
+    assert_response :redirect
+    assert_redirected_to "http://dev.rubyonrails.org/query?status=new"
+  end
+
-  def test_redirect_to_back
-    @request.env["HTTP_REFERER"] = "http://www.example.com/coming/from"

trunk/actionpack/test/template/prototype_helper_test.rb

@@ -359 +359 @@
-    assert_equal 'window.location.href = "http://www.example.com/welcome";',
-      @generator.redirect_to(:action => 'welcome')
+    assert_equal 'window.location.href = "http://www.example.com/welcome?a=b&c=d";',
+      @generator.redirect_to("http://www.example.com/welcome?a=b&c=d")
-  end
-