test_xml 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    test_xml (0.0.4)
+    test_xml (0.1.1)
       nokogiri (>= 1.3.2)
 
 GEM

data/lib/test_xml/matcher_methods.rb

@@ -23,7 +23,7 @@ module TestXml
     
   private
     def self.parse_xml(subject, pattern)
-      [Nokogiri::XML.parse(subject), Nokogiri::XML.parse(pattern)]
+      [Nokogiri::XML.parse(subject).root, Nokogiri::XML.parse(pattern).root]
     end
   end
 end

data/lib/test_xml/nokogiri/node.rb

@@ -5,8 +5,16 @@ module TestXml
         if compare_value && element.leaf?
           comparable_attributes == element.comparable_attributes and equal_text?(element)
         else
-          contains_elements_of?(element) &&
-          element.elements.all? {|el| matches_at_least_one?(el, compare_value) }
+
+          #TODO clean this part of the code
+          if compare_value
+            (comparable_attributes == element.comparable_attributes) &&
+            contains_elements_of?(element) &&
+            element.elements.all? {|el| matches_at_least_one?(el, compare_value) }
+          else
+            contains_elements_of?(element) &&
+            element.elements.all? {|el| matches_at_least_one?(el, compare_value) }
+          end
         end
       end
       

data/lib/test_xml/version.rb

@@ -1,3 +1,3 @@
 module TestXml
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/matchers/equal_xml_spec.rb

@@ -30,6 +30,39 @@ describe "equal_xml(xml)" do
     end
   end
 
+  context "when subject has elements with attributes" do
+    subject {
+      <<-XML
+        <xml test="true">
+          <one type="text" attr="hello">1</one>
+          <two type="integer">2</two>
+        </xml>
+      XML
+    }
+
+    context "and xml has similar elements with attributes" do
+      it "should pass" do
+        should equal_xml(<<-XML)
+          <xml test="true">
+            <one type="text" attr="hello">1</one>
+            <two type="integer">2</two>
+          </xml>
+        XML
+      end
+    end
+
+    context "and xml has elements with different attributes" do
+      it "should fail" do
+        should_not equal_xml(<<-XML)
+          <xml>
+            <one type="text" attr="hello">1</one>
+            <two type="integer">2</two>
+          </xml>
+        XML
+      end
+    end
+  end
+
   context "when xml is equal with subject" do
     it "should pass" do
       should equal_xml(<<-XML)

data/test/nokogiri/test_node.rb

@@ -7,15 +7,15 @@ class TestNode < Test::Unit::TestCase
   end
   
   def test_leaf?
-    assert doc("<a/>").root.leaf?
-    assert doc("<a>Yo</a>").root.leaf?
-    assert doc("<a></a>").root.leaf?
-    assert !doc("<div><a/></div>").root.leaf?
+    assert root("<a/>").leaf?
+    assert root("<a>Yo</a>").leaf?
+    assert root("<a></a>").leaf?
+    assert !root("<div><a/></div>").leaf?
   end
   
 
   def test_match_of_elements_without_comparing_values
-    subject = doc(<<-XML)
+    subject = root(<<-XML)
       <root>
         <one>1</one>
         <two>
@@ -24,7 +24,7 @@ class TestNode < Test::Unit::TestCase
       </root>
     XML
 
-    pattern = doc(<<-XML)
+    pattern = root(<<-XML)
       <root>
         <two><three/></two>
         <one>2</one>
@@ -35,14 +35,14 @@ class TestNode < Test::Unit::TestCase
   end
 
   def test_no_match_of_elements_without_comparing_values
-    subject = doc(<<-XML)
+    subject = root(<<-XML)
       <root>
         <one>1</one>
         <two/>
       </root>
     XML
 
-    pattern = doc(<<-XML)
+    pattern = root(<<-XML)
       <root>
         <four/>
         <five>5</five>
@@ -53,14 +53,14 @@ class TestNode < Test::Unit::TestCase
   end
 
   def test_match_with_values
-    subject = doc(<<-XML)
+    subject = root(<<-XML)
       <root>
         <one>1</one>
         <two><three>3</three></two>
       </root>
     XML
 
-    pattern = doc(<<-XML)
+    pattern = root(<<-XML)
       <root>
         <two><three>3</three></two>
         <one>1</one>
@@ -71,13 +71,13 @@ class TestNode < Test::Unit::TestCase
   end
 
   def test_no_match_with_values
-    subject = doc(<<-XML)
+    subject = root(<<-XML)
       <root>
         <one>1</one>
       </root>
     XML
 
-    not_matched_pattern = doc(<<-XML)
+    not_matched_pattern = root(<<-XML)
       <root>
         <one>2</one>
       </root>
@@ -111,6 +111,10 @@ class TestNode < Test::Unit::TestCase
     Nokogiri::XML::Document.parse(xml).root
   end
 
+  def root(xml)
+    doc(xml).root
+  end
+
   def doc(xml = nil)
     xml ||= <<-XML
       <root>

data/test/test_unit/test_assertions.rb

@@ -130,6 +130,24 @@ class TestAssertions < Test::Unit::TestCase
     
     assert_xml_equal expected, actual
   end
+
+  def test_assert_xml_equal_with_attributes_in_branch_element
+    expected = <<-XML
+      <root type="test">
+        <one>1</one>
+        <two/>
+      </root>
+    XML
+    
+    actual = <<-XML
+      <root type="test">
+        <one>1</one>
+        <two/>
+      </root>
+    XML
+    
+    assert_xml_equal expected, actual
+  end
   
   def test_assert_not_xml_equal_with_attributes
     expected = <<-XML
@@ -146,6 +164,7 @@ class TestAssertions < Test::Unit::TestCase
     
     assert_not_xml_equal expected, actual
   end
+
   
   def test_assert_not_xml_equal_with_attributes_and_no_text
     expected = <<-XML
@@ -163,6 +182,24 @@ class TestAssertions < Test::Unit::TestCase
     assert_not_xml_equal expected, actual
   end
 
+  def test_assert_not_xml_equal_with_attributes_in_branch_element
+    expected = <<-XML
+      <root type="test">
+        <one>1</one>
+        <two/>
+      </root>
+    XML
+    
+    actual = <<-XML
+      <root>
+        <one>1</one>
+        <two/>
+      </root>
+    XML
+    
+    assert_not_xml_equal expected, actual
+  end
+
   def test_assert_not_xml_equal
     expected = <<-XML
       <root>

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: test_xml
 version: !ruby/object:Gem::Version 
-  hash: 25
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Pavel Gabriel
@@ -16,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-15 00:00:00 +03:00
+date: 2011-04-21 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,11 +22,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 3
-        - 2
         version: 1.3.2
   type: :runtime
   version_requirements: *id001
@@ -43,9 +33,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -57,9 +44,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -71,10 +55,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
         version: "2.2"
   type: :development
   version_requirements: *id004
@@ -132,18 +112,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []