From 49e84a59439074fb7742b662db21e9638d41cfd0 Mon Sep 17 00:00:00 2001
From: "Stephen St. Martin" <kuprishuz@gmail.com>
Date: Sat, 23 Jan 2010 12:48:11 -0500
Subject: fix failing tests from fork/merge

---
 actionpack/test/template/ajax_helper_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/test/template')

diff --git a/actionpack/test/template/ajax_helper_test.rb b/actionpack/test/template/ajax_helper_test.rb
index 86932d754f..95c839b96e 100644
--- a/actionpack/test/template/ajax_helper_test.rb
+++ b/actionpack/test/template/ajax_helper_test.rb
@@ -104,8 +104,8 @@ class ButtonToRemoteTest < AjaxTestCase
 
   class StandardTest < ButtonToRemoteTest
     test "basic" do
-      assert_html button({:url => {:action => "whatnot"}}, {:class => "fine"}),
-        %w(input class="fine" type="button" value="Remote outpost" data-url="/url/hash")
+      expected = %{<input class="fine" data-remote="true" data-url="/url/hash" type="button" value="Remote outpost" />}
+      assert_equal expected, button({:url => "/url/hash"}, {:class => "fine"})
     end
   end
 
-- 
cgit v1.2.3