spontaneous 0.2.0.beta4 → 0.2.0.beta5

data/test/unit/test_datamapper_content.rb

@@ -18,17 +18,23 @@ describe "DataMapperContent" do
   end
 
   before do
+    root ||= Dir.mktmpdir
     @expected_columns = DB[:content].columns
     @database = ::Sequel.mock(autoid: 1)
     @database.columns = @expected_columns
-    @schema = Spontaneous::Schema.new(Dir.pwd, NameMap)
-    content_super = Spontaneous::Model(:content, @database, @schema)
+    @site = Spontaneous::Site.instantiate(root, :test, :back)
+    @schema = Spontaneous::Schema.new(@site, Dir.pwd, NameMap)
+    content_super = Spontaneous::Model!(:content, @database, @schema)
     content_class = Class.new(content_super)
+    page_class    = Class.new(content_class::Page)
+    @site.model = content_class
     Object.const_set(:Content, content_class)
+    Object.const_set(:Page, page_class)
   end
 
   after do
     Object.send :remove_const, :Content rescue nil
+    Object.send :remove_const, :Page rescue nil
   end
 
     it  "be defined as a top-level constant" do
@@ -39,11 +45,25 @@ describe "DataMapperContent" do
       ::Content.serialized_columns.must_equal [:field_store, :entry_store, :box_store, :serialized_modifications]
     end
 
+    it "has a dataset that doesnt filter by type" do
+      ds = ::Content.dataset
+      ds.must_be_instance_of Spontaneous::DataMapper::Dataset
+      ds.sql.must_equal "SELECT * FROM content WHERE (type_sid IN ('Page'))"
+    end
+
     it  "search without type filters" do
       @database.sqls # clear sql log
       ::Content.all
       @database.sqls.must_equal [
-        "SELECT * FROM content"
+        "SELECT * FROM content WHERE (type_sid IN ('Page'))"
+      ]
+    end
+
+    it "allows for retrieval of a single instance by primary key" do
+      @database.sqls # clear sql log
+      ::Content.primary_key_lookup(23)
+      @database.sqls.must_equal [
+        "SELECT * FROM content WHERE ((type_sid IN ('Page')) AND (id = 23)) LIMIT 1"
       ]
     end
 
@@ -63,7 +83,7 @@ describe "DataMapperContent" do
         b = ::Content.root
       end
       @database.sqls.must_equal [
-        "SELECT * FROM content WHERE (path = '/') LIMIT 1"
+        "SELECT * FROM content WHERE ((type_sid IN ('Page')) AND (path = '/')) LIMIT 1"
       ]
     end
 
@@ -75,7 +95,7 @@ describe "DataMapperContent" do
         b = ::Content.path("/this")
       end
       @database.sqls.must_equal [
-        "SELECT * FROM content WHERE (path = '/this') LIMIT 1"
+        "SELECT * FROM content WHERE ((type_sid IN ('Page')) AND (path = '/this')) LIMIT 1"
       ]
     end
 
@@ -87,20 +107,17 @@ describe "DataMapperContent" do
         b = ::Content.uid("fish")
       end
       @database.sqls.must_equal [
-        "SELECT * FROM content WHERE (uid = 'fish') LIMIT 1"
+        "SELECT * FROM content WHERE ((type_sid IN ('Page')) AND (uid = 'fish')) LIMIT 1"
       ]
     end
 
     describe "Pages" do
       before do
-        page_class = Class.new(::Content::Page)
-        Object.const_set(:Page, page_class)
-        Object.const_set(:P1, Class.new(page_class))
-        Object.const_set(:P2, Class.new(page_class))
+        Object.const_set(:P1, Class.new(::Page))
+        Object.const_set(:P2, Class.new(::Page))
       end
 
       after do
-        Object.send :remove_const, :Page rescue nil
         Object.send :remove_const, :P1   rescue nil
         Object.send :remove_const, :P2   rescue nil
       end
@@ -113,6 +130,13 @@ describe "DataMapperContent" do
         ]
       end
 
+      it "has a dataset that filters for pages" do
+        ds = ::Content::Page.dataset
+        ds.must_be_instance_of Spontaneous::DataMapper::Dataset
+        ds.sql.must_equal "SELECT * FROM content WHERE (type_sid IN ('Page', 'P1', 'P2'))"
+      end
+
+
       it  "limit searches to a single class for all other page types" do
         @database.sqls # clear sql log
         ::Page.all
@@ -144,7 +168,7 @@ describe "DataMapperContent" do
         @database.sqls # clear sql log
         P2.root
         @database.sqls.must_equal [
-          "SELECT * FROM content WHERE (path = '/') LIMIT 1"
+          "SELECT * FROM content WHERE ((type_sid IN ('Page', 'P1', 'P2')) AND (path = '/')) LIMIT 1"
         ]
       end
 
@@ -187,6 +211,12 @@ describe "DataMapperContent" do
         ]
       end
 
+      it "has a dataset that filters for pieces" do
+        ds = ::Content::Piece.dataset
+        ds.must_be_instance_of Spontaneous::DataMapper::Dataset
+        ds.sql.must_equal "SELECT * FROM content WHERE (type_sid IN ('Piece', 'P1', 'P2'))"
+      end
+
       it  "limit searches to a single class for all other page types" do
         @database.sqls # clear sql log
         ::Piece.all

data/test/{experimental → unit}/test_features.rb

@@ -7,16 +7,23 @@ require 'sinatra/base'
 describe "Features" do
   include RackTestMethods
 
+  start do
+    S::State.delete
+  end
+
   before do
     @site = setup_site
+    @site.background_mode = :immediate
+    @site.output_store :Memory
   end
 
   after do
     teardown_site
+    S::State.delete
   end
 
   def app
-    Spontaneous::Rack.application
+    Spontaneous::Rack.application(@site)
   end
 
   def api_key
@@ -34,6 +41,8 @@ describe "Features" do
       config.stubs(:auto_login).returns('root')
       config.stubs(:default_charset).returns('utf-8')
       config.stubs(:publishing_method).returns(:immediate)
+      config.stubs(:publishing_delay).returns(nil)
+      config.stubs(:keep_revisions).returns(5)
       config.stubs(:simultaneous_connection).returns("")
       config.stubs(:site_domain).returns('example.org')
       config.stubs(:site_id).returns('example_org')
@@ -49,6 +58,12 @@ describe "Features" do
       Spontaneous::Permissions::AccessKey.stubs(:valid?).with(nil, nil).returns(false)
       Spontaneous::Permissions::AccessKey.stubs(:valid?).with(nil, @user).returns(false)
       Spontaneous::Permissions::AccessKey.stubs(:valid?).with(@key, @user).returns(true)
+
+      @root = ::Page.create
+      Content.delete_revision(1) rescue nil
+      Spontaneous.logger.silent! {
+        @site.publish_all
+      }
     end
 
     after do
@@ -58,6 +73,37 @@ describe "Features" do
       Content.delete
     end
 
+    describe "middleware" do
+      before do
+        @middleware = Class.new do
+          def initialize(app, options = {})
+            @app, @options = app, options
+          end
+
+          def call(env)
+            status, headers, body = @app.call(env)
+            [status, headers.merge('X-Middleware' => @options[:header] || "present"), body]
+          end
+        end
+      end
+
+      it "allows for insertion of custom middleware into the front app" do
+        Spontaneous.mode = :front
+        Spontaneous.front.use @middleware, header: "inserted"
+        get "/"
+        assert last_response.status == 200, "Expected an 200 OK response but got #{last_response.status}"
+        last_response.headers['X-Middleware'].must_equal "inserted"
+      end
+
+      it "inserts defined middleware into the preview app" do
+        Spontaneous.mode = :back
+        Spontaneous.front.use @middleware, header: "inserted"
+        auth_get "/", preview: true
+        assert last_response.status == 200, "Expected an 200 OK response but got #{last_response.status}"
+        last_response.headers['X-Middleware'].must_equal "inserted"
+      end
+    end
+
     describe "controllers" do
       before do
         class ::FeatureBackController < ::Sinatra::Base
@@ -85,7 +131,7 @@ describe "Features" do
 
       it "be able to injectable into the back application" do
         Spontaneous.mode = :back
-        Spontaneous.register_back_controller(:myfeature, FeatureBackController)
+        @site.register_back_controller(:myfeature, FeatureBackController)
 
         get "/@myfeature/hello"
         assert last_response.status == 401, "Expected an Unauthorised 401 response but got #{last_response.status}"
@@ -102,9 +148,17 @@ describe "Features" do
         assert last_response.body == "Cruel Editor"
       end
 
+      it "be able to injectable into the back application with custom path prefixes" do
+        Spontaneous.mode = :back
+        @site.register_back_controller(:myfeature, FeatureBackController, path_prefix: "/something")
+        auth_get "/something/hello"
+        assert last_response.ok?
+        assert last_response.body == "Editor"
+      end
+
       it "be able to inject controllers into the front application" do
         Spontaneous.mode = :front
-        Spontaneous.register_front_controller(:myfeature, FeatureFrontController)
+        @site.register_front_controller(:myfeature, FeatureFrontController)
         get "/@myfeature/hello"
         assert last_response.ok?
         assert last_response.body == "World"
@@ -113,6 +167,34 @@ describe "Features" do
         assert last_response.ok?
         assert last_response.body == "Cruel World"
       end
+
+      it "be able to inject controllers into the front application with custom path prefixes" do
+        Spontaneous.mode = :front
+        @site.register_front_controller(:myfeature, FeatureFrontController, path_prefix: "/something/else")
+        get "/something/else/hello"
+        assert last_response.ok?
+        assert last_response.body == "World"
+      end
+
+      it "gives access to all mounted front apps in preview mode" do
+        Spontaneous.mode = :back
+        @site.register_front_controller(:myfeature, FeatureFrontController)
+        get "/@myfeature/hello"
+        assert last_response.ok?
+        assert last_response.body == "World"
+      end
+
+      it "allows injection of rack apps into the the back application" do
+        Spontaneous.mode = :back
+        @site.register_back_controller(:myfeature, proc { |env| [200, {}, "hello"] })
+
+        get "/@myfeature"
+        assert last_response.status == 401, "Expected an Unauthorised 401 response but got #{last_response.status}"
+
+        auth_get "/@myfeature"
+        assert last_response.ok?
+        assert last_response.body == "hello"
+      end
     end
   end
 end

data/test/unit/test_fields.rb

@@ -279,14 +279,14 @@ describe "Fields" do
         def outputs
           [:html, :plain, :fancy]
         end
-        def generate_html(value)
+        def generate_html(value, site)
           "<#{value}>"
         end
-        def generate_plain(value)
+        def generate_plain(value, site)
           "*#{value}*"
         end
 
-        def generate(output, value)
+        def generate(output, value, site)
           case output
           when :fancy
             "#{value}!"
@@ -347,7 +347,7 @@ describe "Fields" do
       end
       $transform = lambda { |value| "<#{value}>" }
       ContentClass1.field :title do
-        def generate_html(value)
+        def generate_html(value, site)
           $transform[value]
         end
       end
@@ -366,7 +366,7 @@ describe "Fields" do
     before do
       ::CC = Class.new(Piece) do
         field :title, :default => "Magic" do
-          def generate_html(value)
+          def generate_html(value, site)
             "*#{value}*"
           end
         end
@@ -511,7 +511,8 @@ describe "Fields" do
     before do
       class ::MarkdownContent < Piece
         field :text1, :markdown
-        field :text2, :text
+        field :text2, :richtext
+        field :text3, :markup
       end
       @instance = MarkdownContent.new
     end
@@ -522,9 +523,12 @@ describe "Fields" do
     it "be available as the :markdown type" do
       assert MarkdownContent.field_prototypes[:text1].field_class < Spontaneous::Field::Markdown
     end
-    it "be available as the :text type" do
+    it "be available as the :richtext type" do
       assert MarkdownContent.field_prototypes[:text2].field_class < Spontaneous::Field::Markdown
     end
+    it "be available as the :markup type" do
+      assert MarkdownContent.field_prototypes[:text3].field_class < Spontaneous::Field::Markdown
+    end
 
     it "process input into HTML" do
       @instance.text1 = "*Hello* **World**"
@@ -539,6 +543,37 @@ describe "Fields" do
     end
   end
 
+  describe "LongString fields" do
+    before do
+      class ::LongStringContent < Piece
+        field :long1, :longstring
+        field :long2, :long_string
+        field :long3, :text
+      end
+      @instance = LongStringContent.new
+    end
+    after do
+      Object.send(:remove_const, :LongStringContent)
+    end
+
+    it "is available as the :longstring type" do
+      assert LongStringContent.field_prototypes[:long1].field_class < Spontaneous::Field::LongString
+    end
+
+    it "is available as the :long_string type" do
+      assert LongStringContent.field_prototypes[:long2].field_class < Spontaneous::Field::LongString
+    end
+
+    it "is available as the :text type" do
+      assert LongStringContent.field_prototypes[:long3].field_class < Spontaneous::Field::LongString
+    end
+
+    it "translates newlines to <br/> tags" do
+      @instance.long1 = "this\nlong\nstring"
+      @instance.long1.value.must_equal "this<br />\nlong<br />\nstring"
+    end
+  end
+
   describe "Editor classes" do
     it "be defined in base types" do
       base_class = Spontaneous::Field::Image
@@ -1032,6 +1067,24 @@ describe "Fields" do
       @field.filesize.must_equal 2254
     end
 
+    describe "clearing" do
+      def assert_file_field_empty
+        @field.value.must_equal ''
+        @field.filename.must_equal ''
+        @field.filesize.must_equal 0
+      end
+
+      before do
+        path = File.expand_path("../../fixtures/images/vimlogo.pdf", __FILE__)
+        @field.value = path
+      end
+
+      it "clears the value if set to the empty string" do
+        @field.value = ''
+        assert_file_field_empty
+      end
+    end
+
     describe "with cloud storage" do
       before do
         ::Fog.mock!
@@ -1040,7 +1093,7 @@ describe "Fields" do
         :aws_secret_access_key=>"SECRET_ACCESS_KEY",
         :aws_access_key_id=>"ACCESS_KEY_ID"
       }
-        @storage = S::Storage::Cloud.new(@aws_credentials, "media.example.com")
+        @storage = S::Media::Store::Cloud.new(@aws_credentials, "media.example.com")
         @site.expects(:storage).returns(@storage)
       end
 
@@ -1203,7 +1256,7 @@ describe "Fields" do
 
   describe "Asynchronous processing" do
     before do
-      S::Site.background_mode = :simultaneous
+      @site.background_mode = :simultaneous
       @image = File.expand_path("../../fixtures/images/size.gif", __FILE__)
       @model = (::Piece)
       @model.field :title
@@ -1227,17 +1280,17 @@ describe "Fields" do
     # end
 
     it "be able to resolve fields id" do
-      S::Field.find(@instance.image.id, @instance.items.title.id).must_equal [
+      S::Field.find(@site.model, @instance.image.id, @instance.items.title.id).must_equal [
         @instance.image, @instance.items.title
       ]
     end
 
     it "not raise errors for invalid fields" do
-      S::Field.find("0", "#{@instance.id}/xxx/#{@instance.items.title.schema_id}", "#{@instance.items.id}/nnn", @instance.items.title.id).must_equal [ @instance.items.title ]
+      S::Field.find(@site.model, "0", "#{@instance.id}/xxx/#{@instance.items.title.schema_id}", "#{@instance.items.id}/nnn", @instance.items.title.id).must_equal [ @instance.items.title ]
     end
 
     it "return a single field if given a single id" do
-      S::Field.find(@instance.image.id).must_equal @instance.image
+      S::Field.find(@site.model, @instance.image.id).must_equal @instance.image
     end
 
     it "be disabled for Date fields" do
@@ -1293,7 +1346,7 @@ describe "Fields" do
           @instance.image.schema_id.to_s => {:tempfile => file, :filename => "something.gif", :type => "image/gif"},
           @instance.description.schema_id.to_s => "Updated description"
         }
-        Spontaneous::Field.update(@instance, fields, nil, false)
+        Spontaneous::Field.update(@site, @instance, fields, nil, false)
         @instance.reload
         @instance.title.value.must_equal "Updated title"
         @instance.description.value.must_equal "<p>Updated description</p>\n"
@@ -1315,7 +1368,7 @@ describe "Fields" do
         }
         @instance.expects(:save).at_least_once
 
-        Spontaneous::Field.update(@instance, fields, nil, true)
+        Spontaneous::Field.update(@site, @instance, fields, nil, true)
 
         @instance.title.value.must_equal "Updated title"
         @instance.description.value.must_equal "<p>Updated description</p>\n"
@@ -1344,7 +1397,7 @@ describe "Fields" do
       })
       File.open(@image, "r") do |file|
         field.pending_version.must_equal 0
-        Spontaneous::Field.set(field, {:tempfile => file, :filename => "something.gif", :type => "image/gif"}, nil, true)
+        Spontaneous::Field.set(@site, field, {:tempfile => file, :filename => "something.gif", :type => "image/gif"}, nil, true)
         field.value.must_equal ""
         field.pending_value.must_equal({
           :timestamp => S::Field.timestamp(@now),
@@ -1368,9 +1421,9 @@ describe "Fields" do
       File.open(@image, "r") do |file|
         fields = {
           box.title.schema_id.to_s => "Updated title",
-          box.image.schema_id.to_s => {:tempfile => file, :filename => "something.gif", :type => "image/gif"},
+          box.image.schema_id.to_s => {:tempfile => file, :filename => "something.gif", :type => "image/gif"}
         }
-        Spontaneous::Field.update(box, fields, nil, false)
+        Spontaneous::Field.update(@site, box, fields, nil, false)
         box.title.value.must_equal "Updated title"
         box.image.value.must_equal "/media/#{S::Media.pad_id(@instance.id)}/#{box.schema_id}/0001/something.gif"
         box.image.pending_version.must_equal 1
@@ -1386,9 +1439,9 @@ describe "Fields" do
       File.open(@image, "r") do |file|
         fields = {
           box.title.schema_id.to_s => "Updated title",
-          box.image.schema_id.to_s => {:tempfile => file, :filename => "something.gif", :type => "image/gif"},
+          box.image.schema_id.to_s => {:tempfile => file, :filename => "something.gif", :type => "image/gif"}
         }
-        Spontaneous::Field.update(box, fields, nil, true)
+        Spontaneous::Field.update(@site, box, fields, nil, true)
         box.title.value.must_equal "Updated title"
         field.value.must_equal ""
         field.pending_value.must_equal({
@@ -1413,7 +1466,7 @@ describe "Fields" do
       })
       File.open(@image, "r") do |file|
         field.pending_version.must_equal 0
-        Spontaneous::Field.set(field, {:tempfile => file, :filename => "something.gif", :type => "image/gif"}, nil, true)
+        Spontaneous::Field.set(@site, field, {:tempfile => file, :filename => "something.gif", :type => "image/gif"}, nil, true)
         field.value.must_equal ""
         field.pending_value.must_equal({
           :timestamp => S::Field.timestamp(@now),
@@ -1435,24 +1488,46 @@ describe "Fields" do
     end
 
     it "immediately update asynchronous fields if background mode is :immediate" do
-      S::Site.background_mode = :immediate
+      @site.background_mode = :immediate
+      field = @instance.image
       File.open(@image, "r") do |file|
         fields = {
-          @instance.image.schema_id.to_s => {:tempfile => file, :filename => "something.gif", :type => "image/gif"}
+          field.schema_id.to_s => {:tempfile => file, :filename => "something.gif", :type => "image/gif"}
         }
         Spontaneous::Simultaneous.expects(:fire).never
-        Spontaneous::Field.update(@instance, fields, nil, true)
+        Spontaneous::Field.update(@site, @instance, fields, nil, true)
         @instance.image.value.must_equal "/media/#{S::Media.pad_id(@instance.id)}/0001/something.gif"
       end
     end
 
+    it "immediately updates file fields when their new value is empty" do
+      Spontaneous::Simultaneous.stubs(:fire)
+      field = @instance.image
+      File.open(@image, "r") do |file|
+        fields = {
+          field.schema_id.to_s => {:tempfile => file, :filename => "something.gif", :type => "image/gif"}
+        }
+        Spontaneous::Field.update(@site, @instance, fields, nil, false)
+        @instance.reload
+        field = @instance.image
+        field.value.must_equal "/media/#{S::Media.pad_id(@instance.id)}/0001/something.gif"
+        field.pending_value.must_be_nil
+      end
+      fields = {field.schema_id.to_s => ""}
+      Spontaneous::Field.update(@site, @instance, fields, nil, true)
+      @instance.reload
+      field = @instance.image
+      field.value.must_equal ""
+      field.pending_value.must_be_nil
+    end
+
     it "not update a field if user does not have necessary permissions" do
       user = mock()
       @instance.title.expects(:writable?).with(user).at_least_once.returns(false)
       fields = {
         @instance.title.schema_id.to_s => "Updated title"
       }
-      Spontaneous::Field.update(@instance, fields, user, true)
+      Spontaneous::Field.update(@site, @instance, fields, user, true)
       @instance.title.value.must_equal ""
     end
 
@@ -1460,7 +1535,7 @@ describe "Fields" do
       immediate = mock()
       immediate.expects(:pages).returns([])
       immediate.expects(:run)
-      Spontaneous::Field::Update::Immediate.expects(:new).with([@instance.image, @instance.items.title]).returns(immediate)
+      Spontaneous::Field::Update::Immediate.expects(:new).with(@site, [@instance.image, @instance.items.title]).returns(immediate)
       # Thor generates a warning about creating a task with no 'desc'
       silence_logger {
         Spontaneous::Cli::Fields.any_instance.stubs(:prepare!)
@@ -1477,7 +1552,7 @@ describe "Fields" do
 
     it "revert to immediate updating if connection to simultaneous fails" do
       File.open(@image, "r") do |file|
-        Spontaneous::Field.set(@instance.image, {:tempfile => file, :filename => "something.gif", :type => "image/gif"}, nil, true)
+        Spontaneous::Field.set(@site, @instance.image, {:tempfile => file, :filename => "something.gif", :type => "image/gif"}, nil, true)
         @instance.image.value.must_equal "/media/#{S::Media.pad_id(@instance.id)}/0001/something.gif"
         @instance.image.pending_value.must_be_nil
       end
@@ -1519,7 +1594,7 @@ describe "Fields" do
           "fields" => [@page.image.id]
         })
         File.open(@image, "r") do |file|
-          Spontaneous::Field.set(@page.image, {:tempfile => file, :filename => "something.gif", :type => "image/gif"}, nil, true)
+          Spontaneous::Field.set(@site, @page.image, {:tempfile => file, :filename => "something.gif", :type => "image/gif"}, nil, true)
           @page.image.value.must_equal ""
           @page.update_locks.length.must_equal 1
           lock = @page.update_locks.first
@@ -1535,7 +1610,7 @@ describe "Fields" do
 
       it "not create locks for fields processed immediately" do
         field = @instance.title
-        Spontaneous::Field.set(field, "Updated Title", nil, true)
+        Spontaneous::Field.set(@site, field, "Updated Title", nil, true)
         field.value.must_equal "Updated Title"
         @page.update_locks.length.must_equal 0
         refute @page.locked_for_update?
@@ -1547,7 +1622,7 @@ describe "Fields" do
           "fields" => [field.id]
         })
         File.open(@image, "r") do |file|
-          Spontaneous::Field.set(field, {:tempfile => file, :filename => "something.gif", :type => "image/gif"}, nil, true)
+          Spontaneous::Field.set(@site, field, {:tempfile => file, :filename => "something.gif", :type => "image/gif"}, nil, true)
           field.value.must_equal ""
           @page.update_locks.length.must_equal 1
           lock = @page.update_locks.first
@@ -1567,7 +1642,7 @@ describe "Fields" do
           "fields" => [field.id]
         })
         File.open(@image, "r") do |file|
-          Spontaneous::Field.set(field, {:tempfile => file, :filename => "something.gif", :type => "image/gif"}, nil, true)
+          Spontaneous::Field.set(@site, field, {:tempfile => file, :filename => "something.gif", :type => "image/gif"}, nil, true)
           field.value.must_equal ""
           @page.update_locks.length.must_equal 1
           lock = @page.update_locks.first
@@ -1586,14 +1661,14 @@ describe "Fields" do
           "fields" => [@page.image.id]
         })
         File.open(@image, "r") do |file|
-          Spontaneous::Field.set(@page.image, {:tempfile => file, :filename => "something.gif", :type => "image/gif"}, nil, true)
+          Spontaneous::Field.set(@site, @page.image, {:tempfile => file, :filename => "something.gif", :type => "image/gif"}, nil, true)
           @page.image.value.must_equal ""
           @page.update_locks.length.must_equal 1
           assert @page.locked_for_update?
           # The lock manipulation is done by the updater
           # so calling update_pending_value on the field
           # won't clear any locks
-          Spontaneous::Field::Update::Immediate.process([@page.image])
+          Spontaneous::Field::Update::Immediate.process(@site, [@page.image])
           @page.image.value.must_equal "/media/#{@page.id.to_s.rjust(5, "0")}/0001/something.gif"
           refute @page.reload.locked_for_update?
         end
@@ -1607,7 +1682,7 @@ describe "Fields" do
         Simultaneous.expects(:send_event).with('page_lock_status', "[#{@page.id}]")
 
         File.open(@image, "r") do |file|
-          Spontaneous::Field.set(field, {:tempfile => file, :filename => "something.gif", :type => "image/gif"}, nil, true)
+          Spontaneous::Field.set(@site, field, {:tempfile => file, :filename => "something.gif", :type => "image/gif"}, nil, true)
           assert @page.locked_for_update?
           silence_logger {
             Spontaneous::Cli::Fields.any_instance.stubs(:prepare!)
@@ -1630,15 +1705,15 @@ describe "Fields" do
           "fields" => [field.id]
         })
         File.open(@image, "r") do |file|
-          Spontaneous::Field.set(field, {:tempfile => file, :filename => "something.gif", :type => "image/gif"}, nil, true)
+          Spontaneous::Field.set(@site, field, {:tempfile => file, :filename => "something.gif", :type => "image/gif"}, nil, true)
         end
-        update = Spontaneous::Field::Update::Immediate.new(field)
+        update = Spontaneous::Field::Update::Immediate.new(@site, field)
         old, field = field, field.reload
         later = @now + 1
         t = S::Field.timestamp(later)
         S::Field.stubs(:timestamp).returns(t)
         File.open(@image, "r") do |file|
-          Spontaneous::Field.set(field, {:tempfile => file, :filename => "else.gif", :type => "image/jpeg"}, nil, true)
+          Spontaneous::Field.set(@site, field, {:tempfile => file, :filename => "else.gif", :type => "image/jpeg"}, nil, true)
         end
         update.run
 
@@ -1659,10 +1734,10 @@ describe "Fields" do
           "fields" => [field.id]
         })
         File.open(@image, "r") do |file|
-          Spontaneous::Field.set(field, {:tempfile => file, :filename => "something.gif", :type => "image/gif"}, nil, true)
+          Spontaneous::Field.set(@site, field, {:tempfile => file, :filename => "something.gif", :type => "image/gif"}, nil, true)
         end
         # Create update but don't run it
-        update = Spontaneous::Field::Update::Immediate.new(field)
+        update = Spontaneous::Field::Update::Immediate.new(@site, field)
         # Someone updates a field before the async update is run...
         content = ::Content.get(@instance.id)
         content.title = "Updated Title"
@@ -1684,10 +1759,10 @@ describe "Fields" do
           "fields" => [field.id]
         })
         File.open(@image, "r") do |file|
-          Spontaneous::Field.set(field, {:tempfile => file, :filename => "something.gif", :type => "image/gif"}, nil, true)
+          Spontaneous::Field.set(@site, field, {:tempfile => file, :filename => "something.gif", :type => "image/gif"}, nil, true)
         end
         # Create update but don't run it
-        update = Spontaneous::Field::Update::Immediate.new(field)
+        update = Spontaneous::Field::Update::Immediate.new(@site, field)
         # Someone updates a field before the async update is run...
         content = ::Content.get(@page.id)
         content.instances.title = "Updated Title"
@@ -1728,10 +1803,10 @@ describe "Fields" do
           "fields" => [field.id]
         })
         File.open(@image, "r") do |file|
-          Spontaneous::Field.set(field, {:tempfile => file, :filename => "something.gif", :type => "image/gif"}, nil, true)
+          Spontaneous::Field.set(@site, field, {:tempfile => file, :filename => "something.gif", :type => "image/gif"}, nil, true)
         end
         # Create update but don't run it
-        update = Spontaneous::Field::Update::Immediate.new(field)
+        update = Spontaneous::Field::Update::Immediate.new(@site, field)
 
         @page.destroy