Ticket #7779: assert_select_messages.patch

actionpack/test/controller/assert_select_test.rb

@@ -73 +73 @@
-  def teardown
-    ActionMailer::Base.deliveries.clear
-  end
+  
+  def assert_failure(message, &block)
+    e = assert_raises(AssertionFailedError, &block)
+    assert_match(message, e.message) if Regexp === message
+    assert_equal(message, e.message) if String === message
+  end
-
-
-  #
-  # Test assert select.
-  #
@@ -82 +87 @@
-  def test_assert_select
-    render_html %Q{<div id="1"></div><div id="2"></div>}
-    assert_select "div", 2
-raises(AssertionFailedError
-raises(AssertionFailedError)
+failure(/Expected at least 3 elements matching \"div\", found 2/
+failure(/Expected at least 1 element matching \"p\", found 0/) 
-  end
-
-
@@ -131 +136 @@
-  end
-
-
-equality_of_instance
+count
-    render_html %Q{<div id="1">foo</div><div id="2">foo</div>}
-    assert_nothing_raised               { assert_select "div", 2 }
-
+
+
+
-    assert_nothing_raised               { assert_select "div", 1..2 }
-
+
+
+
-    assert_nothing_raised               { assert_select "div", :count=>2 }
-
+
+
+
-    assert_nothing_raised               { assert_select "div", :minimum=>1 }
-    assert_nothing_raised               { assert_select "div", :minimum=>2 }
-
+
+
+
-    assert_nothing_raised               { assert_select "div", :maximum=>2 }
-    assert_nothing_raised               { assert_select "div", :maximum=>3 }
-
+
+
+
-    assert_nothing_raised               { assert_select "div", :minimum=>1, :maximum=>2 }
-
+
+
+
-  end
-
-
@@ -183 +200 @@
-        assert_select "#3", false
-      end
-    end
+    
+    assert_failure(/Expected at least 1 element matching \"#4\", found 0\./) do
+      assert_select "div" do
+        assert_select "#4"
+      end
+    end
-  end
-
-

actionpack/lib/action_controller/assertions/selector_assertions.rb

@@ -196 +196 @@
-          # Otherwise just operate on the response document.
-          root = response_from_page_or_rjs
-        end
-
+
-        # First or second argument is the selector: string and we pass
-        # all remaining arguments. Array and we pass the argument. Also
-        # accepts selector itself.
@@ -209 +209 @@
-            selector = arg
-          else raise ArgumentError, "Expecting a selector as the first argument"
-        end
-
+
-        # Next argument is used for equality tests.
-        equals = {}
-        case arg = args.shift
@@ -277 +277 @@
-        # found one but expecting two.
-        message ||= content_mismatch if matches.empty?
-        # Test minimum/maximum occurrence.
-
-
-
-
-
-
-
-
+
+
+
+
-
-        # If a block is given call that block. Set @selected to allow
-        # nested assert_select, which can be nested several levels deep.
@@ -300 +296 @@
-        # Returns all matches elements.
-        matches
-      end
-
+
+
+
+
+
+
+
+
+
+
+
-      # :call-seq:
-      #   assert_select_rjs(id?) { |elements| ... }
-      #   assert_select_rjs(statement, id?) { |elements| ... }