assert2 0.5.0 → 0.5.1

data/lib/assert2/rjs.rb

@@ -174,8 +174,9 @@ module Spec; module Matchers
     def matches?(response, &block)
       @block = block if block
       sample, asserter = @scope.__interpret_rjs(response, @command, @args, &@block)
-      return !(@failure_message = asserter.failure_message) # or
-#         @negative_failure_message = "should not find #{sample.inspect} in\n#{asserter.js}" #  TODO  complaint system
+      @failure_message = asserter.failure_message or
+        @negative_failure_message = "should not find #{sample.inspect} in\n#{asserter.js}" #  TODO  complaint system
+      return @negative_failure_message
     end
  
     attr_reader :failure_message, :negative_failure_message

data/lib/assert2/xhtml.rb

@@ -72,10 +72,10 @@ class BeHtmlWith
                 :doc,
                 :failure_message,
                 :message,
+                :reference,
+                :references,
+                :sample,
                 :scope
-  attr_reader   :references
-  attr_writer   :reference,
-                :sample
 
   def matches?(stwing, &block)
     @block ||= block  #  ERGO  test that ||= - preferrably with a real RSpec suite!
@@ -112,7 +112,7 @@ class BeHtmlWith
     if element.name == 'without!'
       return 'not( ' + build_predicate(element, 'or') + ' )'
     else
-      target = element.name.sub(/\!$/, '')
+      target = translate_tag(element)
       path = "descendant::#{ target }[ refer(., '#{ count }') "
         #  refer() is first so we collect many samples, despite boolean short-circuiting
       path << 'and '  if elemental_children(element).any?
@@ -121,6 +121,15 @@ class BeHtmlWith
     end
   end
 
+  def translate_tag(element)
+#   p element.name if element.name =~ /\!/
+    if element.name == 'any!'
+      '*'
+    else
+      element.name.sub(/\!$/, '')
+    end
+  end
+
   def build_predicate(element, conjunction = 'and')
     conjunction = " #{ conjunction } "
     element_kids = elemental_children(element)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: assert2
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Phlip
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-11 00:00:00 -07:00
+date: 2009-04-12 00:00:00 -07:00
 default_executable: 
 dependencies: []