Changeset 1251

Timestamp:

04/30/05 08:34:02 (3 years ago)

Author:

david

Message:

Fixed assert_redirected_to to work with :only_path => false #1204 [Alisdair McDiarmid]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/assertions.rb (modified) (1 diff)
• trunk/actionpack/test/controller/redirect_test.rb (modified) (2 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fixed assert_redirected_to to work with :only_path => false #1204 [Alisdair McDiarmid]
-
-* Fixed render_partial_collection to output an empty string instead of nil when handed an empty array #1202 [Ryan Carver]

trunk/actionpack/lib/action_controller/assertions.rb

@@ -58 +58 @@
-          else
-            options.keys.all? do |k| 
-if @response.redirected_to[k]
+unless @response.redirected_to[k].nil?
-            end
-          end

trunk/actionpack/test/controller/redirect_test.rb

@@ -10 +10 @@
-  end
-  
+  def host_redirect
+    redirect_to :action => "other_host", :only_path => false, :host => 'other.test.host'
+  end
+
-  def rescue_errors(e) raise e end
-  
@@ -34 +38 @@
-    assert_redirect_url "http://test.host/redirect/dashboard/1?message=hello"
-  end
+
+  def test_simple_redirect_using_options
+    get :host_redirect
+    assert_redirected_to :action => "other_host", :only_path => false, :host => 'other.test.host'
+  end
-end