cells 3.8.6 → 3.8.7

data/test/rails/capture_test.rb

@@ -1,22 +1,41 @@
 require 'test_helper'
 
-class ProducerCell < Cell::Base
-  helper ::Cells::Helpers::CaptureHelper
+class ProducerCell < Cell::Rails
+  #helper ::Cells::Helpers::CaptureHelper
   
-  def logger(*args); puts args.inspect; end
 end
 
 class RailsCaptureTest < ActionController::TestCase
-  context "A Rails controller rendering cells" do
-    setup do
-      @routes = ActionDispatch::Routing::RouteSet.new
-      @routes.draw do
-        |map| match ':action', :to => MusicianController
+  tests MusicianController
+
+  test "#content_for" do
+    @controller.class_eval do
+      def featured
+        
+        render :inline => '<%= render_cell(:producer, :content_for, self) %><pre><%= yield :recorded %></pre>'
       end
-      @controller = MusicianController.new
     end
     
-    should "see content from global_capture" do
+    ProducerCell.class_eval do
+      def content_for(tpl); 
+puts tpl
+@tpl = tpl
+
+        render; end
+
+      def global_content_for(*args, &block)
+        @tpl.content_for(*args, &block)
+      end
+      helper_method :global_content_for
+    end
+     
+    get 'featured'
+    assert_equal "\n<pre>DummDooDiiDoo</pre>", @response.body
+  end
+
+
+  describe "what" do
+    it "see content from global_capture" do
       @controller.class_eval do
         def featured
           render :inline => '<h3><%= @recorded %></h3>' << render_cell(:producer, :capture)
@@ -32,7 +51,7 @@ class RailsCaptureTest < ActionController::TestCase
     end
     
     
-    should "see yieldable content from global_content_for" do
+    it "see yieldable content from global_content_for" do
       @controller.class_eval do
         def featured
           render_cell(:producer, :content_for)

data/test/rails/cells_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RailsCellsTest < ActiveSupport::TestCase
+class RailsCellsTest < MiniTest::Spec
   include Cell::TestCase::TestMethods
   
   def swap(object, new_values)
@@ -16,8 +16,8 @@ class RailsCellsTest < ActiveSupport::TestCase
     end
   end
   
-  context "#render_state" do
-    should "work without args" do
+  describe "#render_state" do
+    it "work without args" do
       BassistCell.class_eval do
         def listen
           render :text => "That's a D!"
@@ -26,7 +26,7 @@ class RailsCellsTest < ActiveSupport::TestCase
       assert_equal "That's a D!", cell(:bassist).render_state(:listen)
     end
     
-    should "accept state-args" do
+    it "accept state-args" do
       BassistCell.class_eval do
         def listen(args)
           render :text => args[:note]
@@ -35,7 +35,7 @@ class RailsCellsTest < ActiveSupport::TestCase
       assert_equal "D", cell(:bassist).render_state(:listen, :note => "D")
     end
     
-    should "accept state-args with default parameters" do
+    it "accept state-args with default parameters" do
       BassistCell.class_eval do
         def listen(first, second="D")
           render :text => first+second
@@ -46,15 +46,15 @@ class RailsCellsTest < ActiveSupport::TestCase
   end
   
   
-  context "A rails cell" do
-    should "respond to DEFAULT_VIEW_PATHS" do
+  describe "A rails cell" do
+    it "respond to DEFAULT_VIEW_PATHS" do
       assert_equal ["app/cells"], Cell::Rails::DEFAULT_VIEW_PATHS
     end
     
-    should "respond to .setup_view_paths!" do
+    it "respond to .setup_view_paths!" do
       swap( Cell::Rails, :view_paths => [])  do
         Cell::Rails.setup_view_paths!
-        if Cell.rails3_2_or_more?
+        if Cell.rails3_2_or_more? or Cell.rails4_0_or_more?
           assert_equal ActionView::PathSet.new(Cell::Rails::DEFAULT_VIEW_PATHS).paths, Cell::Rails.view_paths.paths
         else
           assert_equal ActionView::PathSet.new(Cell::Rails::DEFAULT_VIEW_PATHS), Cell::Rails.view_paths
@@ -62,28 +62,28 @@ class RailsCellsTest < ActiveSupport::TestCase
       end
     end
     
-    should "respond to view_paths" do
+    it "respond to view_paths" do
       assert_kind_of ActionView::PathSet, Cell::Rails.view_paths, "must be a PathSet for proper template caching/reloading (see issue#2)"
     end
     
-    should "respond to view_paths=" do
+    it "respond to view_paths=" do
       swap( Cell::Rails, :view_paths => ['you', 'are', 'here'])  do
         assert_kind_of ActionView::PathSet, Cell::Rails.view_paths, "must not wipe out the PathSet"
       end
     end
     
-    should "respond to #request" do
+    it "respond to #request" do
       assert_equal @request, cell(:bassist).request
     end
     
-    should "respond to #config" do
+    it "respond to #config" do
       assert_equal({}, cell(:bassist).config)
     end
     
     
     if Cell.rails3_0?
-      context "invoking find_family_view_for_state" do
-        should "raise an error when a template is missing" do
+      describe "invoking find_family_view_for_state" do
+        it "raise an error when a template is missing" do
           assert_raises ActionView::MissingTemplate do
             cell(:bassist).find_template("bassist/playyy")
           end
@@ -91,39 +91,40 @@ class RailsCellsTest < ActiveSupport::TestCase
           #puts "format: #{cell(:bassist).find_template("bassist/play.js").formats.inspect}"
         end
         
-        should "return play.html.erb" do
+        it "return play.html.erb" do
           assert_equal "bassist/play", cell(:bassist).send(:find_family_view_for_state, :play).virtual_path
         end
         
-        should "find inherited play.html.erb" do
+        it "find inherited play.html.erb" do
           assert_equal "bassist/play", cell(:bad_guitarist).send(:find_family_view_for_state, :play).virtual_path
         end
       end
     end
     
-    context "delegation" do
-      setup do
+    describe "delegation" do
+      before do
         @request.env["action_dispatch.request.request_parameters"] = {:song => "Creatures"}
         @controller = Class.new(ActionController::Base).new
         @controller.request = @request
         @cell = cell(:bassist)
       end
       
-      should_eventually "delegate log" do
+      it "delegate log" do
+        skip
         assert_nothing_raised do
           cell(:bassist).class.logger.info("everything is perfect!")
         end
       end
       
-      should "respond to session" do
+      it "respond to session" do
         assert_kind_of Hash, @cell.session
       end
           
-      should "respond to #params and return the request parameters" do
+      it "respond to #params and return the request parameters" do
         assert_equal({"song" => "Creatures"}, cell(:bassist).params)
       end
       
-      should "not merge #params and #options" do
+      it "not merge #params and #options" do
         assert_equal({"song" => "Creatures"}, cell(:bassist, "song" => "Lockdown").params)
       end
     end

data/test/rails/integration_test.rb

@@ -3,13 +3,13 @@ require 'test_helper'
 class RailsIntegrationTest < ActionController::TestCase
   tests MusicianController
   
-  context "A Rails controller" do
-    should "respond to #render_cell" do
+  describe "A Rails controller" do
+    it "respond to #render_cell" do
       get 'promotion'
       assert_equal "That's me, naked <img alt=\"Me\" src=\"/images/me.png\" />", @response.body
     end
     
-    should "respond to #render_cell with arbitrary options" do
+    it "respond to #render_cell with arbitrary options" do
       BassistCell.class_eval do
         def enjoy(what, where="the bar")
           render :text => "I like #{what} in #{where}."
@@ -25,13 +25,13 @@ class RailsIntegrationTest < ActionController::TestCase
       assert_equal "I like The Stranglers in my room.", @response.body
     end
     
-    should "be able to pass a block to #render_cell" do
+    it "be able to pass a block to #render_cell" do
       get 'promotion_with_block'
       assert_equal "Doo",       @response.body
       assert_equal BassistCell, @controller.flag
     end
     
-    should "respond to render_cell in the view without escaping twice" do
+    it "respond to render_cell in the view without escaping twice" do
       BassistCell.class_eval do
         def provoke; render; end
       end
@@ -39,12 +39,12 @@ class RailsIntegrationTest < ActionController::TestCase
       assert_equal "That's me, naked <img alt=\"Me\" src=\"/images/me.png\" />", @response.body
     end
     
-    should "respond to render_cell with a block in the view" do
+    it "respond to render_cell with a block in the view" do
       get 'featured_with_block'
       assert_equal "Doo from BassistCell\n", @response.body
     end
     
-    should "respond to render_cell in a haml view" do
+    it "respond to render_cell in a haml view" do
       BassistCell.class_eval do
         def provoke; render; end
       end
@@ -52,7 +52,7 @@ class RailsIntegrationTest < ActionController::TestCase
       assert_equal "That's me, naked <img alt=\"Me\" src=\"/images/me.png\" />\n", @response.body
     end
     
-    should "make params (and friends) available in a cell" do
+    it "make params (and friends) available in a cell" do
       BassistCell.class_eval do
         def listen
           render :text => "That's a #{params[:note]}"
@@ -62,7 +62,7 @@ class RailsIntegrationTest < ActionController::TestCase
       assert_equal "That's a D", @response.body
     end
     
-    should "respond to #config" do
+    it "respond to #config" do
       BassistCell.class_eval do
         def listen
           render :view => 'contact_form'  # form_tag internally calls config.allow_forgery_protection

data/test/rails/render_test.rb

@@ -1,38 +1,39 @@
 require 'test_helper'
 
-class RailsRenderTest < ActiveSupport::TestCase
+class RailsRenderTest < MiniTest::Spec
   include Cell::TestCase::TestMethods
   
-  context "Invoking render" do
-    should "render a plain view" do
+  describe "Invoking render" do
+    it "render a plain view" do
       BassistCell.class_eval do
         def play; render; end
       end
       assert_equal "Doo", render_cell(:bassist, :play)
     end
     
-    should "accept :format" do
+    it "accept :format" do
       BassistCell.class_eval do
         def play; render :format => :js; end
       end
       assert_equal "alert(\"Doo\");\n", render_cell(:bassist, :play)
     end
     
-    should_eventually "accept :format without messing up following render calls" do
+    it "accept :format without messing up following render calls" do
+      skip
       BassistCell.class_eval do
         def play; render(:format => :js) + render; end
       end
       assert_equal "alert(\"Doo\");\nDoo\n", render_cell(:bassist, :play)
     end
     
-    should "also render alternative engines, like haml" do
+    it "also render alternative engines, like haml" do
       BassistCell.class_eval do
         def sing; render; end
       end
       assert_equal "<h1>Laaa</h1>\n", render_cell(:bassist, :sing)
     end
     
-    should "accept the :nothing option" do
+    it "accept the :nothing option" do
       BassistCell.class_eval do
         def sleep; render :nothing => true; end
       end
@@ -40,14 +41,14 @@ class RailsRenderTest < ActiveSupport::TestCase
     end
     
     
-    should "accept the :view option" do
+    it "accept the :view option" do
       BassistCell.class_eval do
         def solo; render :view => :play; end
       end
       assert_equal "Doo", render_cell(:bassist, :solo)
     end
     
-    should "accept the :text options" do
+    it "accept the :text options" do
       BassistCell.class_eval do
         def sing; render :text => "Shoobie"; end
       end
@@ -55,14 +56,14 @@ class RailsRenderTest < ActiveSupport::TestCase
       assert render_cell(:bassist, :sing).html_safe?
     end
     
-    should "accept the :inline option" do
+    it "accept the :inline option" do
       BassistCell.class_eval do
         def sleep; render :inline => "<%= 'Snooore' %>"; end
       end
       assert_equal "Snooore", render_cell(:bassist, :sleep)
     end
     
-    should "accept the :state option with state-args" do
+    it "accept the :state option with state-args" do
       BassistCell.class_eval do
         def listen(band, song)
           render :text => "Listening to #{band}: #{song}"
@@ -80,7 +81,7 @@ class RailsRenderTest < ActiveSupport::TestCase
       assert_equal "Listening to Belvedere", render_cell(:bassist, :groove)
     end
     
-    should "accept the :state option" do
+    it "accept the :state option" do
       BassistCell.class_eval do
         def play; render; end
         def groove; render :state => :play; end
@@ -88,7 +89,7 @@ class RailsRenderTest < ActiveSupport::TestCase
       assert_equal "Doo", render_cell(:bassist, :groove)
     end
     
-    should "accept the :locals option" do
+    it "accept the :locals option" do
       BassistCell.class_eval do
         def ahem; render :locals => {:times => 2}; end
       end
@@ -97,14 +98,14 @@ class RailsRenderTest < ActiveSupport::TestCase
     
     
     # layout
-    should "accept the :layout option" do
+    it "accept the :layout option" do
       BassistCell.class_eval do
         def play; render :layout => 'b'; end
       end
       assert_equal "<b>Doo</b>", render_cell(:bassist, :play)
     end
     
-    should "respect the #layout class method" do
+    it "respect the #layout class method" do
       puts 
       class VanHalenBassistCell < BassistCell
         layout 'b'
@@ -113,29 +114,32 @@ class RailsRenderTest < ActiveSupport::TestCase
       assert_equal "<b>Doo</b>", render_cell("rails_render_test/van_halen_bassist", :play)
     end
     
-    should "raise an error for a non-existent template" do
+    it "raise an error for a non-existent template" do
       BassistCell.class_eval do
         def groove; render; end
       end
       
-      assert_raises ActionView::MissingTemplate do
+      exception = ActionView::MissingTemplate
+      exception = Cell::VersionStrategy::MissingTemplate if Cell.rails3_0?
+
+      assert_raises exception do
         render_cell(:bassist, :groove)
       end
     end
     
-    should "raise an error for a non-existent template" do
+    it "raise an error for a non-existent template" do
       BadGuitaristCell.class_eval do
         def groove; render; end
       end
       
       if Cell.rails3_0?
-        e = assert_raise Cell::Rails::MissingTemplate do
+        e = assert_raises Cell::Rails::MissingTemplate do
           render_cell(:bad_guitarist, :groove)
         end
         
         assert_includes e.message, "Missing template bassist/groove with {:handlers=>[:erb, :rjs, :builder, :rhtml, :rxml, :haml], :formats=>[:html, :text, :js, :css, :ics, :csv, :xml, :rss, :atom, :yaml, :multipart_form, :url_encoded_form, :json], :locale=>[:en, :en]} in view paths"
       else  # >= 3.1
-        e = assert_raise ActionView::MissingTemplate do
+        e = assert_raises ActionView::MissingTemplate do
           render_cell(:bad_guitarist, :groove)
         end
         
@@ -143,7 +147,7 @@ class RailsRenderTest < ActiveSupport::TestCase
       end
     end
     
-    should "render instance variables from the cell" do
+    it "render instance variables from the cell" do
       BassistCell.class_eval do
         def slap
           @note = "D"; render
@@ -152,7 +156,7 @@ class RailsRenderTest < ActiveSupport::TestCase
       assert_equal "Boing in D", render_cell(:bassist, :slap)
     end
     
-    should "allow subsequent calls to render in the rendered view" do
+    it "allow subsequent calls to render in the rendered view" do
       BassistCell.class_eval do
         def jam; @chords = [:a, :c]; render; end
         def sing; render; end
@@ -160,7 +164,7 @@ class RailsRenderTest < ActiveSupport::TestCase
       assert_equal "<h1>Laaa</h1>\n\n<h1>Laaa</h1>\n\n", render_cell(:bassist, :jam)
     end
     
-    should "allow multiple calls to render" do
+    it "allow multiple calls to render" do
       BassistCell.class_eval do
         def sing; render + render + render; end
       end
@@ -168,7 +172,7 @@ class RailsRenderTest < ActiveSupport::TestCase
     end
     
     # inheriting
-    should "inherit play.html.erb from BassistCell" do
+    it "inherit play.html.erb from BassistCell" do
       BassistCell.class_eval do
         def play; render; end
       end
@@ -176,9 +180,9 @@ class RailsRenderTest < ActiveSupport::TestCase
     end
   end
   
-  context "A cell view" do
+  describe "A cell view" do
     # rails view api
-    should "allow calls to params/response/..." do
+    it "allow calls to params/response/..." do
       BassistCell.class_eval do
         def pose; render; end
       end