From 8b7cd5ae7ef2d8072779d756281f440f19f9500d Mon Sep 17 00:00:00 2001
From: "Stephen St. Martin" <kuprishuz@gmail.com>
Date: Mon, 25 Jan 2010 22:45:44 -0500
Subject: fix duplidate data-submit attribute, submit_to_remote should test url

---
 actionpack/lib/action_view/helpers/ajax_helper.rb | 2 +-
 actionpack/test/template/ajax_helper_test.rb      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/ajax_helper.rb b/actionpack/lib/action_view/helpers/ajax_helper.rb
index 1a396215fc..ae37802f02 100644
--- a/actionpack/lib/action_view/helpers/ajax_helper.rb
+++ b/actionpack/lib/action_view/helpers/ajax_helper.rb
@@ -361,7 +361,7 @@ module ActionView
 
         attributes = extract_remote_attributes!(options)
         attributes.merge!(html_options)
-        attributes["data-submit"] = true
+        attributes["data-remote-submit"] = true
         attributes.delete("data-remote")
 
         tag(:input, attributes)
diff --git a/actionpack/test/template/ajax_helper_test.rb b/actionpack/test/template/ajax_helper_test.rb
index 2e46a38656..4a84ce47e0 100644
--- a/actionpack/test/template/ajax_helper_test.rb
+++ b/actionpack/test/template/ajax_helper_test.rb
@@ -267,8 +267,8 @@ class AjaxHelperTest < AjaxHelperBaseTest
   end
 
   test "submit_to_remote" do
-    assert_dom_equal %(<input name=\"More beer!\" type=\"button\" value=\"1000000\" data-url=\"http://www.example.com/\" data-submit=\"true\" data-update-success=\"empty_bottle\" />),
-      submit_to_remote("More beer!", 1_000_000, :update => "empty_bottle")
+    assert_dom_equal %(<input name=\"More beer!\" type=\"button\" value=\"1000000\" data-url=\"http://www.example.com/empty_bottle\" data-remote-submit=\"true\" data-update-success=\"empty_bottle\" />),
+      submit_to_remote("More beer!", 1_000_000, :url => { :action => 'empty_bottle' }, :update => "empty_bottle")
   end
 
   test "observe_field" do
-- 
cgit v1.2.3