assert2 0.5.2 → 0.5.3

data/lib/assert2/rjs.rb

@@ -92,6 +92,13 @@ module Test; module Unit; module Assertions
         @command = :call
         pwn_call 'Element.remove', *args, &block
       end
+    end  #  TODO  get the call call out of the error message
+
+    class TOGGLE < AssertRjs
+      def pwn *args, &block
+        @command = :call
+        pwn_call 'Element.toggle', *args, &block
+      end
     end
 
     class CALL < AssertRjs
@@ -134,29 +141,41 @@ module Test; module Unit; module Assertions
     end
   end
 
-  def __interpret_rjs(command, *args, &block)
+  def __interpret_rjs(response, command, *args, &block)
     klass = command.to_s.upcase
     klass = eval("AssertRjs::#{klass}") rescue
       flunk("#{command} not implemented!")
-    asserter = klass.new(@response.body, command, self)
+    asserter = klass.new(response, command, self)
     sample = asserter.pwn(*args, &block)
     return sample, asserter
   end
 
-  def assert_rjs_(command, *args, &block)
-    sample, asserter = __interpret_rjs(command, *args, &block)
+  def assert_rjs_(*args, &block)
+    if args.first.class == Symbol
+      command, *args = *args
+      response = @response.body
+    else
+      response, command, *args = *args
+    end
+    
+    sample, asserter = __interpret_rjs(response, command, *args, &block)
     asserter.failure_message and flunk(asserter.failure_message)
     return sample
   end
     
-  def assert_no_rjs_(command, *args, &block)
-    sample, asserter = __interpret_rjs(command, *args, &block)
+  def assert_no_rjs_(*args, &block)
+    if args.first.class == Symbol
+      command, *args = *args
+      response = @response.body
+    else
+      response, command, *args = *args  #  TODO  test me!
+    end
+    
+    sample, asserter = __interpret_rjs(response, command, *args, &block)
     asserter.failure_message and return sample
     flunk("should not find #{sample.inspect} in\n#{asserter.js}") #  TODO  complaint system
   end
 
-#  TODO  wrappers for RSpec
-
 #     command == :replace_html or  #  TODO  put me inside the method_missing!
 #       flunk("assert_rjs's alpha version only respects :replace_html")
 #   TODO  also crack out the args correctly and gripe if they wrong

data/lib/assert2/xhtml.rb

@@ -74,6 +74,7 @@ class BeHtmlWith
                 :message,
                 :reference,
                 :references,
+                :returnable,
                 :sample,
                 :scope
 
@@ -147,9 +148,12 @@ class BeHtmlWith
   end
 
   def match_xpath(path, &refer)
-    @doc.root.xpath_with_callback path, :refer do |element, index|
-      collect_samples(element, index.to_i)
-    end
+    nodes = @doc.root.xpath_with_callback path, :refer do |element, index|
+       collect_samples(element, index.to_i)
+     end
+
+    @returnable ||= nodes.first  #  TODO  be_with_html must get on board too
+    return nodes
   end
 
 #  ERGO  match text with internal spacies?
@@ -321,7 +325,7 @@ module Test; module Unit; module Assertions
       matcher.matches?(xhtml, &block)
       message = matcher.failure_message
       flunk message if message.to_s != ''
-#      return matcher.builder.doc.to_html # TODO return something reasonable
+      return matcher.returnable
     else
      _assert_xml(xhtml)
       return @xdoc
@@ -336,11 +340,6 @@ module Spec; module Matchers
   end
 end; end
 
-class Nokogiri::XML::Node
-      def content= string
-        self.native_content = encode_special_chars(string.to_s)
-      end
-end  #  ERGO  retire these monkey patches as Nokogiri catches up
 
 class Nokogiri::XML::Node
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: assert2
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Phlip
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-07 00:00:00 -07:00
+date: 2009-05-10 00:00:00 -07:00
 default_executable: 
 dependencies: []