spontaneous 0.2.0.beta1 → 0.2.0.beta2

data/test/unit/test_piece.rb

@@ -3,94 +3,86 @@
 require File.expand_path('../../test_helper', __FILE__)
 
 
-class PieceTest < MiniTest::Spec
+describe "Piece" do
 
-  def setup
+  before do
     @site = setup_site
+    Content.delete
+    class ::Fridge < ::Piece; end
   end
 
-  def teardown
+  after do
+    Object.send(:remove_const, :Fridge) rescue nil
     teardown_site
   end
 
-  context "Pieces" do
-    setup do
-      Content.delete
-      class ::Fridge < ::Piece; end
+  it "not be pages" do
+    refute Piece.new.page?
+  end
+
+  describe "as page content" do
+    before do
+      ::Page.box :things
+      ::Piece.box :things
+      @page = ::Page.create
+      @f1 = ::Piece.new
+      @page.things << @f1
+      @f2 = ::Piece.new
+      @f1.things << @f2
+      @f3 = ::Fridge.new
+      @f2.things << @f3
+
+      @page.save
+      @f1.save
+      @f2.save
+      @f3.save
+
+      @page = ::Page[@page.id]
+      @f1 = ::Piece[@f1.id]
+      @f2 = ::Piece[@f2.id]
+      @f3 = Content[@f3.id]
+    end
+
+    it "have a link to the page" do
+      @f1.page.must_equal @page
+      @f2.page.must_equal @page
+      @f3.page.must_equal @page
+    end
+
+    it "have a link to their box" do
+      @f1.container.must_equal @page.things
+      @f2.container.must_equal @f1.things
+      @f3.container.must_equal @f2.things
+    end
+
+    it "have a link to their owner" do
+      @f1.owner.must_equal @page
+      @f2.owner.must_equal @f1
+      @f3.owner.must_equal @f2
+      @f1.parent.must_equal @page
+      @f2.parent.must_equal @f1
+      @f3.parent.must_equal @f2
+    end
+
+    it "return themselves as content_instance" do
+      @f2.content_instance.must_equal @f2
     end
 
-    teardown do
-      Object.send(:remove_const, :Fridge) rescue nil
+    it "know their depth in the piece tree" do
+      @f1.depth.must_equal 1
+      @f2.depth.must_equal 2
+      @f3.depth.must_equal 3
     end
 
-    should "not be pages" do
-      Piece.new.page?.should be_false
+    it "be available from their containing page" do
+      @page.content.length.must_equal 3
+      Set.new(@page.content).must_equal Set.new([@f1, @f2, @f3])
+      Set.new(@page.content.map(&:class)).must_equal Set.new([::Piece, ::Piece, Fridge])
     end
 
-    context "as page content" do
-      setup do
-        ::Page.box :things
-        ::Piece.box :things
-        @page = ::Page.create
-        @f1 = ::Piece.new
-        @page.things << @f1
-        @f2 = ::Piece.new
-        @f1.things << @f2
-        @f3 = ::Fridge.new
-        @f2.things << @f3
-
-        @page.save
-        @f1.save
-        @f2.save
-        @f3.save
-
-        @page = ::Page[@page.id]
-        @f1 = ::Piece[@f1.id]
-        @f2 = ::Piece[@f2.id]
-        @f3 = Content[@f3.id]
-      end
-
-      should "have a link to the page" do
-        @f1.page.should == @page
-        @f2.page.should == @page
-        @f3.page.should == @page
-      end
-
-      should "have a link to their box" do
-        @f1.container.should == @page.things
-        @f2.container.should == @f1.things
-        @f3.container.should == @f2.things
-      end
-
-      should "have a link to their owner" do
-        @f1.owner.should == @page
-        @f2.owner.should == @f1
-        @f3.owner.should == @f2
-        @f1.parent.should == @page
-        @f2.parent.should == @f1
-        @f3.parent.should == @f2
-      end
-
-      should "return themselves as content_instance" do
-        @f2.content_instance.should == @f2
-      end
-
-      should "know their depth in the piece tree" do
-        @f1.depth.should == 1
-        @f2.depth.should == 2
-        @f3.depth.should == 3
-      end
-
-      should "be available from their containing page" do
-        @page.content.length.should == 3
-        Set.new(@page.content).should == Set.new([@f1, @f2, @f3])
-        Set.new(@page.content.map(&:class)).should == Set.new([::Piece, ::Piece, Fridge])
-      end
-
-      should "have a link to their pieces" do
-        @f1.entry.should == @page.contents.first
-        @f2.entry.should == @page.contents.first.contents.first
-      end
+    it "have a link to their pieces" do
+      @f1.entry.must_equal @page.contents.first
+      @f2.entry.must_equal @page.contents.first.contents.first
     end
   end
 end

data/test/unit/test_plugins.rb

@@ -2,17 +2,13 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class PluginsTest < MiniTest::Spec
-  include ::Rack::Test::Methods
+describe "Plugins" do
+  include RackTestMethods
 
 
-  def self.startup
-    # @revision_root = "#{Dir.mktmpdir}/spontaneous-tests/#{Time.now.to_i}"
-    # `mkdir -p #{@revision_root}/public`
-
+  start do
     @site = setup_site
 
-
     ::Page.box :box1
     klass =  Class.new(::Page) do
       layout :from_plugin
@@ -27,10 +23,9 @@ class PluginsTest < MiniTest::Spec
     plugin = Spontaneous.instance.load_plugin plugin_dir
     plugin.init!
     plugin.load!
-
   end
 
-  def self.shutdown
+  finish do
     Object.send(:remove_const, :LocalPage) rescue nil
     Object.send(:remove_const, :LocalPiece) rescue nil
     teardown_site
@@ -40,108 +35,106 @@ class PluginsTest < MiniTest::Spec
     Spontaneous::Rack.application
   end
 
-  context "Plugins:" do
 
-    setup do
-      S::Site.background_mode = :immediate
-      S::State.delete
-      Content.delete
-      @site = Spontaneous.instance
-      page = ::Page.new
-      page.save
+  before do
+    S::Site.background_mode = :immediate
+    S::State.delete
+    Content.delete
+    @site = Spontaneous.instance
+    page = ::Page.new
+    page.save
 
-    end
+  end
 
-    teardown do
-      S::State.delete
-      Content.delete
-    end
+  after do
+    S::State.delete
+    Content.delete
+  end
 
-    should "load their init.rb file" do
-      $set_in_init.should be_true
+  it "load their init.rb file" do
+    assert $set_in_init
+  end
+
+  describe "with static files" do
+    before do
+      @static = %w(css/plugin.css js/plugin.js subdir/image.gif static.html)
     end
 
-    context "with static files" do
-      setup do
-        @static = %w(css/plugin.css js/plugin.js subdir/image.gif static.html)
+    it "be able to provide them under their namespace in editing mode" do
+      Spontaneous.mode = :back
+      @static.each do |file|
+        get "/schema_plugin/#{file}"
+        assert last_response.ok?, "Static file /schema_plugin/#{file} returned error code #{last_response.status}"
+        last_response.body.must_equal File.basename(file) + "\n"
       end
+    end
 
-      should "be able to provide them under their namespace in editing mode" do
-        Spontaneous.mode = :back
-        @static.each do |file|
-          get "/schema_plugin/#{file}"
-          assert last_response.ok?, "Static file /schema_plugin/#{file} returned error code #{last_response.status}"
-          last_response.body.should == File.basename(file) + "\n"
-        end
-      end
-
-      should "be able to provide them under their namespace in public mode" do
-        Spontaneous.mode = :front
-        @static.each do |file|
-          get "/schema_plugin/#{file}"
-          assert last_response.ok?, "Static file /schema_plugin/#{file} returned error code #{last_response.status}"
-          last_response.body.should == File.basename(file) + "\n"
-        end
+    it "be able to provide them under their namespace in public mode" do
+      Spontaneous.mode = :front
+      @static.each do |file|
+        get "/schema_plugin/#{file}"
+        assert last_response.ok?, "Static file /schema_plugin/#{file} returned error code #{last_response.status}"
+        last_response.body.must_equal File.basename(file) + "\n"
       end
+    end
 
-      should "look for and parse sass templates" do
-        Spontaneous.mode = :back
-        get "/schema_plugin/subdir/sass.css"
-        assert last_response.ok?, "Static file /schema_plugin/subdir/sass.css returned error code #{last_response.status}"
-        last_response.body.should =~ /^\s+color: #005a55;/
-        last_response.body.should =~ /^\s+padding: 42px;/
-      end
+    it "look for and parse sass templates" do
+      Spontaneous.mode = :back
+      get "/schema_plugin/subdir/sass.css"
+      assert last_response.ok?, "Static file /schema_plugin/subdir/sass.css returned error code #{last_response.status}"
+      last_response.body.must_match /^\s+color: #005a55;/
+      last_response.body.must_match /^\s+padding: 42px;/
+    end
 
-      context "during publishing" do
-        setup do
-          Content.delete_revision(1) rescue nil
+    describe "during publishing" do
+      before do
+        Content.delete_revision(1) rescue nil
 
-          Spontaneous.logger.silent! {
-            S::Site.publish_all
-          }
-        end
+        Spontaneous.logger.silent! {
+          S::Site.publish_all
+        }
+      end
 
-        teardown do
-          FileUtils.rm_rf(@revision_root) rescue nil
-          Content.delete
-          S::State.delete
-          Content.delete_revision(1)
-        end
+      after do
+        FileUtils.rm_rf(@revision_root) rescue nil
+        Content.delete
+        S::State.delete
+        Content.delete_revision(1)
+      end
 
-        should "have their public files copied into the revision sandbox" do
-          @static.each do |file|
-            path = File.join(@site.revision_root, '00001', 'public', 'schema_plugin', file)
-            assert File.exists?(path), "File '#{path}' should exist"
-          end
+      it "have their public files copied into the revision sandbox" do
+        @static.each do |file|
+          path = File.join(@site.revision_root, '00001', 'public', 'schema_plugin', file)
+          assert File.exists?(path), "File '#{path}' should exist"
         end
+      end
 
-        should "have their SASS & Less templates rendered to static css" do
-          sass_files =['subdir/sass.css']
-          sass_files.each do |file|
-            path = File.join(@site.revision_root, '00001', 'public', 'schema_plugin', file)
-            assert File.exists?(path), "File '#{path}' should exist"
-            css = File.read(path)
-            css.should =~ /color:#005a55;?/
-            css.should =~ /padding:42px;?/
-          end
+      it "have their SASS & Less templates rendered to static css" do
+        sass_files =['subdir/sass.css']
+        sass_files.each do |file|
+          path = File.join(@site.revision_root, '00001', 'public', 'schema_plugin', file)
+          assert File.exists?(path), "File '#{path}' should exist"
+          css = File.read(path)
+          css.must_match /color:#005a55;?/
+          css.must_match /padding:42px;?/
         end
       end
     end
+  end
 
 
-    # context "Functional plugins" do
-    #   # do I need anything here?
-    # end
+  # describe "Functional plugins" do
+  #   # do I need anything here?
+  # end
 
-    context "with schemas" do
-      should "make content classes available to rest of app" do
-        defined?(::SchemaPlugin).should == "constant"
-        ::SchemaPlugin::External.fields.length.should == 1
-        page  = ::Page.new
-        piece = ::SchemaPlugin::External.new(:a => "A Field")
-        page.box1 << piece
-        piece.render.should == "plugins/templates/external.html.cut\n"
-      end
+  describe "with schemas" do
+    it "make content classes available to rest of app" do
+      defined?(::SchemaPlugin).must_equal "constant"
+      ::SchemaPlugin::External.fields.length.must_equal 1
+      page  = ::Page.new
+      piece = ::SchemaPlugin::External.new(:a => "A Field")
+      page.box1 << piece
+      piece.render.must_equal "plugins/templates/external.html.cut\n"
     end
   end
 end