test/unit/test_content.rb in spontaneous-0.2.0.alpha7 vs test/unit/test_content.rb in spontaneous-0.2.0.beta1

@@ -5,46 +5,45 @@
 
 class ContentTest < MiniTest::Spec
   context "Content:" do
     setup do
       @site = setup_site
-      class Piece < Spontaneous::Piece; end
-      class Page < Spontaneous::Page; end
-      class C < Piece; end
-      class P < Page; end
+      # class Piece < Spontaneous::Piece; end
+      # class Page < Spontaneous::Page; end
+      class C < ::Piece; end
+      class P < ::Page; end
       C.box :things
       P.box :box1
       P.box :box2
     end
 
     teardown do
-      teardown_site
-      ContentTest.send(:remove_const, :Piece) rescue nil
-      ContentTest.send(:remove_const, :Page) rescue nil
       ContentTest.send(:remove_const, :C) rescue nil
       ContentTest.send(:remove_const, :P) rescue nil
+      teardown_site
     end
 
     context "Content instances" do
       should "evaluate instance code" do
         @instance = C.create({
           :instance_code => "def monkey; 'magic'; end"
         })
         @instance.monkey.should == 'magic'
         id = @instance.id
-        @instance = Content[id]
+        @instance = ::Content[id]
         @instance.monkey.should == 'magic'
       end
     end
     context "pieces" do
       setup do
         @instance = C.new
       end
 
       teardown do
-        Content.delete
+        ::Content.delete rescue nil
       end
+
       should "be initialised empty" do
         @instance.contents.should == []
       end
 
       should "provide a #target method poiting to itself" do
@@ -328,53 +327,53 @@
         @b.reload
         @b.visibility_path.should == @r.id.to_s
       end
 
       should "ensure that child pages have their visibility paths updated" do
-        flunk "Implement this"
+        skip "Implement this"
       end
     end
 
 
-    context "identity map" do
-      setup do
+    # context "identity map" do
+    #   setup do
 
-        Content.delete
-        Content.delete_all_revisions!
-        class ::IdentitySubclass < C; end
-        @c1 = C.create
-        @c2 = C.create
-        @i1 = IdentitySubclass.create
-        @i2 = IdentitySubclass.create
-      end
-      teardown do
-        Object.send(:remove_const, :IdentitySubclass) rescue nil
-        # Content.delete
-        # Content.delete_all_revisions!
-      end
-      should "work for Content" do
-        Content.with_identity_map do
-          Content[@c1.id].object_id.should == Content[@c1.id].object_id
-        end
-      end
+    #     ::Content.delete
+    #     ::Content.delete_all_revisions!
+    #     class ::IdentitySubclass < C; end
+    #     @c1 = C.create
+    #     @c2 = C.create
+    #     @i1 = IdentitySubclass.create
+    #     @i2 = IdentitySubclass.create
+    #   end
+    #   teardown do
+    #     Object.send(:remove_const, :IdentitySubclass) rescue nil
+    #     # Content.delete
+    #     # Content.delete_all_revisions!
+    #   end
+    #   should "work for Content" do
+    #     Content.with_identity_map do
+    #       Content[@c1.id].object_id.should == Content[@c1.id].object_id
+    #     end
+    #   end
 
-      should "work for subclasses" do
-        Content.with_identity_map do
-          IdentitySubclass[@i1.id].object_id.should == IdentitySubclass[@i1.id].object_id
-        end
-      end
+    #   should "work for subclasses" do
+    #     Content.with_identity_map do
+    #       IdentitySubclass[@i1.id].object_id.should == IdentitySubclass[@i1.id].object_id
+    #     end
+    #   end
 
-      should "return different objects for different revisions" do
-        revision = 2
-        a = b = nil
-        Content.publish(revision)
-        Content.with_identity_map do
-          a = Content[@c1.id]
-          Content.with_revision(revision) do
-            b = Content[@c1.id]
-          end
-          a.object_id.should_not == b.object_id
-        end
-      end
-    end
+    #   should "return different objects for different revisions" do
+    #     revision = 2
+    #     a = b = nil
+    #     Content.publish(revision)
+    #     Content.with_identity_map do
+    #       a = Content[@c1.id]
+    #       Content.with_revision(revision) do
+    #         b = Content[@c1.id]
+    #       end
+    #       a.object_id.should_not == b.object_id
+    #     end
+    #   end
+    # end
   end
 end