assert2 0.4.0 → 0.4.1

data/lib/assert2/xhtml.rb

@@ -79,10 +79,14 @@ end
 
 class BeHtmlWith
 
+  def deAmpAmp(stwing)
+    stwing.gsub('&', '&').gsub('&', '&')
+  end  #  ERGO await a fix in Nokogiri, and hope nobody actually means & !!!
+
   def get_texts(element)
     element.xpath('text()').map{|x|x.to_s.strip}.reject{|x|x==''}.compact
   end
-  
+
   def match_text(ref, sam)
     ref_text = get_texts(ref)
       #  TODO regices?
@@ -91,7 +95,7 @@ class BeHtmlWith
 
   def match_attributes_and_text(reference, sample)
     reference.attribute_nodes.each do |attr|
-      sample[attr.name] == attr.value or return false
+      deAmpAmp(sample[attr.name]) == deAmpAmp(attr.value) or return false
     end
 
     return match_text(reference, sample)

data/lib/assert2/xhtml.rb~

@@ -51,7 +51,7 @@ requirements:
      must match
  - the specification only requires the attributes and structural 
      elements that its matcher demands; we skip the rest - 
-     such as the <ol> and <li> fields. They can change
+     such as the <ol> and <li> elements. They can change
      freely as our website upgrades
  - at fault time, the matcher prints out the failing elements
      and their immediate context.
@@ -79,10 +79,15 @@ end
 
 class BeHtmlWith
 
+  def deAmpAmp(stwing)
+   p stwing
+    stwing.gsub('&amp;amp;', '&').gsub('&amp;', '&')
+  end  #  ERGO await a fix in Nokogiri, and hope nobody actually means &amp;amp; !!!
+
   def get_texts(element)
     element.xpath('text()').map{|x|x.to_s.strip}.reject{|x|x==''}.compact
   end
-  
+
   def match_text(ref, sam)
     ref_text = get_texts(ref)
       #  TODO regices?
@@ -91,7 +96,8 @@ class BeHtmlWith
 
   def match_attributes_and_text(reference, sample)
     reference.attribute_nodes.each do |attr|
-      sample[attr.name] == attr.value or return false
+    p sample[attr.name]
+      deAmpAmp(sample[attr.name]) == deAmpAmp(attr.value) or return false
     end
 
     return match_text(reference, sample)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: assert2
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Phlip