spontaneous 0.2.0.beta5 → 0.2.0.beta6

data/test/unit/test_features.rb

@@ -61,15 +61,12 @@ describe "Features" do
 
       @root = ::Page.create
       Content.delete_revision(1) rescue nil
-      Spontaneous.logger.silent! {
+      quietly {
         @site.publish_all
       }
     end
 
     after do
-      # (@all_classes.map { |k| k.name.to_sym }).each { |klass|
-      #   Object.send(:remove_const, klass) rescue nil
-      # } rescue nil
       Content.delete
     end
 

data/test/unit/test_fields.rb

@@ -10,7 +10,7 @@ describe "Fields" do
     @now = Time.now
     stub_time(@now)
     Spontaneous::State.delete
-    Site.background_mode = :immediate
+    @site.background_mode = :immediate
   end
 
   after do
@@ -167,6 +167,24 @@ describe "Fields" do
         assert content_class.field_prototypes[:date].field_class < Spontaneous::Field::Date
         assert content_class.field_prototypes[:chunky].field_class < Spontaneous::Field::String
       end
+
+      it "assigns the value of the field if the default is a proc" do
+        n = 0
+        f = @content_class.field :dynamic, :default => proc { (n += 1) }
+        f.dynamic_default?.must_equal true
+        instance1 = @content_class.create
+        instance1.dynamic.value.must_equal "1"
+        instance1.reload
+        instance1.dynamic.value.must_equal "1"
+      end
+
+      it "uses a dynamic default value to set the page slug" do
+        n = 0
+        page_class = Class.new(::Page)
+        page_class.field :title, default: proc { (n += 1) }
+        page = page_class.create
+        page.slug.must_equal "1"
+      end
     end
 
     describe "Field titles" do
@@ -643,6 +661,12 @@ describe "Fields" do
       v.count.must_equal 1
     end
 
+    it "marks a field as unmodified after save" do
+      @instance.title.value = "one"
+      @instance.save.reload
+      @instance.title.modified?.must_equal false
+    end
+
     it "have a creation date" do
       now = Time.now + 1000
       stub_time(now)
@@ -814,7 +838,7 @@ describe "Fields" do
         @field.value = "http://www.youtube.com/watch?v=_0jroAM_pO4&feature=feedrec_grec_index"
         html = @field.render(:html)
         html.must_match /^<iframe/
-        html.must_match %r{src="http://www\.youtube\.com/embed/_0jroAM_pO4}
+        html.must_match %r{src="//www\.youtube\.com/embed/_0jroAM_pO4}
         html.must_match /width="680"/
         html.must_match /height="384"/
         html.must_match /theme=light/
@@ -834,7 +858,7 @@ describe "Fields" do
         @field.value = "http://vimeo.com/31836285"
         html = @field.render(:html)
         html.must_match /^<iframe/
-        html.must_match %r{src="http://player\.vimeo\.com/video/31836285}
+        html.must_match %r{src="//player\.vimeo\.com/video/31836285}
         html.must_match /width="680"/
         html.must_match /height="384"/
         html.must_match /color=ccc/
@@ -858,7 +882,7 @@ describe "Fields" do
         json[:"tag"].must_equal "<iframe/>"
         attr = json[:"attr"]
         attr.must_be_instance_of(Hash)
-        attr[:"src"].must_match %r{^http://www\.youtube\.com/embed/_0jroAM_pO4}
+        attr[:"src"].must_match %r{^//www\.youtube\.com/embed/_0jroAM_pO4}
         attr[:"src"].must_match /theme=light/
         attr[:"src"].must_match /hd=1/
         attr[:"src"].must_match /fs=1/
@@ -898,7 +922,7 @@ describe "Fields" do
         @field.value = "https://vine.co/v/brI7pTPb3qU"
         embed = @field.render(:html)
         embed.must_match %r(iframe)
-        embed.must_match %r(src=["']https://vine\.co/v/brI7pTPb3qU/card["'])
+        embed.must_match %r(src=["']//vine\.co/v/brI7pTPb3qU/card["'])
         # Vine videos are square
         embed.must_match %r(width=["']680["'])
         embed.must_match %r(height=["']680["'])
@@ -946,7 +970,8 @@ describe "Fields" do
       @content_class.fields.location.export(nil)[:type].must_equal "Spontaneous.Field.String"
     end
 
-    it "successfullt geolocate an address" do
+    it "successfully geolocate an address" do
+      # TODO: use mocking to avoid an external API request to googles geolocation service
       @field.value = "Cambridge, England"
       @field.value(:lat).must_equal 52.2053370
       @field.value(:lng).must_equal 0.1218170
@@ -1002,7 +1027,10 @@ describe "Fields" do
   end
 
   describe "File fields" do
+    let(:path) { File.expand_path("../../fixtures/images/vimlogo.pdf", __FILE__) }
+
     before do
+      assert File.exists?(path), "Test file #{path} does not exist"
       @content_class = Class.new(::Piece)
       @prototype = @content_class.field :file
       @content_class.stubs(:name).returns("ContentClass")
@@ -1019,8 +1047,6 @@ describe "Fields" do
     end
 
     it "copy files to the media folder" do
-      path = File.expand_path("../../fixtures/images/vimlogo.pdf", __FILE__)
-      assert File.exists?(path), "Test file #{path} does not exist"
       File.open(path, 'rb') do |file|
         @field.value = {
           :tempfile => file,
@@ -1034,8 +1060,6 @@ describe "Fields" do
     end
 
     it "generate the requisite file metadata" do
-      path = File.expand_path("../../fixtures/images/vimlogo.pdf", __FILE__)
-      assert File.exists?(path), "Test file #{path} does not exist"
       File.open(path, 'rb') do |file|
         @field.value = {
           :tempfile => file,
@@ -1060,13 +1084,38 @@ describe "Fields" do
     end
 
     it "copy the given file if passed a path to an existing file" do
-      path = File.expand_path("../../fixtures/images/vimlogo.pdf", __FILE__)
       @field.value = path
       @field.value.must_match %r{/media/.+/vimlogo.pdf$}
       @field.filename.must_equal "vimlogo.pdf"
       @field.filesize.must_equal 2254
     end
 
+    it "sets the unprocessed value to a JSON encoded array of MD5 hash & filename" do
+      @field.value = path
+      @instance.save
+      @field.unprocessed_value.must_equal ["vimlogo.pdf", "1de7e866d69c2f56b4a3f59ed1c98b74"].to_json
+    end
+
+    it "sets the field hash to the MD5 hash of the file" do
+      @field.value = path
+      @field.file_hash.must_equal "1de7e866d69c2f56b4a3f59ed1c98b74"
+    end
+
+    it "sets the original filename of the file" do
+      @field.value = path
+      @field.original_filename.must_equal "vimlogo.pdf"
+    end
+
+    it "doesn't set the hash of a file that can't be found" do
+      @field.value = "/images/nosuchfile.rtf"
+      @field.file_hash.must_equal ""
+    end
+
+    it "sets the original filename of a file that can't be found" do
+      @field.value = "/images/nosuchfile.rtf"
+      @field.original_filename.must_equal "/images/nosuchfile.rtf"
+    end
+
     describe "clearing" do
       def assert_file_field_empty
         @field.value.must_equal ''
@@ -1648,7 +1697,7 @@ describe "Fields" do
           lock = @page.update_locks.first
           lock.field.must_equal field
           lock.content.must_equal @instance
-          lock.page.must_equal @page
+          lock.page.reload.must_equal @page.reload
           lock.description.must_match /something\.gif/
           lock.created_at.must_equal @now
           lock.location.must_equal "Field ‘image’ of entry 1 in box ‘instances’"

data/test/unit/test_generators.rb

@@ -51,7 +51,7 @@ describe "Generators" do
       %w(development.rb production.rb).each do |f|
         assert_file_exists(site_root, 'config/environments', f)
       end
-      %w(back.ru front.ru boot.rb database.yml deploy.rb environment.rb user_levels.yml indexes.rb).each do |f|
+      %w(back.ru front.ru boot.rb database.yml deploy.rb environment.rb user_levels.yml).each do |f|
         assert_file_exists(site_root, 'config', f)
       end
       %w(favicon.ico robots.txt).each do |f|
@@ -60,6 +60,7 @@ describe "Generators" do
       %w(standard.html.cut).each do |f|
         assert_file_exists(site_root, 'templates/layouts', f)
       end
+      assert_file_exists(site_root, 'config/initializers/indexes.rb')
       assert_file_exists(site_root, 'schema')
       assert_file_exists(site_root, 'schema/page.rb')
       assert File.read(site_root / 'schema/page.rb') =~ /class Page < Content::Page/
@@ -101,6 +102,12 @@ describe "Generators" do
       [:development, :test, :production].each do |environment|
         config[environment][:adapter].must_equal "mysql2"
         config[environment][:database].must_match /^example_com(_test)?/
+        case environment
+        when :production
+          config[environment][:user].must_equal "example_com"
+        else
+          config[environment][:user].must_equal "root"
+        end
         # db connections seem to work if you exclude the host
         config[environment][:host].must_equal "127.0.0.1"
       end
@@ -130,7 +137,7 @@ describe "Generators" do
         config = database_config("example_com")
         [:development, :test].each do |environment|
           config[environment][:adapter].must_equal "postgres"
-          config[environment][:user].must_be_nil
+          config[environment][:user].must_equal ENV["USER"]
           config[environment][:database].must_match /^example_com(_test)?/
           refute config[environment].key?(:host)
         end
@@ -183,6 +190,36 @@ describe "Generators" do
       end
     end
 
+    describe "configured for a sqlite database" do
+      let(:args) { ["example.com", "--root=#{@tmp}", "--database=sqlite"] }
+      before do
+        @site_root = File.join(@tmp, 'example_com')
+        generate(:site, *args)
+      end
+
+
+      it "define the correct adapter" do
+        config = database_config("example_com")
+        [:development, :test, :production].each do |environment|
+          config[environment][:adapter].must_equal "sqlite"
+        end
+      end
+
+      it "configure the correct gem" do
+        gemfile = File.read(File.join(@site_root, "Gemfile"))
+        gemfile.must_match /^gem 'sqlite3'/
+      end
+
+      it "setup the right db parameters" do
+        config = database_config("example_com")
+        [:development, :test].each do |environment|
+          config[environment][:database].must_match "db/#{environment}.sqlite3"
+          refute config[environment].key?(:user)
+          refute config[environment].key?(:host)
+        end
+      end
+    end
+
 
     it "include specified connection params in the generated database config" do
       site_root = File.join(@tmp, 'example_com')

data/test/unit/test_images.rb

@@ -17,6 +17,7 @@ describe "Images" do
   describe "Image fields set using absolute values" do
     before do
       @image = S::Field::Image.new(:name => "image")
+      @image.prototype = Spontaneous::Prototypes::FieldPrototype.new(@site.model, :image, :image)
     end
     it "accept and not alter URL values" do
       url =  "http://example.com/image.png"
@@ -179,7 +180,8 @@ describe "Images" do
           @image.src.must_equal "/media/00234/0010/rose.jpg"
           @image.original.width.must_equal @image.width
           @image.original.height.must_equal @image.height
-          @image.filepath.must_equal File.expand_path(File.join(Spontaneous.media_dir, "00234/0010/rose.jpg"))
+          md5 = Digest::MD5.file(@src_image).hexdigest
+          @image.filepath.must_equal ["rose.jpg", md5].to_json
         end
 
 

data/test/unit/test_modifications.rb

@@ -8,7 +8,7 @@ describe "Modifications" do
   before do
     @now = Time.now
     @site = setup_site
-    stub_time(@now)
+    Timecop.freeze(@now)
 
     Content.delete
 
@@ -42,6 +42,7 @@ describe "Modifications" do
   end
 
   after do
+    Timecop.return
     Object.send(:remove_const, :Page) rescue nil
     Object.send(:remove_const, :Piece) rescue nil
     Content.delete
@@ -50,28 +51,29 @@ describe "Modifications" do
 
   it "register creation date of all content" do
     c = Content.create
-    c.created_at.to_i.must_equal @now.to_i
+    (c.created_at - @now).must_be :<=, 1
     page = Page.create
-    page.created_at.to_i.must_equal @now.to_i
+    (page.created_at - @now).must_be :<=, 1
   end
 
   it "update modification date of page when page fields are updated" do
     now = @now + 100
-    stub_time(now)
-    c = Content.first
-    (c.modified_at.to_i - @now.to_i).abs.must_be :<=, 1
-    c.label = "changed"
-    c.save
-    (c.modified_at - now).abs.must_be :<=, 1
+    Timecop.freeze(now) do
+      c = Page.first
+      (c.modified_at.to_i - @now.to_i).abs.must_be :<=, 1
+      c.update(title: "changed")
+      (c.modified_at - now).abs.must_be :<=, 1
+    end
   end
 
   it "update modification date of path when page visibility is changed" do
     now = @now + 100
-    stub_time(now)
-    c = Page.uid("0")
-    (c.modified_at.to_i - @now.to_i).abs.must_be :<=, 1
-    c.toggle_visibility!
-    (c.modified_at - now).abs.must_be :<=, 1
+    Timecop.freeze(now) do
+      c = Page.uid("0")
+      (c.modified_at.to_i - @now.to_i).abs.must_be :<=, 1
+      c.toggle_visibility!
+      (c.modified_at - now).abs.must_be :<=, 1
+    end
   end
 
   it "update page timestamps on modification of its box fields" do
@@ -79,58 +81,54 @@ describe "Modifications" do
       field :title
     end
 
-    stub_time(@now+3600)
-    page = Page.first :uid => "0"
-    (page.modified_at.to_i - @now.to_i).abs.must_be :<=, 1
-    page.with_fields.title.value = "updated"
-    page.save.reload
-    page.modified_at.to_i.must_equal @now.to_i + 3600
+    Timecop.freeze(@now+3600) do
+      page = Page.first :uid => "0"
+      (page.modified_at.to_i - @now.to_i).abs.must_be :<=, 1
+      page.with_fields.title.value = "updated"
+      page.save.reload
+      page.modified_at.to_i.must_equal @now.to_i + 3600
+    end
   end
 
   it "update page timestamps on modification of a piece" do
-    stub_time(@now+3600)
-    page = Page.first :uid => "0"
-    (page.modified_at.to_i - @now.to_i).abs.must_be :<=, 1
-    content = page.contents.first
-    content.page.must_equal page
-    content.label = "changed"
-    content.save
-    page.reload
-    page.modified_at.to_i.must_equal @now.to_i + 3600
+    Timecop.freeze(@now+3600) do
+      page = Page.first :uid => "0"
+      (page.modified_at.to_i - @now.to_i).abs.must_be :<=, 1
+      content = page.contents.first
+      content.page.must_equal page
+      content.label = "changed"
+      content.save
+      page.reload
+      page.modified_at.to_i.must_equal @now.to_i + 3600
+    end
   end
 
   it "update page timestamps on modification of a piece's box fields" do
     Piece.box :with_fields do
       field :title
     end
-    stub_time(@now+3600)
-    page = Page.first :uid => "0"
-    (page.modified_at.to_i - @now.to_i).abs.must_be :<=, 1
-    content = page.contents.first
-
-    content.with_fields.title.value = "updated"
-    content.save
-    page.reload
-    page.modified_at.to_i.must_equal @now.to_i + 3600
+    Timecop.freeze(@now+3600) do
+      page = Page.first :uid => "0"
+      (page.modified_at.to_i - @now.to_i).abs.must_be :<=, 1
+      content = page.contents.first
+
+      content.with_fields.title.value = "updated"
+      content.save
+      page.reload
+      page.modified_at.to_i.must_equal @now.to_i + 3600
+    end
   end
 
   it "update page timestamp on addition of piece" do
-    stub_time(@now+3600)
-    page = Page.first :uid => "0"
-    content = Content[page.contents.first.id]
-    content.things << Piece.new
-    content.save
-    content.modified_at.to_i.must_equal @now.to_i + 3600
-    page.reload
-    page.modified_at.to_i.must_equal @now.to_i + 3600
-  end
-
-  it "not update the parent page's timestamp on addition of a child page yyyy" do
-    stub_time(@now+1000)
-    page = Page.first :uid => "0"
-    page.things << Page.new
-    page.save.reload
-    page.modified_at.to_i.must_equal @now.to_i
+    Timecop.freeze(@now + 3600) do
+      page = Page.first :uid => "0"
+      content = Content[page.contents.first.id]
+      content.things << Piece.new
+      content.save
+      content.modified_at.to_i.must_equal @now.to_i + 3600
+      page.reload
+      page.modified_at.to_i.must_equal @now.to_i + 3600
+    end
   end
 
   it "update the parent page's modification time if child pages are re-ordered" do
@@ -139,204 +137,209 @@ describe "Modifications" do
     page.things << Page.new(:uid => "0.0.0.1")
     page.save
     page = Page.first :uid => "0.0.0"
-    stub_time(@now+1000)
-    child = page.things.first
-    child.update_position(1)
-    page.reload.modified_at.to_i.must_equal @now.to_i + 1000
+    Timecop.freeze(@now + 1000) do
+      child = page.things.first
+      child.update_position(1)
+      page.reload.modified_at.to_i.must_equal @now.to_i + 1000
+    end
   end
 
   it "update a page's timestamp on modification of its slug" do
-    stub_time(@now+1000)
-    page = Page.first :uid => "0"
-    page.slug = "changed"
-    page.save.reload
-    page.modified_at.to_i.must_equal @now.to_i + 1000
-  end
-
-  it "not update child pages timestamps after changing their parent's slug" do
-    page = Page.first :uid => "0.0.0"
-    modified = page.modified_at.to_i
-    stub_time(@now+1000)
-    page = Page.first :uid => "0"
-    page.slug = "changed"
-    page.save.reload
-    page.modified_at.to_i.must_equal @now.to_i + 1000
-    page = Page.first :uid => "0.0.0"
-    page.modified_at.to_i.must_equal modified
+    Timecop.freeze(@now + 1000) do
+      page = Page.first :uid => "0"
+      page.slug = "changed"
+      page.save.reload
+      page.modified_at.to_i.must_equal @now.to_i + 1000
+    end
   end
 
   it "update the pages timestamp if a boxes order is changed" do
-    stub_time(@now+3600)
-    page = Page.first :uid => "0"
-    content = Content[page.contents.first.id]
-    content.update_position(1)
-    page.reload.modified_at.to_i.must_equal @now.to_i + 3600
+    Timecop.freeze(@now+3600) do
+      page = Page.first :uid => "0"
+      content = Content[page.contents.first.id]
+      content.update_position(1)
+      page.reload.modified_at.to_i.must_equal @now.to_i + 3600
+    end
   end
 
   it "update the parent page's modification time if the contents of a piece's box are re-ordered" do
-    stub_time(@now+3600)
-    page = Page.first :uid => "0"
-    content = page.things.first.things.first
-    content.update_position(1)
-    page.reload.modified_at.to_i.must_equal @now.to_i + 3600
+    Timecop.freeze(@now+3600) do
+      page = Page.first :uid => "0"
+      content = page.things.first.things.first
+      content.update_position(1)
+      page.reload.modified_at.to_i.must_equal @now.to_i + 3600
+    end
   end
 
   it "update the parent page's modification date if a piece is deleted" do
-    stub_time(@now+3600)
-    page = Page.first :uid => "0"
-    content = Content[page.contents.first.id]
-    content.destroy
-    page.reload.modified_at.to_i.must_equal @now.to_i + 3600
+    Timecop.freeze(@now+3600) do
+      page = Page.first :uid => "0"
+      content = Content[page.contents.first.id]
+      content.destroy
+      page.reload.modified_at.to_i.must_equal @now.to_i + 3600
+    end
   end
 
   it "update the parent page's modification date if a page is deleted" do
-    stub_time(@now+3600)
-    page = Page.first :uid => "0"
-    content = Content[page.things.first.things.first.id]
-    content.destroy
-    page.reload.modified_at.to_i.must_equal @now.to_i + 3600
+    Timecop.freeze(@now+3600) do
+      page = Page.first :uid => "0"
+      content = Content[page.things.first.things.first.id]
+      content.destroy
+      page.reload.modified_at.to_i.must_equal @now.to_i + 3600
+    end
   end
 
   it "add entry to the list of side effects for a visibility change" do
-    stub_time(@now+3600)
-    page = Page.first :uid => "1"
-    old_slug = page.slug
-    page.slug = "changed"
-    page.save
-    page.reload
-    page.pending_modifications.length.must_equal 1
-    mods = page.pending_modifications(:slug)
-    mods.length.must_equal 1
-    mod = mods.first
-    mod.must_be_instance_of Spontaneous::Model::Core::Modifications::SlugModification
-    mod.old_value.must_equal old_slug
-    mod.new_value.must_equal "changed"
-    mod.created_at.to_i.must_equal @now.to_i + 3600
+    Timecop.freeze(@now+3600) do
+      page = Page.first :uid => "1"
+      old_slug = page.slug
+      page.slug = "changed"
+      page.save
+      page.reload
+      page.pending_modifications.length.must_equal 1
+      mods = page.pending_modifications(:slug)
+      mods.length.must_equal 1
+      mod = mods.first
+      mod.must_be_instance_of Spontaneous::Model::Core::Modifications::SlugModification
+      mod.old_value.must_equal old_slug
+      mod.new_value.must_equal "changed"
+      mod.created_at.to_i.must_equal @now.to_i + 3600
+    end
   end
 
   it "serialize page modifications" do
-    stub_time(@now+3600)
-    page = Page.first :uid => "1"
-    page.slug = "changed"
-    page.save
-    page.pending_modifications.length.must_equal 1
-    mod = page.pending_modifications(:slug).first
-    page = Page.first :id => page.id
-    page.pending_modifications.length.must_equal 1
-    page.pending_modifications(:slug).first.must_equal mod
-    page.pending_modifications(:slug).first.created_at.to_i.must_equal @now.to_i + 3600
+    Timecop.freeze(@now+3600) do
+      page = Page.first :uid => "1"
+      page.slug = "changed"
+      page.save
+      page.pending_modifications.length.must_equal 1
+      mod = page.pending_modifications(:slug).first
+      page = Page.first :id => page.id
+      page.pending_modifications.length.must_equal 1
+      page.pending_modifications(:slug).first.must_equal mod
+      page.pending_modifications(:slug).first.created_at.to_i.must_equal @now.to_i + 3600
+    end
   end
 
   it "concatenate multiple slug modifications together" do
-    stub_time(@now+3600)
-    page = Page.first :uid => "1"
-    old_slug = page.slug
-    page.slug = "changed"
-    page.save
-    page.pending_modifications.length.must_equal 1
-    page.slug = "changed-again"
-    page.save
-    mod = page.pending_modifications(:slug).first
-    mod.old_value.must_equal old_slug
-    mod.new_value.must_equal "changed-again"
+    Timecop.freeze(@now+3600) do
+      page = Page.first :uid => "1"
+      old_slug = page.slug
+      page.slug = "changed"
+      page.save
+      page.pending_modifications.length.must_equal 1
+      page.slug = "changed-again"
+      page.save
+      mod = page.pending_modifications(:slug).first
+      mod.old_value.must_equal old_slug
+      mod.new_value.must_equal "changed-again"
+    end
   end
 
   it "know the number of pages affected by slug modification" do
-    stub_time(@now+3600)
-    page = Page.first :uid => "1"
-    page.slug = "changed"
-    page.save
-    mod = page.pending_modifications(:slug).first
-    mod.count.must_equal 4
+    Timecop.freeze(@now+3600) do
+      page = Page.first :uid => "1"
+      page.slug = "changed"
+      page.save
+      mod = page.pending_modifications(:slug).first
+      mod.count.must_equal 4
+    end
   end
 
   it "show the number of pages whose visibility is affected in the case of a visibility change" do
-    stub_time(@now+3600)
-    page = Page.first :uid => "1"
-    page.hide!
-    page.reload
-    mods = page.pending_modifications(:visibility)
-    mods.length.must_equal 1
-    mod = mods.first
-    mod.count.must_equal 4
-    mod.owner.must_equal page
+    Timecop.freeze(@now+3600) do
+      page = Page.first :uid => "1"
+      page.hide!
+      page.reload
+      mods = page.pending_modifications(:visibility)
+      mods.length.must_equal 1
+      mod = mods.first
+      mod.count.must_equal 4
+      mod.owner.must_equal page
+    end
   end
 
   it "record visibility changes that originate from a content piece" do
-    stub_time(@now+3600)
-    page = Page.first :uid => "1"
-    page.things.first.hide!
-    page.reload
-    mods = page.pending_modifications(:visibility)
-    mods.length.must_equal 1
-    mod = mods.first
-    mod.count.must_equal 2
-    mod.owner.must_equal page.things.first
+    Timecop.freeze(@now+3600) do
+      page = Page.first :uid => "1"
+      page.things.first.hide!
+      page.reload
+      mods = page.pending_modifications(:visibility)
+      mods.length.must_equal 1
+      mod = mods.first
+      mod.count.must_equal 2
+      mod.owner.must_equal page.things.first
+    end
   end
 
   it "show number of pages that are to be deleted in the case of a deletion" do
-    stub_time(@now+3600)
-    page = Page.first(:uid => "1")
-    owner = page.owner
-    page.destroy
-    page = Page.first(:uid => "root")
-    mods = page.pending_modifications(:deletion)
-    mod = mods.first
-    # count is number of children of deleted page + 1 (for deleted page)
-    mod.count.must_equal 5
-    mod.owner.must_equal owner.reload
+    Timecop.freeze(@now+3600) do
+      page = Page.first(:uid => "1")
+      owner = page.owner
+      page.destroy
+      page = Page.first(:uid => "root")
+      mods = page.pending_modifications(:deletion)
+      mod = mods.first
+      # count is number of children of deleted page + 1 (for deleted page)
+      mod.count.must_equal 5
+      mod.owner.must_equal owner.reload
+    end
   end
 
   it "show number of pages deleted if piece with pages is deleted" do
-    stub_time(@now+3600)
-    page = Page.first(:uid => "1")
-    piece = page.things.first
-    owner = piece.owner
-    piece.destroy
-    page = Page.first(:uid => "1")
-    mods = page.pending_modifications(:deletion)
-    mod = mods.first
-    mod.count.must_equal 2
-    mod.owner.must_equal owner.reload
+    Timecop.freeze(@now+3600) do
+      page = Page.first(:uid => "1")
+      piece = page.things.first
+      owner = piece.owner
+      piece.destroy
+      page = Page.first(:uid => "1")
+      mods = page.pending_modifications(:deletion)
+      mod = mods.first
+      mod.count.must_equal 2
+      mod.owner.must_equal owner.reload
+    end
   end
 
   it "show number of pages deleted if page belonging to piece is deleted" do
-    stub_time(@now+3600)
-    page = Page.first(:uid => "1")
-    child = page.things.first.things.first
-    owner = child.owner
-    child.destroy
-    page = Page.first(:uid => "1")
-    mods = page.pending_modifications(:deletion)
-    mod = mods.first
-    mod.count.must_equal 1
-    mod.owner.must_equal owner.reload
+    Timecop.freeze(@now+3600) do
+      page = Page.first(:uid => "1")
+      child = page.things.first.things.first
+      owner = child.owner
+      child.destroy
+      page = Page.first(:uid => "1")
+      mods = page.pending_modifications(:deletion)
+      mod = mods.first
+      mod.count.must_equal 1
+      mod.owner.must_equal owner.reload
+    end
   end
 
   it "have an empty modification if the slug has been reverted to original value" do
-    stub_time(@now+3600)
-    page = Page.first :uid => "1"
-    old_slug = page.slug
-    page.slug = "changed"
-    page.save
-    page.pending_modifications.length.must_equal 1
-    page.slug = "changed-again"
-    page.save
-    page.slug = old_slug
-    page.save
-    mods = page.reload.pending_modifications(:slug)
-    mods.length.must_equal 0
+    Timecop.freeze(@now+3600) do
+      page = Page.first :uid => "1"
+      old_slug = page.slug
+      page.slug = "changed"
+      page.save
+      page.pending_modifications.length.must_equal 1
+      page.slug = "changed-again"
+      page.save
+      page.slug = old_slug
+      page.save
+      mods = page.reload.pending_modifications(:slug)
+      mods.length.must_equal 0
+    end
   end
 
   it "have an empty modification if the visibility has been reverted to original value" do
-    stub_time(@now+3600)
-    page = Page.first :uid => "1"
-    page.things.first.hide!
-    page.reload
-    page.things.first.show!
-    page.reload
-    mods = page.pending_modifications(:visibility)
-    mods.length.must_equal 0
+    Timecop.freeze(@now+3600) do
+      page = Page.first :uid => "1"
+      page.things.first.hide!
+      page.reload
+      page.things.first.show!
+      page.reload
+      mods = page.pending_modifications(:visibility)
+      mods.length.must_equal 0
+    end
   end
 
   describe "during publish" do
@@ -613,24 +616,26 @@ describe "Modifications" do
     end
 
     it "add the editor to any modifications" do
-      stub_time(@now+3600)
-      page = Page.first :uid => "1"
-      page.current_editor = @user
-      page.slug = "changed"
-      page.save
-      mod = page.pending_modifications(:slug).first
-      mod.user.must_equal @user
+      Timecop.freeze(@now+3600) do
+        page = Page.first :uid => "1"
+        page.current_editor = @user
+        page.slug = "changed"
+        page.save
+        mod = page.pending_modifications(:slug).first
+        mod.user.must_equal @user
+      end
     end
 
     it "persist the user" do
-      stub_time(@now+3600)
-      page = Page.first :uid => "1"
-      page.current_editor = @user
-      page.slug = "changed"
-      page.save
-      page = Page.first :uid => "1"
-      mod = page.pending_modifications(:slug).first
-      mod.user.must_equal @user
+      Timecop.freeze(@now+3600) do
+        page = Page.first :uid => "1"
+        page.current_editor = @user
+        page.slug = "changed"
+        page.save
+        page = Page.first :uid => "1"
+        mod = page.pending_modifications(:slug).first
+        mod.user.must_equal @user
+      end
     end
   end
 end