Changeset 7838

Timestamp:

10/11/07 21:56:19 (1 year ago)

Author:

nzkoz

Message:

Backport fix to allow :controller=>:some_symbol [norbert]

Files:

• branches/1-2-stable/actionpack/lib/action_controller/assertions/response_assertions.rb (modified) (1 diff)
• branches/1-2-stable/actionpack/lib/action_controller/routing.rb (modified) (1 diff)
• branches/1-2-stable/actionpack/test/controller/action_pack_assertions_test.rb (modified) (2 diffs)
• branches/1-2-stable/actionpack/test/controller/url_rewriter_test.rb (modified) (1 diff)

branches/1-2-stable/actionpack/lib/action_controller/assertions/response_assertions.rb

@@ -70 +70 @@
-
-              if value.respond_to?(:[]) && value['controller']
+                value['controller'] = value['controller'].to_s
-                if key == :actual && value['controller'].first != '/' && !value['controller'].include?('/')
-                  new_controller_path = ActionController::Routing.controller_relative_to(value['controller'], @controller.class.controller_path)

branches/1-2-stable/actionpack/lib/action_controller/routing.rb

@@ -1255 +1255 @@
-        expire_on = build_expiry(options, recall)
-
+        if options[:controller]
+          options[:controller] = options[:controller].to_s
+        end
-        # if the controller has changed, make sure it changes relative to the
-        # current controller module, if any. In other words, if we're currently

branches/1-2-stable/actionpack/test/controller/action_pack_assertions_test.rb

@@ -19 +19 @@
-
-  def redirect_to_controller() redirect_to :controller => "elsewhere", :action => "flash_me"; end
+
+  def redirect_to_controller_with_symbol() redirect_to :controller => :elsewhere, :action => :flash_me; end
-
-  def redirect_to_path() redirect_to '/some/path' end
@@ -556 +558 @@
-  end
-
+  def test_assert_redirection_with_symbol
+    process :redirect_to_controller_with_symbol
+    assert_nothing_raised {
+      assert_redirected_to :controller => "elsewhere", :action => "flash_me"
+    }
+    process :redirect_to_controller_with_symbol
+    assert_nothing_raised {
+      assert_redirected_to :controller => :elsewhere, :action => :flash_me
+    }
+  end
+
-  def test_redirected_to_with_nested_controller
-    @controller = Admin::InnerModuleController.new

branches/1-2-stable/actionpack/test/controller/url_rewriter_test.rb

@@ -161 +161 @@
-  end
-
+  def test_path_generation_for_symbol_parameter_keys
+    assert_generates("/image", :controller=> :image)
+  end
+
-  private
-    def extract_params(url)