Ticket #8794: link_to_with_blank_options_uses_first_arg_for_url_3.1.diff

test/template/url_helper_test.rb

@@ -14 +14 @@
-        url
-      end
-    end
+    
+    def polymorphic_path(options)
+      @controller.url
+    end
+    
-    @controller = @controller.new
-    @controller.url = "http://www.example.com"
-  end
@@ -98 +103 @@
-  def test_link_with_nil_html_options
-    assert_dom_equal "<a href=\"http://www.example.com\">Hello</a>", link_to("Hello", {:action => 'myaction'}, nil)
-  end
+  
+  def test_link_tag_first_arg_used_for_url_when_options_blank
+    @workshop, @session = Workshop.new('foo workshop', true), Session.new('foo session', true)
+    assert_dom_equal "<a href=\"http://www.example.com\">foo session</a>", link_to(@session)
+    assert_dom_equal "<a href=\"http://www.example.com\">foo session</a>", link_to([@workshop, @session])
+    assert_dom_equal "<a href=\"http://www.example.com/foo\">http://www.example.com/foo</a>", link_to("http://www.example.com/foo")
+  end
-
-  def test_link_tag_with_custom_onclick
-    assert_dom_equal "<a href=\"http://www.example.com\" onclick=\"alert('yay!')\">Hello</a>", link_to("Hello", "http://www.example.com", :onclick => "alert('yay!')")

lib/action_view/helpers/url_helper.rb

@@ -133 +133 @@
-      #        var m = document.createElement('input'); m.setAttribute('type', 'hidden'); m.setAttribute('name', '_method'); 
-      #        m.setAttribute('value', 'delete'); f.appendChild(m);f.submit(); };return false;">Delete Image</a>
-      def link_to(name, options = {}, html_options = nil)
+        options = name if options.blank?
+        name = name.last if name.is_a?(Array)
-        url = options.is_a?(String) ? options : self.url_for(options)
-
-        if html_options