aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template
diff options
context:
space:
mode:
authorStephen St. Martin <kuprishuz@gmail.com>2010-01-23 12:48:11 -0500
committerStefan Penner <stefan.penner@gmail.com>2010-01-27 12:44:31 -0600
commit49e84a59439074fb7742b662db21e9638d41cfd0 (patch)
tree0adc89e5c14b5a5ba963b94d749e81f9ba074020 /actionpack/test/template
parent07299eb60d4ae625b3be2e919be4dbd737fb01be (diff)
downloadrails-49e84a59439074fb7742b662db21e9638d41cfd0.tar.gz
rails-49e84a59439074fb7742b662db21e9638d41cfd0.tar.bz2
rails-49e84a59439074fb7742b662db21e9638d41cfd0.zip
fix failing tests from fork/merge
Diffstat (limited to 'actionpack/test/template')
-rw-r--r--actionpack/test/template/ajax_helper_test.rb4
1 files changed, 2 insertions, 2 deletions
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