Changeset 4248

Timestamp:

04/22/06 15:08:25 (2 years ago)

Author:

rick

Message:

Diff compared options with #assert_redirected_to [Rick]

Files:

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

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Diff compared options with #assert_redirected_to [Rick]
-
-* Add support in routes for semicolon delimited "subpaths", like /books/:id;:action [Jamis Buck]

trunk/actionpack/lib/action_controller/assertions.rb

@@ -74 +74 @@
-        clean_backtrace do
-          assert_response(:redirect, message)
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            msg = build_message(message, "expected a redirect to <?>, found one to <?>", options, @response.redirect_url)
-            url_regexp = %r{^(\w+://.*?(/|$|\?))(.*)$}
@@ -85 +122 @@
-            assert_equal(eurl, url, msg) if eurl && url
-            assert_equal(epath, path, msg) if epath && path 
-          else
-            @response_diff = options.diff(@response.redirected_to) if options.is_a?(Hash) && @response.redirected_to.is_a?(Hash)
-            msg = build_message(message, "response is not a redirection to all of the options supplied (redirection is <?>)#{', difference: <?>' if @response_diff}", 
-                                @response.redirected_to || @response.redirect_url, @response_diff)
-
-            assert_block(msg) do
-              if options.is_a?(Symbol)
-                @response.redirected_to == options
-              else
-                options.keys.all? do |k|
-                  if k == :controller then options[k] == ActionController::Routing.controller_relative_to(@response.redirected_to[k], @controller.class.controller_path)
-                  else options[k] == (@response.redirected_to[k].respond_to?(:to_param) ? @response.redirected_to[k].to_param : @response.redirected_to[k] unless @response.redirected_to[k].nil?)
-                  end
-                end
-              end
-            end
-          end
-        end
@@ -123 +144 @@
-      def assert_recognizes(expected_options, path, extras={}, message=nil)
-        clean_backtrace do 
-          path = "/#{path}" unless path[0..0] == '/'
-          # Load routes.rb if it hasn't been loaded.
-          ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty? 
-
-
-
-
-
+
-      
-          expected_options = expected_options.clone
@@ -297 +312 @@
-        clean_backtrace do
-          expected_dom = HTML::Document.new(expected).root
-
+  
-          full_message = build_message(message, "<?> expected to be != to\n<?>.", expected_dom.to_s, actual_dom.to_s)
-          assert_block(full_message) { expected_dom != actual_dom }
@@ -316 +331 @@
-        raise AssertionFailedError, e.message, e.backtrace.reject { |line| File.expand_path(line) =~ /#{path}/ }
-      end
+      
+      private
+        def recognized_request_for(path)
+          path = "/#{path}" unless path[0..0] == '/'
+
+          # Assume given controller
+          request = ActionController::TestRequest.new({}, {}, nil)
+          request.path = path
+          ActionController::Routing::Routes.recognize!(request)
+          request
+        end
+        
+        def parameterize(value)
+          value.respond_to?(:to_param) ? value.to_param : value
+        end
-    end
-  end

trunk/actionpack/test/controller/action_pack_assertions_test.rb

@@ -227 +227 @@
-  # test the redirection to a named route
-  def test_assert_redirect_to_named_route
-
-
-
+
+
+
+
+
+
+
+
+
-    end
-  end
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  # test the flash-based assertions with something is in the flash
-  def test_flash_assertions_full
@@ -322 +351 @@
-  end
-  
-  
-  # check if we were rendered by a file-based template? 
-  def test_rendered_action

trunk/actionpack/test/controller/redirect_test.rb

@@ -65 +65 @@
-    rescue Test::Unit::AssertionFailedError => err
-      redirection_msg, diff_msg = err.message.scan(/<\{[^\}]+\}>/).collect { |s| s[2..-3] }
-:only_path
-:host
-:action
-:only_path
-:host
+"only_path"
+"host"
+"action"
+"only_path"
+"host"
-    end
-  end

trunk/actionpack/test/controller/test_test.rb

@@ -406 +406 @@
-
-  def test_assert_redirected_to_symbol
-
-
+
+
+
+
+
+
+
+
+
-  end
-end