Merge pull request #900 from boutil/master

exchange string and regexp in assert_match tests
sparklemotion · May 14, 2013 · f157d05 · f157d05
2 parents 9321240 + 4229bdf
commit f157d05
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/test/xml/test_document.rb b/test/xml/test_document.rb
@@ -47,7 +47,7 @@ def test_manually_adding_reference_entities
         root << txt
         root << ent
         d << root
-        assert_match d.to_html, /&#8217;/
+        assert_match /&#8217;/, d.to_html
       end
 
       def test_document_with_initial_space

diff --git a/test/xml/test_entity_reference.rb b/test/xml/test_entity_reference.rb
@@ -26,7 +26,7 @@ def test_newline_node
         doc = Nokogiri::XML xml
         lf_node = Nokogiri::XML::EntityReference.new(doc, "#xa")
         doc.xpath('/item').first.add_child(lf_node)
-        assert_match doc.to_xml, /&#xa;/
+        assert_match /&#xa;/, doc.to_xml
       end
     end
 

diff --git a/test/xml/test_node.rb b/test/xml/test_node.rb
@@ -830,7 +830,7 @@ def test_encoding_of_copied_nodes
         ne = d1.root.xpath('//a').first.dup(1)
         ne.content += "& < & > \" &"
         d2.root << ne
-        assert_match d2.to_s, /<a>&amp;&amp; &lt; &amp; &gt; " &amp;<\/a>/
+        assert_match /<a>&amp;&amp; &lt; &amp; &gt; " &amp;<\/a>/, d2.to_s
       end
 
       def test_content_after_appending_text