spontaneous 0.2.0.alpha7 → 0.2.0.beta1

data/test/functional/test_back.rb

@@ -23,7 +23,7 @@ class BackTest < MiniTest::Spec
   end
 
   def self.shutdown
-    teardown_site
+    teardown_site(true)
   end
 
   def app
@@ -31,11 +31,16 @@ class BackTest < MiniTest::Spec
   end
 
   def setup
-    @site = setup_site(self.class.site_root)
+    @site = setup_site(self.class.site_root, true)
     Spot::Permissions::UserLevel.reset!
     Spot::Permissions::UserLevel.init!
   end
 
+  def teardown
+    teardown_site(false)
+  end
+
+
 
   def auth_post(path, params={}, env={})
     post(path, params.merge("__key" => @key), env)
@@ -53,11 +58,14 @@ class BackTest < MiniTest::Spec
       config.stubs(:reload_classes).returns(false)
       config.stubs(:auto_login).returns('root')
       config.stubs(:default_charset).returns('utf-8')
-      config.stubs(:publishing_method).returns(:immediate)
+      config.stubs(:background_mode).returns(:immediate)
+      config.stubs(:publishing_delay).returns(nil)
       config.stubs(:services).returns(nil)
       config.stubs(:site_domain).returns('example.org')
       config.stubs(:site_id).returns('example_org')
       config.stubs(:site_id).returns('example_org')
+      config.stubs(:simultaneous_connection).returns('')
+      config.stubs(:spontaneous_binary).returns('')
       @site.stubs(:config).returns(config)
 
       S::Rack::Back::EditingInterface.set :raise_errors, true
@@ -75,7 +83,7 @@ class BackTest < MiniTest::Spec
       # annoying to have to do this, but there you go
       @user = Spontaneous::Permissions::User.create(:email => "root@example.com", :login => "root", :name => "root name", :password => "rootpass")
       @user.update(:level => Spontaneous::Permissions[:editor])
-      @user.save
+      @user.save.reload
       @key = "c5AMX3r5kMHX2z9a5ExLKjAmCcnT6PFf22YQxzb4Codj"
       @key.stubs(:user).returns(@user)
       @key.stubs(:key_id).returns(@key)
@@ -86,11 +94,11 @@ class BackTest < MiniTest::Spec
       Spontaneous::Permissions::AccessKey.stubs(:authenticate).with(@key).returns(@key)
       Spontaneous::Permissions::AccessKey.stubs(:valid?).with(@key, @user).returns(true)
 
-      class Page < Spot::Page
+      class Page < Page
         field :title
       end
 
-      class Piece < Spot::Piece; end
+      class Piece < Piece; end
       class Project < Page; end
       class Image < Piece
         field :image, :image
@@ -131,7 +139,6 @@ class BackTest < MiniTest::Spec
         field :private, :user_level => :root
       end
 
-
       @home = HomePage.new(:title => "Home")
       @project1 = Project.new(:title => "Project 1", :slug => "project1")
       @project2 = Project.new(:title => "Project 2", :slug => "project2")
@@ -152,7 +159,6 @@ class BackTest < MiniTest::Spec
 
       @home.save
       @home = Content[@home.id]
-
     end
 
     teardown do
@@ -176,11 +182,11 @@ class BackTest < MiniTest::Spec
         auth_get '/@spontaneous/root'
         assert last_response.ok?
         last_response.content_type.should == "application/json;charset=utf-8"
-        assert_equal S::JSON.encode(Site.root.export), last_response.body
+        assert_equal S::JSON.encode(S::Site.root.export), last_response.body
       end
 
       should "return json for individual pages" do
-        page = Site.root.children.first
+        page = S::Site.root.children.first
         auth_get "/@spontaneous/page/#{page.id}"
         assert last_response.ok?
         last_response.content_type.should == "application/json;charset=utf-8"
@@ -199,7 +205,7 @@ class BackTest < MiniTest::Spec
         assert last_response.ok?, "Should have recieved a 200 OK but got a #{ last_response.status }"
         last_response.content_type.should == "application/json;charset=utf-8"
         result = Spot::JSON.parse(last_response.body)
-        result[:types].stringify_keys.should == Site.schema.export(@user)
+        result[:types].stringify_keys.should == S::Site.schema.export(@user)
       end
 
       should "apply the current user's permissions to the exported schema" do
@@ -227,14 +233,14 @@ class BackTest < MiniTest::Spec
       end
 
       should "return the configured list of service URLs in the metadata" do
-        Site.config.stubs(:services).returns([
+        S::Site.config.stubs(:services).returns([
           {:title => "Google Analytics", :url => "http://google.com/analytics"},
           {:title => "Facebook", :url => "http://facebook.com/spontaneous"}
         ])
         auth_get "/@spontaneous/metadata"
         assert last_response.ok?, "Should have recieved a 200 OK but got a #{ last_response.status }"
         result = Spot::JSON.parse(last_response.body)
-        result[:services].should == Site.config.services
+        result[:services].should == S::Site.config.services
       end
 
       should "return scripts from js dir" do
@@ -249,14 +255,14 @@ class BackTest < MiniTest::Spec
         auth_get '/@spontaneous/map'
         assert last_response.ok?
         last_response.content_type.should == "application/json;charset=utf-8"
-        assert_equal Site.map.to_json, last_response.body
+        assert_equal S::Site.map.to_json, last_response.body
       end
 
       should "return a site map for any page id" do
         auth_get "/@spontaneous/map/#{@home.id}"
         assert last_response.ok?
         last_response.content_type.should == "application/json;charset=utf-8"
-        assert_equal Site.map(@home.id).to_json, last_response.body
+        assert_equal S::Site.map(@home.id).to_json, last_response.body
       end
 
       should "return a site map for any url" do
@@ -264,19 +270,19 @@ class BackTest < MiniTest::Spec
         auth_get "/@spontaneous/location#{@project1.path}"
         assert last_response.ok?
         last_response.content_type.should == "application/json;charset=utf-8"
-        assert_equal Site.map(@project1.id).to_json, last_response.body
+        assert_equal S::Site.map(@project1.id).to_json, last_response.body
       end
 
       should "return 404 when asked for map of non-existant page" do
         id = '9999'
-        S::Content.stubs(:[]).with(id).returns(nil)
+        ::Content.stubs(:[]).with(id).returns(nil)
         auth_get "/@spontaneous/map/#{id}"
         assert last_response.status == 404
       end
 
       should "return the correct Last-Modified header for the site map" do
         now = Time.at(Time.now.to_i + 10000)
-        S::Site.stubs(:modified_at).returns(now)
+        Spontaneous::Site.stubs(:modified_at).returns(now)
         auth_get '/@spontaneous/map'
         Time.httpdate(last_response.headers["Last-Modified"]).should == now
         auth_get "/@spontaneous/location#{@project1.path}"
@@ -286,7 +292,7 @@ class BackTest < MiniTest::Spec
       should "reply with a 304 Not Modified if the site hasn't been updated since last request" do
         datestring = "Sat, 03 Mar 2012 00:49:44 GMT"
         now = Time.httpdate(datestring)
-        S::Site.stubs(:modified_at).returns(now)
+        Spontaneous::Site.stubs(:modified_at).returns(now)
         auth_get "/@spontaneous/map/#{@home.id}", {}, {"HTTP_IF_MODIFIED_SINCE" => datestring}
         last_response.status.should == 304
         auth_get "/@spontaneous/map", {}, {"HTTP_IF_MODIFIED_SINCE" => datestring}
@@ -299,7 +305,7 @@ class BackTest < MiniTest::Spec
         datestring1 = "Sat, 03 Mar 2012 00:49:44 GMT"
         datestring2 = "Sat, 03 Mar 2012 01:49:44 GMT"
         now = Time.httpdate(datestring2)
-        S::Site.stubs(:modified_at).returns(now)
+        Spontaneous::Site.stubs(:modified_at).returns(now)
         auth_get "/@spontaneous/map/#{@home.id}", {}, {"HTTP_IF_MODIFIED_SINCE" => datestring1}
         last_response.status.should == 200
         auth_get "/@spontaneous/location#{@project1.path}", {}, {"HTTP_IF_MODIFIED_SINCE" => datestring1}
@@ -336,7 +342,7 @@ class BackTest < MiniTest::Spec
 
         should "update content field values" do
           params = {
-            "field[#{@job1.fields.title.schema_id.to_s}][value]" => "Updated field_name_1"
+            "field[#{@job1.fields.title.schema_id.to_s}]" => "Updated field_name_1"
           }
           auth_post "/@spontaneous/save/#{@job1.id}", params
           assert last_response.ok?
@@ -348,8 +354,8 @@ class BackTest < MiniTest::Spec
 
         should "update page field values" do
           params = {
-            "field[#{@home.fields.title.schema_id.to_s}][value]" => "Updated title",
-            "field[#{@home.fields.introduction.schema_id.to_s}][value]" => "Updated intro"
+            "field[#{@home.fields.title.schema_id.to_s}]" => "Updated title",
+            "field[#{@home.fields.introduction.schema_id.to_s}]" => "Updated intro"
           }
           auth_post "/@spontaneous/save/#{@home.id}", params
           assert last_response.ok?
@@ -360,11 +366,26 @@ class BackTest < MiniTest::Spec
           @home.fields.introduction.value.should ==  "<p>Updated intro</p>\n"
         end
 
+        should "trigger replacement of default slug if title is first set xxx" do
+
+          project = Project.new
+          @home.projects << project
+          @home.save
+          project.has_generated_slug?.should be_true
+          params = {
+            "field[#{@home.fields.title.schema_id.to_s}]" => "Updated title",
+          }
+          auth_post "/@spontaneous/save/#{project.id}", params
+          project.reload
+          project.slug.should == "updated-title"
+          project.has_generated_slug?.should be_false
+        end
+
         should "update box field values" do
           box = @job1.images
           box.fields.title.to_s.should_not == "Updated title"
           params = {
-            "field[#{box.fields.title.schema_id.to_s}][value]" => "Updated title"
+            "field[#{box.fields.title.schema_id.to_s}]" => "Updated title"
           }
           auth_post "/@spontaneous/savebox/#{@job1.id}/#{box.schema_id.to_s}", params
           assert last_response.ok?
@@ -390,6 +411,22 @@ class BackTest < MiniTest::Spec
           }
         end
 
+        should "not generate an error if the pending version of the field matches" do
+          field = @job1.fields.title
+          field.version = 2
+          field.processed_values[:__pending__] = {:value => "something.gif", :version => 3 }
+          @job1.save_fields
+          @job1.reload
+          field = @job1.fields.title
+          field.pending_version.should == 3
+          sid = field.schema_id.to_s
+          params = { "fields" => {sid => "3"} }
+
+          auth_post "/@spontaneous/version/#{@job1.id}", params
+          assert last_response.status == 200, "Should have recieved a 200 OK but instead received a #{last_response.status}"
+        end
+
+
         should "generate an error if there is a field version conflict for boxes" do
           box = @job1.images
           field = box.fields.title
@@ -575,7 +612,7 @@ class BackTest < MiniTest::Spec
         #   :src => src,
         #   :version => 1
         # }.to_json
-        File.exist?(Media.to_filepath(src)).should be_true
+        File.exist?(S::Media.to_filepath(src)).should be_true
         get src
         assert last_response.ok?
       end
@@ -593,7 +630,7 @@ class BackTest < MiniTest::Spec
         #   :src => src,
         #   :version => 1
         # }.to_json
-        File.exist?(Media.to_filepath(src)).should be_true
+        File.exist?(S::Media.to_filepath(src)).should be_true
         get src
         assert last_response.ok?
       end
@@ -729,9 +766,9 @@ class BackTest < MiniTest::Spec
     end
     context "UIDs" do
       setup do
+        Spontaneous.stubs(:reload!)
         # editing UIDs is a developer only activity
         @user.update(:level => Spontaneous::Permissions[:root])
-        @user.save
       end
 
       should "be editable" do
@@ -744,7 +781,7 @@ class BackTest < MiniTest::Spec
       end
 
       should "not be editable by non-developer users" do
-        @user.stubs(:developer?).returns(false)
+        @user.update(:level => Spontaneous::Permissions[:editor])
         uid = "boom"
         orig = @project1.uid
         @project1.uid.should_not == uid
@@ -753,12 +790,6 @@ class BackTest < MiniTest::Spec
         @project1.reload.uid.should == orig
       end
     end
-    context "Request cache" do
-      setup do
-        Spontaneous.stubs(:reload!)
-      end
-
-    end
 
     context "Publishing" do
       setup do
@@ -775,17 +806,17 @@ class BackTest < MiniTest::Spec
         auth_get "/@spontaneous/publish/changes"
         assert last_response.ok?, "Expected 200 recieved #{last_response.status}"
         last_response.content_type.should == "application/json;charset=utf-8"
-        last_response.body.should == Change.serialise_http
+        last_response.body.should == S::Change.serialise_http
       end
 
       should "be able to start a publish with a set of change sets" do
-        Site.expects(:publish_pages).with([@project1.id])
+        S::Site.expects(:publish_pages).with([@project1.id])
         auth_post "/@spontaneous/publish/publish", :page_ids => [@project1.id]
         assert last_response.ok?, "Expected 200 recieved #{last_response.status}"
       end
 
       should "not launch publish if list of changes is empty" do
-        Site.expects(:publish_pages).with().never
+        S::Site.expects(:publish_pages).with().never
         auth_post "/@spontaneous/publish/publish", :change_set_ids => ""
         assert last_response.status == 400, "Expected 400, recieved #{last_response.status}"
 
@@ -793,7 +824,7 @@ class BackTest < MiniTest::Spec
         assert last_response.status == 400
       end
       should "recognise when the list of changes is complete" do
-        Site.expects(:publish_pages).with([@home.id, @project1.id])
+        S::Site.expects(:publish_pages).with([@home.id, @project1.id])
         auth_post "/@spontaneous/publish/publish", :page_ids => [@home.id, @project1.id]
         assert last_response.ok?, "Expected 200 recieved #{last_response.status}"
       end
@@ -802,7 +833,7 @@ class BackTest < MiniTest::Spec
     context "New sites" do
       setup do
         Spontaneous.stubs(:reload!)
-        @root_class = Site.root.class
+        @root_class = S::Site.root.class
         Content.delete
       end
       should "raise a 406 Not Acceptable error when downloading page details" do
@@ -812,8 +843,8 @@ class BackTest < MiniTest::Spec
       should "create a homepage of the specified type" do
         auth_post "/@spontaneous/root", 'type' => @root_class.schema_id
         assert last_response.ok?
-        Site.root.must_be_instance_of(@root_class)
-        Site.root.title.value.should =~ /Home/
+        S::Site.root.must_be_instance_of(@root_class)
+        S::Site.root.title.value.should =~ /Home/
       end
       should "only create one root" do
         auth_post "/@spontaneous/root", 'type' => @root_class.schema_id
@@ -1070,11 +1101,9 @@ class BackTest < MiniTest::Spec
         end
         @image1.image.processed_value.should == ""
         dataset = mock()
-        S::Content.stubs(:for_update).returns(dataset)
-        dataset.stubs(:first).with(:id => @image1.id.to_s).returns(@image1)
-        dataset.stubs(:first).with(:id => @image1.id).returns(@image1)
-        # S::Content.stubs(:[]).with(@image1.id.to_s).returns(@image1)
-        # S::Content.stubs(:[]).with(@image1.id).returns(@image1)
+        ::Content.stubs(:for_update).returns(dataset)
+        dataset.stubs(:get).with(@image1.id.to_s).returns(@image1)
+        dataset.stubs(:get).with(@image1.id).returns(@image1)
         auth_post "/@spontaneous/shard/replace/#{@image1.id}", "filename" => "rose.jpg",
           "shards" => hashes, "field" => @image1.image.schema_id.to_s
         assert last_response.ok?
@@ -1083,8 +1112,9 @@ class BackTest < MiniTest::Spec
         src = @image1.image.src
         src.should =~ %r{^(.+)/rose\.jpg$}
         Spot::JSON.parse(last_response.body).should == @image1.image.export
-        File.exist?(Media.to_filepath(src)).should be_true
-        S::Media.digest(Media.to_filepath(src)).should == @image_digest
+        File.exist?(S::Media.to_filepath(src)).should be_true
+        S::Media.digest(S::Media.to_filepath(src)).should == @image_digest
+
       end
 
       should "be able to wrap pieces around files using default addable class" do
@@ -1163,6 +1193,7 @@ class BackTest < MiniTest::Spec
       end
 
       should "be able to provide a dynamic value list" do
+        @job1.reload
         list = mock()
         options = [["a", "Value A"], ["b", "Value B"]]
         list.expects(:values).with(@job1).returns(options)
@@ -1174,6 +1205,7 @@ class BackTest < MiniTest::Spec
       end
 
       should "be able to provide a dynamic value list for a box field" do
+        @job1.reload
         list = mock()
         options = [["a", "Value A"], ["b", "Value B"]]
         list.expects(:values).with(@job1.images).returns(options)

data/test/functional/test_front.rb

@@ -19,13 +19,18 @@ class FrontTest < MiniTest::Spec
   end
 
   def self.shutdown
-    teardown_site
+    teardown_site(true)
     Spontaneous::Output.write_compiled_scripts = false
   end
 
   def setup
     @site = setup_site(self.class.site_root)
-    Site.publishing_method = :immediate
+    Site.background_mode = :immediate
+    ::Content.delete
+  end
+
+  def teardown
+    teardown_site(false)
   end
 
   def app
@@ -68,11 +73,10 @@ class FrontTest < MiniTest::Spec
     setup do
 
 
-      Site.publishing_method = :immediate
-      State.delete
-      Content.delete
+      S::Site.background_mode = :immediate
+      S::State.delete
 
-      class ::SitePage < Spontaneous::Page
+      class ::SitePage < ::Page
         layout :default
         layout :dynamic
         box :pages
@@ -94,22 +98,24 @@ class FrontTest < MiniTest::Spec
       # @site.stubs(:template_root).returns(File.expand_path("../../fixtures/public/templates", __FILE__))
       # self.template_root = File.expand_path("../../fixtures/public/templates", __FILE__)
 
-      @root = ::SitePage.create
-      @about = ::SitePage.create(:slug => "about", :uid => "about")
-      @sub = ::SubPage.create(:slug => "now", :uid => "now")
-      @news = ::SitePage.create(:slug => "news", :uid => "news")
-      @dynamic = ::SitePage.create(:slug => "dynamic", :uid => "dynamic")
-      @dynamic.layout = :dynamic
-      @root.pages << @about
-      @root.pages << @news
-      @root.pages << @dynamic
-      @about.pages << @sub
-      @root.save
+      ::Content.scope do
+        @root = ::SitePage.create
+        @about = ::SitePage.create(:slug => "about", :uid => "about")
+        @sub = ::SubPage.create(:slug => "now", :uid => "now")
+        @news = ::SitePage.create(:slug => "news", :uid => "news")
+        @dynamic = ::SitePage.create(:slug => "dynamic", :uid => "dynamic")
+        @dynamic.layout = :dynamic
+        @root.pages << @about
+        @root.pages << @news
+        @root.pages << @dynamic
+        @about.pages << @sub
+        @root.save
+      end
 
       Content.delete_revision(1) rescue nil
 
       Spontaneous.logger.silent! {
-        Site.publish_all
+        S::Site.publish_all
       }
     end
 
@@ -117,7 +123,7 @@ class FrontTest < MiniTest::Spec
       Object.send(:remove_const, :SitePage) rescue nil
       Object.send(:remove_const, :SubPage) rescue nil
       Content.delete
-      State.delete
+      S::State.delete
       Content.delete_revision(1)
     end
 
@@ -184,8 +190,8 @@ class FrontTest < MiniTest::Spec
 
     context "Dynamic pages" do
       setup do
-        Spontaneous::Page.stubs(:path).with("/about").returns(about)
-        Spontaneous::Page.stubs(:path).with("/news").returns(news)
+        Content::Page.stubs(:path).with("/about").returns(about)
+        Content::Page.stubs(:path).with("/news").returns(news)
       end
 
       should "default to static behaviour" do
@@ -382,16 +388,16 @@ class FrontTest < MiniTest::Spec
 
     end
 
-    context "Templates" do
+    context "Templates xxx" do
       setup do
-        # Page.stubs(:path).with("/about").returns(about)
-        # about.style = :dynamic
-        # about.save
+        Spontaneous::Output.cache_templates = true
+        @cache_file = "#{Spontaneous.revision_dir(1)}/dynamic/dynamic.html.rb"
+        FileUtils.rm(@cache_file) if File.exist?(@cache_file)
+        Spontaneous::Output.write_compiled_scripts = true
       end
 
       teardown do
-        # about.style = :default
-        # about.save
+        Spontaneous::Output.cache_templates = true
       end
 
       should "have access to the params, request & session object" do
@@ -401,21 +407,10 @@ class FrontTest < MiniTest::Spec
       end
 
       context "caching" do
-        setup do
-          Spontaneous::Output.cache_templates = true
-          @cache_file = "#{Spontaneous.revision_dir(1)}/dynamic/dynamic.html.rb"
-          Spontaneous::Output.write_compiled_scripts = true
-        end
-
-        teardown do
-          Spontaneous::Output.cache_templates = true
-        end
-
-        should "use pre-rendered versions of the templates" do
+        should "use pre-rendered versions of the templates xxx" do
           dummy_content = 'cached-version/#{session[\'user_id\']}'
           dummy_template = File.join(@site.revision_root, "current/dynamic/dynamic.html.cut")
           File.open(dummy_template, 'w') { |f| f.write(dummy_content) }
-          # Spontaneous::Render.stubs(:output_path).returns(dummy_template)
           get '/dynamic', {'wendy' => 'peter'}, 'rack.session' => { 'user_id' => 42 }
           last_response.body.should == "cached-version/42"
         end
@@ -435,12 +430,10 @@ class FrontTest < MiniTest::Spec
           File.utime(Time.now, Time.now + 1, @cache_file)
           get '/dynamic', {'wendy' => 'peter'}, 'rack.session' => { 'user_id' => 42 }
           last_response.body.should == "@cache_filed-version/peter"
-          FileUtils.rm(@cache_file)
         end
 
         should "not cache templates if caching turned off" do
           Spontaneous::Output.cache_templates = false
-          FileUtils.rm(@cache_file) if File.exists?(@cache_file)
           File.exists?(@cache_file).should be_false
           get '/dynamic', {'wendy' => 'peter'}, 'rack.session' => { 'user_id' => 42 }
           File.exists?(@cache_file).should be_false
@@ -450,7 +443,7 @@ class FrontTest < MiniTest::Spec
 
     context "Model controllers" do
       setup do
-        class ::TestController < Spontaneous::PageController
+        class ::TestController < Spontaneous::Rack::PageController
           get '/' do
             "Magic"
           end
@@ -488,9 +481,9 @@ class FrontTest < MiniTest::Spec
           end
         end
 
-        Page.stubs(:path).with("/").returns(root)
-        Page.stubs(:path).with("/about").returns(about)
-        Page.stubs(:path).with("/about/now").returns(subpage)
+        Content.stubs(:path).with("/").returns(root)
+        Content.stubs(:path).with("/about").returns(about)
+        Content.stubs(:path).with("/about/now").returns(subpage)
       end
 
       teardown do
@@ -597,7 +590,7 @@ class FrontTest < MiniTest::Spec
 
       context "overriding base controller class" do
         setup do
-          class ::PageController < S::PageController
+          class ::PageController < S::Rack::PageController
             get '/nothing' do
               'Something'
             end

data/test/functional/test_user_manager.rb

@@ -21,7 +21,7 @@ class UserAdminTest < MiniTest::Spec
   end
 
   def self.shutdown
-    teardown_site
+    teardown_site(true)
   end
 
   def app
@@ -42,11 +42,12 @@ class UserAdminTest < MiniTest::Spec
   end
 
   def teardown
+    teardown_site(false)
     S::Permissions::User.delete
   end
 
   def create_user(name, level)
-    user = Permissions::User.create({
+    user = S::Permissions::User.create({
       :name => "#{name.capitalize}",
       :email => "#{name}@example.org",
       :login => name,
@@ -156,13 +157,6 @@ class UserAdminTest < MiniTest::Spec
       result[:email].should_not be_nil
     end
 
-    should "ignore changes to the salt" do
-      salt = @editor_user.salt
-      auth_put "/@spontaneous/users/#{@editor_user.id}", {  "user[name]" => "Robert Something", "user[login]" => "editor", "user[email]" => "robert@example.com", "user[salt]" => "123456" }
-      assert last_response.ok?
-      @editor_user.reload.salt.should == salt
-    end
-
     should "allow updating of the user's password" do
       new_pass = "123467890"
       auth_put "/@spontaneous/users/password/#{@editor_user.id}", {  "password" => new_pass }

data/test/javascript/test_markdown.rb

@@ -35,9 +35,9 @@ class MarkdownEditorTest < MiniTest::Spec
   def style(command, sel_start, sel_end, value)
     state = @page.eval(<<-JS)
       var input = fake_input(#{sel_start}, #{sel_end}, #{value.inspect})
-      var command = new Spontaneous.FieldTypes.MarkdownField.#{command}(input)
+      var command = new Spontaneous.Field.Markdown.#{command}(input)
       command.execute();
-      Spontaneous.FieldTypes.MarkdownField.TextCommand.get_state(input)
+      Spontaneous.Field.Markdown.TextCommand.get_state(input)
     JS
     result = {
       "before" => state["before"],