apotomo 1.0.5 → 1.1.0.rc1

data/test/rails/view_helper_test.rb

@@ -5,14 +5,12 @@ class ViewHelperTest < Apotomo::TestCase
   include ActionDispatch::Assertions::DomAssertions
   include Apotomo::TestCase::TestController
   
-  # TODO: move to Apotomo::TestCase, refactor, test.
-  class MouseWidget < Apotomo::Widget
-  end
+  # TODO: use Cell::TestCase#in_view here.
   def in_view(subject, &block)
     if subject.kind_of?(Apotomo::Widget)
-      subject.opts[:block] = block
+      subject.options[:block] = block
     else
-      subject = subject.new(@controller, 'mum', :display, :block => block)
+      subject = subject.new(@controller, 'mum', :block => block)
     end
      
     setup_test_states_in(subject) unless subject.respond_to?(:in_view)# add #in_view state to subject cell.
@@ -21,8 +19,8 @@ class ViewHelperTest < Apotomo::TestCase
     
     subject.invoke(:in_view)
   end
-  def mouse_mock(id='mum', start_state=:eat, opts={}, &block)
-    mouse = MouseWidget.new(parent_controller, id, start_state, opts)
+  def mouse_mock(id='mum', opts={}, &block)
+    mouse = MouseWidget.new(parent_controller, id, opts)
     mouse.instance_eval &block if block_given?
     mouse
   end
@@ -67,27 +65,18 @@ class ViewHelperTest < Apotomo::TestCase
       assert_equal('mum', in_view(MouseWidget){ widget_id })
     end
     
-    context "#widget_javascript" do
-      
-      should "usually render a javascript block" do
-        assert_equal("<script type=\"text/javascript\">\n//<![CDATA[\nalert(&quot;Beer!&quot;)\n//]]>\n</script>", in_view(MouseWidget) do
-          widget_javascript { 'alert("Beer!")' }
-        end)
-      end
-      
-      # FIXME: get the test running?
-      should_eventually "be quiet if suppress_js is set" do
-        @suppress_js = true ### TODO: use a local, not an instance variable.
-        mum = mouse_mock do
-          def in_view
-            render :suppress_js => true
-          end
-        end
-
-        assert_equal(nil, in_view(mum) do
-          widget_javascript { 'alert("Beer!")' }
-        end)
-      end
+    should "respond to #render_widget" do
+      mum = mouse_mock 
+      mum << mouse_mock('kid')
+      assert_equal("<div id=\"kid\">burp!</div>\n", in_view(mum){ render_widget 'kid', :eat })
+    end
+    
+    should "respond to #children" do
+      mum = mouse_mock 
+      mum << mouse_mock('kid')
+      assert_equal("<div id=\"kid\">burp!</div>\n", in_view(mum) do
+        children.inject("") { |html, child| html += render_widget(child, :eat) }.html_safe
+      end)
     end
   end
 end

data/test/rails/widget_generator_test.rb

@@ -7,44 +7,32 @@ class WidgetGeneratorTest < Rails::Generators::TestCase
   tests ::Apotomo::Generators::WidgetGenerator
    
   context "Running rails g apotomo::widget" do
-    context "Mouse squeak snuggle" do
+    context "Gerbil squeak snuggle" do
       should "create the standard assets" do
         
-        run_generator %w(MouseWidget squeak snuggle)
+        run_generator %w(Gerbil squeak snuggle -t test_unit)
         
-        assert_file "app/cells/mouse_widget.rb", /class MouseWidget < Apotomo::Widget/
-        assert_file "app/cells/mouse_widget.rb", /def snuggle/
-        assert_file "app/cells/mouse_widget.rb", /def squeak/
-        assert_file "app/cells/mouse_widget/snuggle.html.erb", %r(app/cells/mouse_widget/snuggle\.html\.erb)
-        assert_file "app/cells/mouse_widget/snuggle.html.erb", %r(<p>)
-        assert_file "app/cells/mouse_widget/squeak.html.erb", %r(app/cells/mouse_widget/squeak\.html\.erb)
+        assert_file "app/widgets/gerbil_widget.rb", /class GerbilWidget < Apotomo::Widget/
+        assert_file "app/widgets/gerbil_widget.rb", /def snuggle/
+        assert_file "app/widgets/gerbil_widget.rb", /def squeak/
+        assert_file "app/widgets/gerbil/snuggle.html.erb", %r(app/widgets/gerbil/snuggle\.html\.erb)
+        assert_file "app/widgets/gerbil/snuggle.html.erb", %r(<p>)
+        assert_file "app/widgets/gerbil/squeak.html.erb", %r(app/widgets/gerbil/squeak\.html\.erb)
 
-        assert_file "test/widgets/mouse_widget_test.rb", %r(class MouseWidgetTest < Apotomo::TestCase)
-        assert_file "test/widgets/mouse_widget_test.rb", %r(widget\(:mouse_widget, 'me'\))
+        assert_file "test/widgets/gerbil_widget_test.rb", %r(class GerbilWidgetTest < Apotomo::TestCase)
+        assert_file "test/widgets/gerbil_widget_test.rb", %r(widget\(:gerbil, 'me'\))
       end
       
-      should "create haml assets with --haml" do
-        run_generator %w(MouseWidget squeak snuggle --haml)
+      should "create haml assets with -e haml" do
+        run_generator %w(Gerbil squeak snuggle -e haml -t test_unit)
         
-        assert_file "app/cells/mouse_widget.rb", /class MouseWidget < Apotomo::Widget/
-        assert_file "app/cells/mouse_widget.rb", /def snuggle/
-        assert_file "app/cells/mouse_widget.rb", /def squeak/
-        assert_file "app/cells/mouse_widget/snuggle.html.haml", %r(app/cells/mouse_widget/snuggle\.html\.haml)
-        assert_file "app/cells/mouse_widget/snuggle.html.haml", %r(%p)
-        assert_file "app/cells/mouse_widget/squeak.html.haml", %r(app/cells/mouse_widget/squeak\.html\.haml)
-        assert_file "test/widgets/mouse_widget_test.rb"
-      end
-      
-      should "create haml assets with -t haml" do
-        run_generator %w(MouseWidget snuggle squeak -t haml)
-        
-        assert_file "app/cells/mouse_widget.rb", /class MouseWidget < Apotomo::Widget/
-        assert_file "app/cells/mouse_widget.rb", /def snuggle/
-        assert_file "app/cells/mouse_widget.rb", /def squeak/
-        assert_file "app/cells/mouse_widget/snuggle.html.haml", %r(app/cells/mouse_widget/snuggle\.html\.haml)
-        assert_file "app/cells/mouse_widget/snuggle.html.haml", %r(%p)
-        assert_file "app/cells/mouse_widget/squeak.html.haml", %r(app/cells/mouse_widget/squeak\.html\.haml)
-        assert_file "test/widgets/mouse_widget_test.rb"
+        assert_file "app/widgets/gerbil_widget.rb", /class GerbilWidget < Apotomo::Widget/
+        assert_file "app/widgets/gerbil_widget.rb", /def snuggle/
+        assert_file "app/widgets/gerbil_widget.rb", /def squeak/
+        assert_file "app/widgets/gerbil/snuggle.html.haml", %r(app/widgets/gerbil/snuggle\.html\.haml)
+        assert_file "app/widgets/gerbil/snuggle.html.haml", %r(%p)
+        assert_file "app/widgets/gerbil/squeak.html.haml", %r(app/widgets/gerbil/squeak\.html\.haml)
+        assert_file "test/widgets/gerbil_widget_test.rb"
       end
     end
   end

data/test/support/test_case_methods.rb

@@ -1,21 +1,21 @@
 module Apotomo
   module TestCaseMethods
     # Provides a ready-to-use mouse widget instance.
-    def mouse_mock(id='mouse', start_state=:eating, opts={}, &block)
-      mouse = MouseCell.new(parent_controller, id, start_state, opts)
+    def mouse_mock(id='mouse', opts={}, &block)
+      mouse = MouseWidget.new(parent_controller, id, opts)
       mouse.instance_eval &block if block_given?
       mouse
     end
     
     def mouse_class_mock(&block)
-      klass = Class.new(MouseCell)
+      klass = Class.new(MouseWidget)
       klass.instance_eval &block if block_given?
       klass
     end
     
     def mum_and_kid!
-      @mum = mouse_mock('mum', :answer_squeak)
-        @mum << @kid = mouse_mock('kid', :peek)
+      @mum = mouse_mock('mum')
+        @mum << @kid = mouse_mock('kid')
       
       @mum.respond_to_event :squeak, :with => :answer_squeak
       @mum.respond_to_event :squeak, :from => 'kid', :with => :alert
@@ -43,25 +43,11 @@ module Apotomo
       @controller = Class.new(ActionController::Base) do
         def self.default_url_options; {:controller => :barn}; end
       end.new
-      @controller.class.instance_eval { include Apotomo::Rails::ControllerMethods }
       @controller.extend ActionController::UrlWriter
       @controller.params  = {}
-      ### FIXME: @controller.session = {}
     end
     
-    def hibernate_widget(widget, session = {})
-      Apotomo::StatefulWidget.freeze_for(session, widget)
-      
-      session = Marshal.load(Marshal.dump(session))
-      
-      Apotomo::StatefulWidget.thaw_for(@controller, session, )
-    end
-    
-    def hibernate(widget, session = {})
-      Apotomo::StatefulWidget.freeze_for(session, widget)
-      session = Marshal.load(Marshal.dump(session))
-      Apotomo::StatefulWidget.thaw_for(session, widget('apotomo/widget', 'root'))
-    end
+
     
     module TestController
       def setup

data/test/test_helper.rb

@@ -4,15 +4,15 @@ require 'bundler'
 Bundler.setup
 
 require 'shoulda'
-require 'cells'
-require 'apotomo'
 
 ENV['RAILS_ENV'] = 'test'
 require "dummy/config/environment"
 require "rails/test_help" # sets up ActionController::TestCase's @routes
 
+require 'cells'
+require 'apotomo'
 
-Cell::Base.append_view_path File.expand_path(File.dirname(__FILE__) + "/fixtures")
+Apotomo::Widget.append_view_path(File.expand_path(File.dirname(__FILE__) + "/widgets"))
 
 # Load test support files.
 require File.join(File.dirname(__FILE__), "support/test_case_methods")
@@ -37,33 +37,23 @@ module Farm
   end
 end
 
-
-class MouseCell < Apotomo::StatefulWidget
-  def eating; render; end
-  def squeak; render; end
-  def educate; render; end
-  def snooze; render; end
-  def listen; render; end
-  def answer_squeak; render; end
-  def peek; render; end
-  def alert; end
-  def escape; end
-  def snuggle; end
+class MouseWidget < Apotomo::Widget
 end
 
-### TODO: 2brm?
-class RenderingTestCell < Apotomo::StatefulWidget
-  attr_reader :brain
-  attr_reader :rendered_children
-  
-  
-  
-  def jump
-    jump_to_state :check_state
+
+class MouseWidget < Apotomo::Widget
+  def squeak
+    render :text => "squeak!"
+  end
+  def eating
+    render
   end
+  def eat
+    render
+  end
+  
 end
 
-
 # Enable dynamic states so we can do Cell.class_eval { def ... } at runtime.
 Apotomo::Widget.class_eval do
   def action_method?(*); true; end

data/test/unit/event_handler_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'apotomo/proc_event_handler'
 
 class EventHandlerTest < Test::Unit::TestCase
   include Apotomo::TestCaseMethods::TestController

data/test/unit/event_methods_test.rb

@@ -43,13 +43,25 @@ class EventMethodsTest < Test::Unit::TestCase
       @mum.respond_to_event :answer_squeak
       @mum.fire :answer_squeak
       assert_equal ['answer squeak'], @mum.list
+    end 
+    
+    should "make pass the event into the triggered state" do
+      @mum.instance_eval do
+        respond_to_event :footsteps
+          
+        def footsteps(evt)
+          list << evt
+        end
+      end
+      
+      @mum.trigger :footsteps, "near"
+      assert_kind_of Apotomo::Event, @mum.list.last
     end
     
     should "accept payload data for the event" do
       @mum.respond_to_event :answer_squeak
       @mum.instance_eval do
-        def answer_squeak
-          evt = @opts[:event]
+        def answer_squeak(evt)
           list << evt.data
         end
       end
@@ -60,26 +72,26 @@ class EventMethodsTest < Test::Unit::TestCase
     
     context "#responds_to_event in class context" do
       setup do
-        class AdultMouseCell < MouseCell
+        class AdultMouse < MouseWidget
           responds_to_event :peep, :with => :answer_squeak
         end
-        class BabyMouseCell < AdultMouseCell
+        class BabyMouse < AdultMouse
           responds_to_event :footsteps, :with => :squeak
         end
       end
       
       should "add the handlers at creation time" do
-        assert_equal [Apotomo::InvokeEventHandler.new(:widget_id => 'mum', :state => :answer_squeak)], AdultMouseCell.new(parent_controller, 'mum', :show).event_table.all_handlers_for(:peep, 'mum')
+        assert_equal [Apotomo::InvokeEventHandler.new(:widget_id => 'mum', :state => :answer_squeak)], AdultMouse.new(parent_controller, 'mum', :show).event_table.all_handlers_for(:peep, 'mum')
       end
       
       should "not inherit handlers for now" do
-        assert_equal [], BabyMouseCell.new(parent_controller, 'kid', :show).event_table.all_handlers_for(:peep, 'kid')
+        assert_equal [], BabyMouse.new(parent_controller, 'kid', :show).event_table.all_handlers_for(:peep, 'kid')
       end
       
       should "not add the same handler to each instance" do
-        assert_equal [Apotomo::InvokeEventHandler.new(:widget_id => 'mum', :state => :answer_squeak)], AdultMouseCell.new(parent_controller, 'mum', :show).event_table.all_handlers_for(:peep, 'mum')
+        assert_equal [Apotomo::InvokeEventHandler.new(:widget_id => 'mum', :state => :answer_squeak)], AdultMouse.new(parent_controller, 'mum', :show).event_table.all_handlers_for(:peep, 'mum')
         
-        assert_equal [Apotomo::InvokeEventHandler.new(:widget_id => 'dad', :state => :answer_squeak)], AdultMouseCell.new(parent_controller, 'dad', :show).event_table.all_handlers_for(:peep, 'dad')
+        assert_equal [Apotomo::InvokeEventHandler.new(:widget_id => 'dad', :state => :answer_squeak)], AdultMouse.new(parent_controller, 'dad', :show).event_table.all_handlers_for(:peep, 'dad')
       end
     end
     

data/test/unit/event_test.rb

@@ -17,6 +17,11 @@ class EventTest < Test::Unit::TestCase
       assert_equal({:volume => :loud}, @event.data)
     end
     
+    should "delegate #[] to data" do
+      @event = Apotomo::Event.new(:footsteps, 'mum', {:volume => :loud})
+      assert_equal :loud, @event[:volume]
+    end
+    
     should "complain when serialized" do
       assert_raises RuntimeError do
         Marshal.dump(Apotomo::Event.new(:footsteps, 'mum'))

data/test/unit/javascript_generator_test.rb

@@ -16,21 +16,21 @@ class JavascriptGeneratorTest < Test::Unit::TestCase
       should "respond to prototype" do
         assert_respond_to @gen, :prototype
       end
-    
-      should "respond to xhr" do
-        assert_equal "new Ajax.Request(\"/drink/beer?source=nick\")", @gen.xhr('/drink/beer?source=nick')
-      end
       
       should "respond to replace" do
         assert_equal "$(\"drinks\").replace(\"EMPTY!\")", @gen.replace(:drinks, 'EMPTY!')
       end
       
+      should "respond to replace_id" do
+        assert_equal "$(\"drinks\").replace(\"EMPTY!\")", @gen.replace_id("drinks", 'EMPTY!')
+      end
+      
       should "respond to update" do
         assert_equal "$(\"drinks\").update(\"<li id=\\\"beer\\\"><\\/li>\")", @gen.update(:drinks, '<li id="beer"></li>')
       end
       
-      should "respond to <<" do
-        assert_equal "alert(\"Beer!\")", @gen << 'alert("Beer!")'
+      should "respond to update_id" do
+        assert_equal "$(\"drinks\").update(\"EMPTY!\")", @gen.update_id("drinks", 'EMPTY!')
       end
     end
     
@@ -42,21 +42,21 @@ class JavascriptGeneratorTest < Test::Unit::TestCase
       should "respond to right" do
         assert_respond_to @gen, :right
       end
-    
-      should "respond to xhr" do
-        assert_equal "new Xhr(\"/drink/beer?source=nick\", {evalScripts:true}).send()", @gen.xhr('/drink/beer?source=nick')
-      end
       
       should "respond to replace" do
         assert_equal "$(\"drinks\").replace(\"EMPTY!\")", @gen.replace(:drinks, 'EMPTY!')
       end
       
+      should "respond to replace_id" do
+        assert_equal "$(\"drinks\").replace(\"EMPTY!\")", @gen.replace_id("drinks", 'EMPTY!')
+      end
+      
       should "respond to update" do
         assert_equal "$(\"drinks\").update(\"<li id=\\\"beer\\\"><\\/li>\")", @gen.update(:drinks, '<li id="beer"></li>')
       end
       
-      should "respond to <<" do
-        assert_equal "alert(\"Beer!\")", @gen << 'alert("Beer!")'
+      should "respond to update_id" do
+        assert_equal "$(\"drinks\").update(\"EMPTY!\")", @gen.update_id("drinks", 'EMPTY!')
       end
     end
     
@@ -69,20 +69,20 @@ class JavascriptGeneratorTest < Test::Unit::TestCase
         assert_respond_to @gen, :jquery
       end
     
-      should "respond to xhr" do
-        assert_equal "$.ajax({url: \"/drink/beer?source=nick\"})", @gen.xhr('/drink/beer?source=nick')
+      should "respond to replace" do
+        assert_equal "$(\"#drinks\").replaceWith(\"EMPTY!\")", @gen.replace("#drinks", 'EMPTY!')
       end
       
-      should "respond to replace" do
-        assert_equal "$(\"#drinks\").replaceWith(\"EMPTY!\")", @gen.replace(:drinks, 'EMPTY!')
+      should "respond to replace_id" do
+        assert_equal "$(\"#drinks\").replaceWith(\"EMPTY!\")", @gen.replace_id("drinks", 'EMPTY!')
       end
       
       should "respond to update" do
-        assert_equal "$(\"#drinks\").html(\"<li id=\\\"beer\\\"><\\/li>\")", @gen.update(:drinks, '<li id="beer"></li>')
+        assert_equal "$(\"#drinks\").html(\"<li id=\\\"beer\\\"><\\/li>\")", @gen.update("#drinks", '<li id="beer"></li>')
       end
       
-      should "respond to <<" do
-        assert_equal "alert(\"Beer!\")", @gen << 'alert("Beer!")'
+      should "respond to update_id" do
+        assert_equal "$(\"#drinks\").html(\"EMPTY!\")", @gen.update_id("drinks", 'EMPTY!')
       end
     end
   end

data/test/unit/render_test.rb

@@ -3,13 +3,13 @@ require 'test_helper'
 class RenderTest < ActionView::TestCase
   include Apotomo::TestCaseMethods::TestController
   
-  context "Rendering a single widget" do
+  context "#render" do
     setup do
-      @mum = mouse_mock
+      @mum = mouse_mock('mum', :eating)
     end
     
     should "per default display the state content framed in a div" do
-      assert_equal '<div id="mouse">burp!</div>', @mum.invoke(:eating)
+      assert_equal '<div id="mum">burp!</div>', @mum.invoke(:eating)
     end
     
     context "with :text" do
@@ -18,31 +18,16 @@ class RenderTest < ActionView::TestCase
       end
       
       should "render the :text" do
-        assert_equal "burp!!!", @mum.invoke
+        assert_equal "burp!!!", @mum.invoke(:eating)
       end
     end
     
-    
-    context "with :suppress_js" do
-      setup do
-        @mum.instance_eval do
-          def snuggle; render; end
-          self.class.send :attr_reader, :suppress_js
-        end
-      end
-      
-      should "per default be false" do
-        @mum.invoke :snuggle
-        assert !@mum.suppress_js
-      end
+    should "accept :state and options" do
+      @mum.instance_eval { def eat(what); render :text => "#{what} today?"; end }
       
-      should "be true when set" do
-        @mum.instance_eval do
-          def snuggle; render :suppress_js => true; end
-        end
-        @mum.invoke :snuggle
-        assert @mum.suppress_js
-      end
+      assert_equal "Rice today?", @mum.render({:state => :eat}, "Rice")
+      assert_match "Rice today?", @mum.update({:state => :eat}, "Rice")
+      assert_match "Rice today?", @mum.replace({:state => :eat}, "Rice")
     end
     
     should "expose its instance variables in the rendered view" do
@@ -57,21 +42,6 @@ class RenderTest < ActionView::TestCase
     end
     
     context "with #emit" do
-      setup do
-        @kid = mouse_mock('kid', :squeak)
-        @kid.instance_eval do
-          def squeak
-            render :text => "squeeeeaaak"
-          end
-          
-          def render(*)
-            @rendered = true
-            super
-          end
-          def rendered?; @rendered; end
-        end
-      end
-      
       context "and :text" do
         setup do
           @mum.instance_eval do
@@ -84,25 +54,6 @@ class RenderTest < ActionView::TestCase
         should "just return the plain :text" do
           assert_equal 'squeak();', @mum.invoke(:squeak)
         end
-        
-        should "not render children" do
-          @mum << @kid
-          @mum.invoke(:squeak)
-          
-          assert_not @kid.rendered?
-        end
-        
-        should "allow rendering children" do
-          @mum.instance_eval do
-            def squeak
-              emit :text => "squeak();", :render_children => true
-            end
-          end
-          @mum << @kid
-          @mum.invoke(:squeak)
-          
-          assert @kid.rendered?
-        end
       end
       
       context "and no options" do
@@ -115,13 +66,7 @@ class RenderTest < ActionView::TestCase
         end
         
         should "render the view" do
-          assert_equal "<div id=\"mouse\">burp!</div>",  @mum.invoke(:eating)
-        end
-        
-        should "render the children, too" do
-          @mum << @kid
-          @mum.invoke(:eating)
-          assert @kid.rendered?
+          assert_equal "<div id=\"mum\">burp!</div>",  @mum.invoke(:eating)
         end
       end
       
@@ -129,36 +74,25 @@ class RenderTest < ActionView::TestCase
         setup do
           @mum.instance_eval do
             def squeak
-              emit :view => :snuggle
+              emit :view => :eating
             end
           end
         end
         
         should "render the :view" do
-          assert_equal "<div id=\"mouse\"><snuggle></snuggle></div>\n", @mum.invoke(:squeak)
-        end
-        
-        should "render the children" do
-          @mum << @kid
-          
-          assert_equal "<div id=\"mouse\"><snuggle>squeeeeaaak</snuggle></div>\n", @mum.invoke(:squeak)
-          assert @kid.rendered?
+          assert_equal "<div id=\"mum\">burp!</div>", @mum.invoke(:squeak)
         end
       end
     end
     
     context "with #update" do
-      setup do
-        Apotomo.js_framework = :prototype
-      end
-      
       should "wrap the :text in an update statement" do
         @mum.instance_eval do
           def squeak
             update :text => "squeak!"
           end
         end
-        assert_equal "$(\"mouse\").update(\"squeak!\")", @mum.invoke(:squeak)
+        assert_equal "$(\"#mum\").html(\"squeak!\")", @mum.invoke(:squeak)
       end
       
       should "accept :selector" do
@@ -167,22 +101,18 @@ class RenderTest < ActionView::TestCase
             update :text => '<div id="mum">squeak!</div>', :selector => "div#mouse"
           end
         end
-        assert_equal "$(\"div#mouse\").update(\"<div id=\\\"mum\\\">squeak!<\\/div>\")", @mum.invoke(:squeak)
+        assert_equal "$(\"div#mouse\").html(\"<div id=\\\"mum\\\">squeak!<\\/div>\")", @mum.invoke(:squeak)
       end
     end
     
     context "with #replace" do
-      setup do
-        Apotomo.js_framework = :prototype
-      end
-      
       should "wrap the :text in a replace statement" do
         @mum.instance_eval do
           def squeak
             replace :text => '<div id="mum">squeak!</div>'
           end
         end
-        assert_equal "$(\"mouse\").replace(\"<div id=\\\"mum\\\">squeak!<\\/div>\")", @mum.invoke(:squeak)
+        assert_equal "$(\"#mum\").replaceWith(\"<div id=\\\"mum\\\">squeak!<\\/div>\")", @mum.invoke(:squeak)
       end
       
       should "accept :selector" do
@@ -191,33 +121,8 @@ class RenderTest < ActionView::TestCase
             replace :text => '<div id="mum">squeak!</div>', :selector => "div#mouse"
           end
         end
-        assert_equal "$(\"div#mouse\").replace(\"<div id=\\\"mum\\\">squeak!<\\/div>\")", @mum.invoke(:squeak)
+        assert_equal "$(\"div#mouse\").replaceWith(\"<div id=\\\"mum\\\">squeak!<\\/div>\")", @mum.invoke(:squeak)
       end
     end
-  end
-  
-  context "rendering a widget family" do
-    setup do
-      @mum = mouse_mock('mum', :snuggle) do
-        def snuggle; render; end
-      end
-      
-      @mum << @kid = mouse_mock('kid')
-    end
-    
-    should "per default render kid's content inside mums div with rendered_children" do
-      assert_equal "<div id=\"mum\"><snuggle><div id=\"kid\">burp!</div></snuggle></div>\n", @mum.invoke(:snuggle)
-    end
-    
-    should "skip kids if :render_children=>false but still provide a rendered_children hash" do
-      @mum.instance_eval do
-        def snuggle; render :render_children => false; end
-      end
-      
-      assert_equal "<div id=\"mum\"><snuggle></snuggle></div>\n", @mum.invoke(:snuggle)
-    end
-     
-    should_eventually "provide an ordered rendered_children hash"
-  end
-  
+  end  
 end