test/test_case_test.rb in apotomo-1.2.5 vs test/test_case_test.rb in apotomo-1.2.6

@@ -1,43 +1,43 @@
 require 'test_helper'
 require 'apotomo/test_case'
 
-class TestCaseTest < MiniTest::Spec
+class CommentsWidget < Apotomo::Widget
+end
 
-  class CommentsWidgetTest < Apotomo::TestCase
-  end
+class CommentsWidgetTest < Apotomo::TestCase
+end
 
-  class CommentsWidget < Apotomo::Widget
-  end
+class MouseWidgetTest < Apotomo::TestCase
+end
 
+class TestCaseTest < MiniTest::Spec
   describe "TestCase" do
-
     describe "responding to #root" do
-      class MouseWidgetTest < Apotomo::TestCase
-      end
-
       before do
         @klass = MouseWidgetTest
-        @test = @klass.new(:widget).tap{ |t| t.setup }
-        @klass.has_widgets { |r| r << widget(:mouse, 'mum', :eating) }
+        @test = @klass.new(:widget).tap { |t| t.setup }
+        @klass.has_widgets do |root|
+          root << widget(:mouse, 'mum', :eating)
+        end
       end
 
       it "respond to #root" do
-        assert_equal ['root', 'mum'], @test.root.collect { |w| w.name }
+        assert_equal ['root', 'mum'], @test.root.collect(&:name)
       end
 
       it "raise an error if no has_widgets block given" do
         exc = assert_raises RuntimeError do
-          @test = Class.new(Apotomo::TestCase).new(:widget).tap{ |t| t.setup }
+          @test = Class.new(Apotomo::TestCase).new(:widget).tap { |t| t.setup }
           @test.root
         end
-
         assert_equal "Please setup a widget tree using has_widgets()", exc.message
       end
 
+      # TODO: needed? why root but not self?
       it "memorize root" do
-        @test.root.visible=false
+        @test.root.visible = false
         assert_equal false, @test.root.visible?
       end
 
       it "respond to #render_widget" do
         assert_equal "<div id=\"mum\">burp!</div>\n", @test.render_widget('mum', :eat)
@@ -46,22 +46,23 @@
 
       it "respond to #assert_select" do
         @test.render_widget('mum', :eat)
 
         @test.assert_select("div#mum", "burp!")
-
-        exc = assert_raises( MiniTest::Assertion){  @test.assert_select("div#mummy", "burp!"); }
-        assert_match /Expected at least 1 element matching "div#mummy", found 0/, exc.message
+        exc = assert_raises MiniTest::Assertion do
+          @test.assert_select("div#mummy", "burp!")
+        end
+        assert_match "Expected at least 1 element matching \"div#mummy\", found 0", exc.message
       end
 
       describe "using events" do
         before do
           @mum = @test.root['mum']
           @mum.respond_to_event :footsteps, :with => :squeak
           @mum.instance_eval do
             def squeak(evt)
-              render :text => evt.data  # this usually leads to "{}".
+              render :text => evt.data
             end
           end
         end
 
         it "respond to #trigger" do
@@ -72,17 +73,19 @@
           assert_equal(["{:direction=>:kitchen}"] , @test.trigger(:footsteps, 'mum', :direction => :kitchen))
         end
 
         it "respond to #assert_response" do
           @test.trigger(:footsteps, 'mum')
+
           assert @test.assert_response("{}")
         end
       end
 
       describe "#view_assigns" do
         it "be emtpy when nothing was set" do
           @test.render_widget('mum')
+
           assert_equal({}, @test.view_assigns)
         end
 
         it "return the instance variables from the last #render_widget" do
           @mum = @test.root['mum']
@@ -90,25 +93,19 @@
             def sleep
               @duration = "8h"
             end
           end
           @test.render_widget('mum', :sleep)
+
           assert_equal({:duration => "8h"}, @test.view_assigns)
         end
       end
     end
 
-    describe "responding to parent_controller" do
-      before do
-        @test = Apotomo::TestCase.new(:widget).tap{ |t| t.setup }
-      end
+    it "respond to #parent_controller and return a controller with correct #controller_path" do
+      @test = Apotomo::TestCase.new(:widget).tap { |t| t.setup }
 
-      it "provide a test controller" do
-        assert_kind_of ActionController::Base, @test.parent_controller
-      end
-
-      it "respond to #controller_path" do
-        assert_equal "barn", @test.parent_controller.controller_path
-      end
+      assert_kind_of ActionController::Base, @test.parent_controller
+      assert_equal "barn", @test.parent_controller.controller_path
     end
   end
 end