diff options
| -rw-r--r-- | actionview/lib/action_view/testing/assertions/dom.rb | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/actionview/lib/action_view/testing/assertions/dom.rb b/actionview/lib/action_view/testing/assertions/dom.rb index 825720a56f..3357b14421 100644 --- a/actionview/lib/action_view/testing/assertions/dom.rb +++ b/actionview/lib/action_view/testing/assertions/dom.rb @@ -6,7 +6,9 @@ module ActionView # # assert that the referenced method generates the appropriate HTML string # assert_dom_equal '<a href="http://www.example.com">Apples</a>', link_to("Apples", "http://www.example.com") def assert_dom_equal(expected, actual, message = nil) - assert dom_assertion(expected, actual, message) + expected_dom, actual_dom = Loofah.fragment(expected), Loofah.fragment(actual) + message ||= "Expected: #{expected}\nActual: #{actual}" + assert compare_doms(expected_dom, actual_dom), message end # The negated form of +assert_dom_equal+. @@ -14,16 +16,12 @@ module ActionView # # assert that the referenced method does not generate the specified HTML string # assert_dom_not_equal '<a href="http://www.example.com">Apples</a>', link_to("Oranges", "http://www.example.com") def assert_dom_not_equal(expected, actual, message = nil) - assert_not dom_assertion(expected, actual, message) + expected_dom, actual_dom = Loofah.fragment(expected), Loofah.fragment(actual) + message ||= "Expected: #{expected}\nActual: #{actual}" + assert_not compare_doms(expected_dom, actual_dom), message end protected - def dom_assertion(expected_string, actual_string, message = nil) - expected, actual = Loofah.fragment(expected_string), Loofah.fragment(actual_string) - message ||= "Expected: #{expected}\nActual: #{actual}" - return compare_doms(expected, actual), message - end - def compare_doms(expected, actual) return false unless expected.children.size == actual.children.size |