Fixed 1 failure and 2 errors in ActionPack testsuite [#4613 state:com…

…mited] Signed-off-by: José Valim <jose.valim@gmail.com>
rails · May 16, 2010 · fc2480a · fc2480a
1 parent 3e84ea0
commit fc2480a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/actionpack/test/controller/assert_select_test.rb b/actionpack/test/controller/assert_select_test.rb
@@ -211,7 +211,7 @@ def test_assert_select_text_match
       assert_nothing_raised    { assert_select "div", "foo" }
       assert_nothing_raised    { assert_select "div", "bar" }
       assert_nothing_raised    { assert_select "div", /\w*/ }
-      assert_nothing_raised    { assert_select "div", /\w*/, :count=>2 }
+      assert_nothing_raised    { assert_select "div", :text => /\w*/, :count=>2 }
       assert_raise(Assertion) { assert_select "div", :text=>"foo", :count=>2 }
       assert_nothing_raised    { assert_select "div", :html=>"<span>bar</span>" }
       assert_nothing_raised    { assert_select "div", :html=>"<span>bar</span>" }
@@ -276,8 +276,8 @@ def test_elect_with_xml_namespace_attributes
 
   def test_css_select
     render_html %Q{<div id="1"></div><div id="2"></div>}
-    assert 2, css_select("div").size
-    assert 0, css_select("p").size
+    assert_equal 2, css_select("div").size
+    assert_equal 0, css_select("p").size
   end
 
   def test_nested_css_select

diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
@@ -1388,7 +1388,7 @@ def test_render_against_etag_request_should_304_when_match
   def test_render_against_etag_request_should_have_no_content_length_when_match
     @request.if_none_match = etag_for("hello david")
     get :render_hello_world_from_variable
-    assert !@response.headers.has_key?("Content-Length"), @response.headers['Content-Length']
+    assert !@response.headers.has_key?("Content-Length")
   end
 
   def test_render_against_etag_request_should_200_when_no_match
@@ -1524,4 +1524,4 @@ def test_last_modified_works_with_less_than_too
     get :conditional_hello_with_bangs
     assert_response :success
   end
-end
+end
diff --git a/actionpack/test/template/capture_helper_test.rb b/actionpack/test/template/capture_helper_test.rb
@@ -74,7 +74,7 @@ def test_with_output_buffer_sets_proper_encoding
       @av.output_buffer.force_encoding(alt_encoding)
 
       @av.with_output_buffer do
-        assert alt_encoding, @av.output_buffer.encoding
+        assert_equal alt_encoding, @av.output_buffer.encoding
       end
     end
   end