kiteditor 1.0.11 → 1.0.12

data/spec/javascripts/mercury/modals/insertsnippet_spec.js.coffee

@@ -1,14 +1,13 @@
 describe "Mercury.modalHandlers.insertSnippet", ->
 
-  template 'mercury/modals/insertsnippet.html'
-
   beforeEach ->
+    fixture.load('mercury/modals/insertsnippet.html')
     Mercury.Snippet.all = []
     Mercury.Snippet.load({
       'snippet_0': {name: 'foo', options: {'first_name': "Jeremy", 'last_name': "Jackson"}},
     })
     @modal =
-      element: $('#test')
+      element: $(fixture.el)
       hide: ->
       options: {snippetName: 'test'}
     Mercury.modalHandlers.insertSnippet.call(@modal)

data/spec/javascripts/mercury/modals/inserttable_spec.js.coffee

@@ -1,31 +1,31 @@
 describe "Mercury.modalHandlers.insertTable", ->
 
-  template 'mercury/modals/inserttable.html'
-
   beforeEach ->
+    fixture.load('mercury/modals/inserttable.html')
     @modal =
-      element: $('#test')
+      element: $(fixture.el)
       hide: ->
+    @insertTable = $.extend(@modal, Mercury.modalHandlers.insertTable)
 
   describe "initializing", ->
 
     beforeEach ->
       @tableEditorSpy = spyOn(Mercury, 'tableEditor').andCallFake(=>)
-      Mercury.modalHandlers.insertTable.call(@modal)
+      @insertTable.initialize()
 
     it "selects the first cell", ->
       expect($('#cell1').hasClass('selected')).toEqual(true)
 
     it "sets the table editor up", ->
       expect(@tableEditorSpy.callCount).toEqual(1)
-      expect(@tableEditorSpy.argsForCall[0][0].get(0)).toEqual($('#table').get(0))
+      expect(@tableEditorSpy.argsForCall[0][0].get(0)).toEqual($('table').get(0))
       expect(@tableEditorSpy.argsForCall[0][1].get(0)).toEqual($('#cell1').get(0))
 
   describe "clicking on the cells", ->
 
     beforeEach ->
       @tableEditorSpy = spyOn(Mercury, 'tableEditor').andCallFake(=>)
-      Mercury.modalHandlers.insertTable.call(@modal)
+      @insertTable.initialize()
 
     it "should unselect any selected cells", ->
       jasmine.simulate.click($('#cell2').get(0))
@@ -44,58 +44,56 @@ describe "Mercury.modalHandlers.insertTable", ->
   describe "clicking on the action buttons", ->
 
     beforeEach ->
-      @addRowSpy = spyOn(Mercury.tableEditor, 'addRow').andCallFake(=>)
-      @removeRowSpy = spyOn(Mercury.tableEditor, 'removeRow').andCallFake(=>)
-      @addColumnSpy = spyOn(Mercury.tableEditor, 'addColumn').andCallFake(=>)
-      @removeColumnSpy = spyOn(Mercury.tableEditor, 'removeColumn').andCallFake(=>)
+      @addRowBeforeSpy    = spyOn(Mercury.tableEditor, 'addRowBefore').andCallFake(=>)
+      @addRowSpy          = spyOn(Mercury.tableEditor, 'addRow').andCallFake(=>)
+      @removeRowSpy       = spyOn(Mercury.tableEditor, 'removeRow').andCallFake(=>)
+      @addColumnBeforeSpy = spyOn(Mercury.tableEditor, 'addColumnBefore').andCallFake(=>)
+      @addColumnSpy       = spyOn(Mercury.tableEditor, 'addColumn').andCallFake(=>)
+      @removeColumnSpy    = spyOn(Mercury.tableEditor, 'removeColumn').andCallFake(=>)
       @increaseColspanSpy = spyOn(Mercury.tableEditor, 'increaseColspan').andCallFake(=>)
       @decreaseColspanSpy = spyOn(Mercury.tableEditor, 'decreaseColspan').andCallFake(=>)
       @increaseRowspanSpy = spyOn(Mercury.tableEditor, 'increaseRowspan').andCallFake(=>)
       @decreaseRowspanSpy = spyOn(Mercury.tableEditor, 'decreaseRowspan').andCallFake(=>)
-      Mercury.modalHandlers.insertTable.call(@modal)
+      @insertTable.initialize()
 
     it "adds a row before the selected cell", ->
-      jasmine.simulate.click($('input[name=insertRowBefore]').get(0))
-      expect(@addRowSpy.callCount).toEqual(1)
-      expect(@addRowSpy.argsForCall[0]).toEqual(['before'])
+      jasmine.simulate.click($('[data-action=addRowBefore]').get(0))
+      expect(@addRowBeforeSpy.callCount).toEqual(1)
 
     it "adds a row after the selected cell", ->
-      jasmine.simulate.click($('input[name=insertRowAfter]').get(0))
+      jasmine.simulate.click($('[data-action=addRow]').get(0))
       expect(@addRowSpy.callCount).toEqual(1)
-      expect(@addRowSpy.argsForCall[0]).toEqual(['after'])
 
     it "deletes the row of the selected cell", ->
-      jasmine.simulate.click($('input[name=deleteRow]').get(0))
+      jasmine.simulate.click($('[data-action=removeRow]').get(0))
       expect(@removeRowSpy.callCount).toEqual(1)
 
     it "adds a column before the selected cell", ->
-      jasmine.simulate.click($('input[name=insertColumnBefore]').get(0))
-      expect(@addColumnSpy.callCount).toEqual(1)
-      expect(@addColumnSpy.argsForCall[0]).toEqual(['before'])
+      jasmine.simulate.click($('[data-action=addColumnBefore]').get(0))
+      expect(@addColumnBeforeSpy.callCount).toEqual(1)
 
     it "adds a column after the selected cell", ->
-      jasmine.simulate.click($('input[name=insertColumnAfter]').get(0))
+      jasmine.simulate.click($('[data-action=addColumn]').get(0))
       expect(@addColumnSpy.callCount).toEqual(1)
-      expect(@addColumnSpy.argsForCall[0]).toEqual(['after'])
 
     it "deletes the column of the selected cell", ->
-      jasmine.simulate.click($('input[name=deleteColumn]').get(0))
+      jasmine.simulate.click($('[data-action=removeColumn]').get(0))
       expect(@removeColumnSpy.callCount).toEqual(1)
 
     it "increases the colspan of the selected cell", ->
-      jasmine.simulate.click($('input[name=increaseColspan]').get(0))
+      jasmine.simulate.click($('[data-action=increaseColspan]').get(0))
       expect(@increaseColspanSpy.callCount).toEqual(1)
 
     it "decreases the colspan of the selected cell", ->
-      jasmine.simulate.click($('input[name=decreaseColspan]').get(0))
+      jasmine.simulate.click($('[data-action=decreaseColspan]').get(0))
       expect(@decreaseColspanSpy.callCount).toEqual(1)
 
     it "increases the rowspan of the selected cell", ->
-      jasmine.simulate.click($('input[name=increaseRowspan]').get(0))
+      jasmine.simulate.click($('[data-action=increaseRowspan]').get(0))
       expect(@increaseRowspanSpy.callCount).toEqual(1)
 
     it "decreases the rowspan of the selected cell", ->
-      jasmine.simulate.click($('input[name=decreaseRowspan]').get(0))
+      jasmine.simulate.click($('[data-action=decreaseRowspan]').get(0))
       expect(@decreaseRowspanSpy.callCount).toEqual(1)
 
 
@@ -107,43 +105,57 @@ describe "Mercury.modalHandlers.insertTable", ->
   describe "changing the border", ->
 
     beforeEach ->
-      Mercury.modalHandlers.insertTable.call(@modal)
+      @insertTable.initialize()
 
     it "changes the border of the table", ->
       $('#table_border').val('19')
       jasmine.simulate.keyup($('#table_border').get(0))
-      expect($('#table').attr('border')).toEqual('19')
+      expect($('table').attr('border')).toEqual('19')
 
     it "handles non-numeric values", ->
-      $('#table_border').val('2x')
+      $('#table_border').attr(value: '2x')
+      # chrome already does this -- so only test in those browsers that will return 12x
+      $('#table_border').attr(value: '2') unless $('#table_border').val() == '2x'
+      jasmine.simulate.keyup($('#table_border').get(0))
+      expect($('table').attr('border')).toEqual('2')
+
+    it "removes the property if empty value specified", ->
+      $('#table_border').val('')
       jasmine.simulate.keyup($('#table_border').get(0))
-      expect($('#table').attr('border')).toEqual('2')
+      expect($('table').attr('border')).toEqual(undefined)
 
 
   describe "changing the cellspacing", ->
 
     beforeEach ->
-      Mercury.modalHandlers.insertTable.call(@modal)
+      @insertTable.initialize()
 
     it "changes the cellspacing of the table", ->
       $('#table_spacing').val('5')
       jasmine.simulate.keyup($('#table_spacing').get(0))
-      expect($('#table').attr('cellspacing')).toEqual('5')
+      expect($('table').attr('cellspacing')).toEqual('5')
 
     it "handles non-numeric values", ->
-      $('#table_spacing').val('12x')
+      $('#table_spacing').attr(value: '12x')
+      # chrome already does this -- so only test in those browsers that will return 12x
+      $('#table_spacing').attr(value: '12') unless $('#table_spacing').val() == '12x'
       jasmine.simulate.keyup($('#table_spacing').get(0))
-      expect($('#table').attr('cellspacing')).toEqual('12')
+      expect($('table').attr('cellspacing')).toEqual('12')
+
+    it "removes the property if empty value specified", ->
+      $('#table_spacing').val('')
+      jasmine.simulate.keyup($('#table_spacing').get(0))
+      expect($('table').attr('cellspacing')).toEqual(undefined)
 
 
   describe "submitting", ->
 
     beforeEach ->
-      Mercury.modalHandlers.insertTable.call(@modal)
+      @insertTable.initialize()
 
     it "triggers an action", ->
       spy = spyOn(Mercury, 'trigger').andCallFake(=>)
-      jasmine.simulate.click($('#submit').get(0))
+      jasmine.simulate.click($('input[type=submit]').get(0))
       expect(spy.callCount).toEqual(1)
       expect(spy.argsForCall[0][0]).toEqual('action')
       expect(spy.argsForCall[0][1]['action']).toEqual('insertTable')
@@ -154,7 +166,5 @@ describe "Mercury.modalHandlers.insertTable", ->
 
     it "hides the modal", ->
       spy = spyOn(@modal, 'hide').andCallFake(=>)
-      jasmine.simulate.click($('#submit').get(0))
+      jasmine.simulate.click($('input[type=submit]').get(0))
       expect(spy.callCount).toEqual(1)
-
-

data/spec/javascripts/mercury/page_editor_spec.js.coffee

@@ -1,9 +1,8 @@
 describe "Mercury.PageEditor", ->
 
-  template 'mercury/page_editor.html'
-
   beforeEach ->
-    Mercury.config.regions.className = 'custom-region-class'
+    fixture.load('mercury/page_editor.html')
+    Mercury.config.regions.attribute = 'custom-region-attribute'
 
   afterEach ->
     @pageEditor = null
@@ -36,9 +35,9 @@ describe "Mercury.PageEditor", ->
       expect(window.mercuryInstance).toEqual(@pageEditor)
 
     it "accepts a saveUrl, and options", ->
-      @pageEditor = new Mercury.PageEditor('/foo/1', {foo: 'bar'})
+      @pageEditor = new Mercury.PageEditor('/foo/1', {foo: 'bar', saveDataType: 'text'})
       expect(@pageEditor.saveUrl).toEqual('/foo/1')
-      expect(@pageEditor.options).toEqual({foo: 'bar', visible: true})
+      expect(@pageEditor.options).toEqual({foo: 'bar', saveDataType: 'text', visible: true})
 
     it "sets the visible option to true unless it's set", ->
       @pageEditor = new Mercury.PageEditor('/foo/1', {foo: 'bar', visible: false})
@@ -60,24 +59,27 @@ describe "Mercury.PageEditor", ->
 
     it "gets the csrf token if there's one available", ->
       new Mercury.PageEditor()
-      expect(Mercury.csrfToken).toEqual('K6JhyfOVKJX8X2ZkiJXSf491fc1fF+k79wzrChHQa0g=')
+      expect(Mercury.csrfToken).toBeDefined()
 
 
   describe "#initializeInterface", ->
 
     beforeEach ->
       @resizeSpy = spyOn(Mercury.PageEditor.prototype, 'resize').andCallFake(=>)
-      Mercury.Toolbar = -> {toolbar: true}
-      Mercury.Statusbar = -> {statusbar: true}
+      spyOn(Mercury, "Toolbar").andReturn({toolbar: true})
+      spyOn(Mercury, "Statusbar").andReturn({statusbar: true})
       @iframeSrcSpy = spyOn(Mercury.PageEditor.prototype, 'iframeSrc').andCallFake(=> '/foo')
 
     it "builds a focusable element (so we can get focus off the iframe)", ->
-      @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test')})
+      @pageEditor = new Mercury.PageEditor('', {appendTo: fixture.el})
       expect($('input.mercury-focusable[type=text]').length).toEqual(1)
 
-    it "builds an iframe", ->
-      @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test')})
-      expect($('iframe.mercury-iframe').length).toEqual(1)
+    it "builds an iframe, setting id, class and name", ->
+      @pageEditor = new Mercury.PageEditor('', {appendTo: fixture.el})
+      iframe = $('iframe.mercury-iframe')
+      expect(iframe.length).toEqual(1)
+      expect(iframe.attr('name')).toEqual 'mercury_iframe'
+      expect(iframe.attr('id')).toEqual   'mercury_iframe'
 
     it "appends the elements to any node", ->
       @pageEditor = new Mercury.PageEditor('', {appendTo: $('#page_editor_container')})
@@ -85,26 +87,36 @@ describe "Mercury.PageEditor", ->
       expect($('#page_editor_container iframe.mercury-iframe').length).toEqual(1)
 
     it "instantiates the toolbar", ->
-      @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test')})
+      @pageEditor = new Mercury.PageEditor('', {appendTo: fixture.el})
       expect(@pageEditor.toolbar).toEqual({toolbar: true})
 
     it "instantiates the statusbar", ->
-      @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test')})
+      @pageEditor = new Mercury.PageEditor('', {appendTo: fixture.el})
       expect(@pageEditor.statusbar).toEqual({statusbar: true})
 
     it "calls resize", ->
-      @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test')})
+      @pageEditor = new Mercury.PageEditor('', {appendTo: fixture.el})
       expect(@resizeSpy.callCount).toEqual(1)
 
+    it "binds to iframe load event", ->
+      initializeFrameSpy = spyOn(Mercury.PageEditor.prototype, 'initializeFrame')
+      bindEventsSpy = spyOn(Mercury.PageEditor.prototype, 'bindEvents')
+
+      @pageEditor = new Mercury.PageEditor('', {appendTo: fixture.el})
+      @pageEditor.iframe.trigger('load')
+
+      expect(initializeFrameSpy.callCount).toEqual(1)
+      expect(bindEventsSpy.callCount).toEqual(1)
 
-  describe "#initializeFrame", ->
+
+  xdescribe "#initializeFrame", ->
 
     beforeEach ->
       @resizeSpy = spyOn(Mercury.PageEditor.prototype, 'resize').andCallFake(=>)
       @bindEventsSpy = spyOn(Mercury.PageEditor.prototype, 'bindEvents').andCallFake(=>)
       @initializeRegionsSpy = spyOn(Mercury.PageEditor.prototype, 'initializeRegions').andCallFake(=>)
       @finalizeInterfaceSpy = spyOn(Mercury.PageEditor.prototype, 'finalizeInterface')
-      @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test')})
+      @pageEditor = new Mercury.PageEditor('', {appendTo: fixture.el})
 
     it "does nothing if the iframe is already loaded", ->
       @finalizeInterfaceSpy.andCallFake(=>)
@@ -139,11 +151,6 @@ describe "Mercury.PageEditor", ->
       @pageEditor.initializeFrame()
       expect(@pageEditor.iframe.get(0).contentWindow.History).toEqual(window.History)
 
-    it "calls bindEvents", ->
-      @finalizeInterfaceSpy.andCallFake(=>)
-      @pageEditor.initializeFrame()
-      expect(@bindEventsSpy.callCount).toEqual(1)
-
     it "calls resize", ->
       @finalizeInterfaceSpy.andCallFake(=>)
       @pageEditor.initializeFrame()
@@ -167,11 +174,13 @@ describe "Mercury.PageEditor", ->
       expect(spy.argsForCall[0]).toEqual(['ready'])
 
     it "fires the ready event (jQuery.trigger)", ->
-      spy = spyOn(jQuery.fn, 'trigger').andCallFake(=>)
+      mock = {trigger: ->}
+      @pageEditor.iframe.get(0).contentWindow.jQuery = -> mock
+      spy = spyOn(mock, 'trigger').andCallFake(=>)
       @finalizeInterfaceSpy.andCallFake(=>)
       @pageEditor.initializeFrame()
-      expect(spy.callCount).toEqual(2)
-      expect(spy.argsForCall[0]).toEqual(['mercury:ready', undefined])
+      expect(spy.callCount).toEqual(1)
+      expect(spy.argsForCall[0]).toEqual(['mercury:ready'])
 
     it "fires the ready event (Event.fire)", ->
       @finalizeInterfaceSpy.andCallFake(=>)
@@ -204,12 +213,12 @@ describe "Mercury.PageEditor", ->
       expect(spy.argsForCall[0]).toEqual(['Mercury.PageEditor failed to load: unknown error\n\nPlease try refreshing.'])
 
 
-  describe "#initializeRegions", ->
+  xdescribe "#initializeRegions", ->
 
     beforeEach ->
       @resizeSpy = spyOn(Mercury.PageEditor.prototype, 'resize').andCallFake(=>)
       Mercury.PageEditor.prototype.initializeFrame = ->
-      @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test')})
+      @pageEditor = new Mercury.PageEditor('', {appendTo: fixture.el})
       @pageEditor.document = $(document)
 
     it "it calls buildRegion for all the regions found in a document", ->
@@ -238,7 +247,7 @@ describe "Mercury.PageEditor", ->
       expect(firstFocusCalled).toEqual(false)
 
 
-  describe "#buildRegion", ->
+  xdescribe "#buildRegion", ->
 #    it "throws an error if it's not supported", ->
 #      Mercury.supported = false
 #      expect(=>
@@ -250,9 +259,9 @@ describe "Mercury.PageEditor", ->
     beforeEach ->
       @resizeSpy = spyOn(Mercury.PageEditor.prototype, 'resize').andCallFake(=>)
       Mercury.PageEditor.prototype.initializeFrame = ->
-      Mercury.Regions.Editable = -> {region: true}
-      Mercury.Regions.Editable.supported = true
-      @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test')})
+      Mercury.Regions.Full = -> {region: true}
+      Mercury.Regions.Full.supported = true
+      @pageEditor = new Mercury.PageEditor('', {appendTo: fixture.el})
 
     it "instantiates the region and pushes it into the regions array", ->
       @pageEditor.buildRegion($('#region2'))
@@ -265,7 +274,7 @@ describe "Mercury.PageEditor", ->
 
     it "throws an exception when the data-type isn't known", ->
       expect(=> @pageEditor.buildRegion($('#region4'))).toThrow('Region type is malformed, no data-type provided, or "Unknown" is unknown for the "region4" region.')
-      $('#region4').attr('data-type', 'foo')
+      $('#region4').attr('custom-region-attribute', 'foo')
       expect(=> @pageEditor.buildRegion($('#region4'))).toThrow('Region type is malformed, no data-type provided, or "Foo" is unknown for the "region4" region.')
 
     it "doesn't re-instantiate the region if the element's already initialized", ->
@@ -276,27 +285,27 @@ describe "Mercury.PageEditor", ->
 
     it "calls togglePreview on the region if in preview mode", ->
       callCount = 0
-      Mercury.Regions.Editable = -> {region: true, togglePreview: -> callCount += 1 }
-      Mercury.Regions.Editable.supported = true
+      Mercury.Regions.Full = -> {region: true, togglePreview: -> callCount += 1 }
+      Mercury.Regions.Full.supported = true
       @pageEditor.previewing = true
       @pageEditor.buildRegion($('#region2'))
       expect(callCount).toEqual(1)
 
     it "doesn't call togglePreview if not in preview mode", ->
       callCount = 0
-      Mercury.Regions.Editable = -> {region: true, togglePreview: -> callCount += 1 }
-      Mercury.Regions.Editable.supported = true
+      Mercury.Regions.Full = -> {region: true, togglePreview: -> callCount += 1 }
+      Mercury.Regions.Full.supported = true
       @pageEditor.buildRegion($('#region2'))
       expect(callCount).toEqual(0)
 
 
-  describe "#finalizeInterface", ->
+  xdescribe "#finalizeInterface", ->
 
     beforeEach ->
       @resizeSpy = spyOn(Mercury.PageEditor.prototype, 'resize').andCallFake(=>)
       Mercury.PageEditor.prototype.initializeFrame = ->
       Mercury.SnippetToolbar = -> {snippetToolbar: true}
-      @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test')})
+      @pageEditor = new Mercury.PageEditor('', {appendTo: fixture.el})
       @highjackLinksAndFormsSpy = spyOn(Mercury.PageEditor.prototype, 'hijackLinksAndForms').andCallFake(=>)
 
     it "injects an sanitizing element used for sanitizing content", ->
@@ -313,24 +322,25 @@ describe "Mercury.PageEditor", ->
 
     it "fires a mode event to put things into preview mode if it's not visible yet", ->
       spy = spyOn(Mercury, 'trigger').andCallFake(=>)
-      @pageEditor.options.visible = false
+      @pageEditor.visible = false
       @pageEditor.finalizeInterface()
       expect(spy.callCount).toEqual(1)
 
 
-  describe "observed events", ->
+  xdescribe "observed events", ->
 
     beforeEach ->
       @initializeInterfaceSpy = spyOn(Mercury.PageEditor.prototype, 'initializeInterface').andCallFake(=>)
-      @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test')})
+      @pageEditor = new Mercury.PageEditor('', {appendTo: fixture.el})
       @pageEditor.document = $(document)
       @pageEditor.bindEvents()
+      @pageEditor.bindDocumentEvents()
 
     describe "custom event: initialize:frame", ->
 
       it "calls initializeFrame", ->
         @initializeFrameSpy = spyOn(Mercury.PageEditor.prototype, 'initializeFrame').andCallFake(=>)
-        @setTimeoutSpy = spyOn(window, 'setTimeout').andCallFake((timeout, callback) -> callback())
+        @setTimeoutSpy = spyOn(window, 'setTimeout').andCallFake((callback, timeout) -> callback())
         Mercury.trigger('initialize:frame')
         expect(@initializeFrameSpy.callCount).toEqual(1)
         expect(@setTimeoutSpy.callCount).toEqual(1)
@@ -348,7 +358,7 @@ describe "Mercury.PageEditor", ->
       it "calls focus on a focusable element", ->
         callCount = 0
         @pageEditor.focusableElement = {focus: -> callCount += 1}
-        @setTimeoutSpy = spyOn(window, 'setTimeout').andCallFake((timeout, callback) -> callback())
+        @setTimeoutSpy = spyOn(window, 'setTimeout').andCallFake((callback, timeout) -> callback())
         Mercury.trigger('focus:window')
         expect(callCount).toEqual(1)
 
@@ -420,7 +430,7 @@ describe "Mercury.PageEditor", ->
         #expect(spy.callCount).toEqual(1)
 
 
-  describe "#toggleInterface", ->
+  xdescribe "#toggleInterface", ->
 
     beforeEach ->
       spec = @
@@ -431,6 +441,7 @@ describe "Mercury.PageEditor", ->
       Mercury.Toolbar = -> {
         toolbar: true,
         height: (-> 100),
+        top: (-> 0),
         show: (=> spec.toolbarShowCallCount += 1),
         hide: (=> spec.toolbarHideCallCount += 1)
       }
@@ -441,7 +452,7 @@ describe "Mercury.PageEditor", ->
         hide: (=> spec.statusbarHideCallCount += 1)
       }
       Mercury.PageEditor.prototype.initializeFrame = ->
-      @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test')})
+      @pageEditor = new Mercury.PageEditor('', {appendTo: fixture.el})
 
     it "calls resize", ->
       spy = spyOn(Mercury.PageEditor.prototype, 'resize').andCallFake(=>)
@@ -460,13 +471,12 @@ describe "Mercury.PageEditor", ->
       beforeEach ->
         @pageEditor.visible = true
 
-      it "triggers an extra preview mode event if currently previewing", ->
-        @pageEditor.previewing = true
+      it "triggers an preview mode event if not currently previewing", ->
+        @pageEditor.previewing = false
         spy = spyOn(Mercury, 'trigger').andCallFake(=>)
         @pageEditor.toggleInterface()
-        expect(spy.callCount).toEqual(3)
+        expect(spy.callCount).toEqual(2)
         expect(spy.argsForCall[0]).toEqual(['mode', {mode: 'preview'}])
-        expect(spy.argsForCall[1]).toEqual(['mode', {mode: 'preview'}])
 
       it "sets visible to false", ->
         @pageEditor.toggleInterface()
@@ -498,22 +508,22 @@ describe "Mercury.PageEditor", ->
         expect(@statusbarShowCallCount).toEqual(1)
 
 
-  describe "#resize", ->
+  xdescribe "#resize", ->
 
     beforeEach ->
-      Mercury.Toolbar = -> {toolbar: true, height: -> 100}
+      Mercury.Toolbar = -> {toolbar: true, height: (-> 100), top: (-> 50)}
       Mercury.Statusbar = -> {statusbar: true, top: -> 500}
       Mercury.PageEditor.prototype.initializeFrame = ->
-      @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test')})
+      @pageEditor = new Mercury.PageEditor('', {appendTo: fixture.el})
 
     it "sets the display rectangle to displayRect", ->
       @pageEditor.resize()
-      expect(Mercury.displayRect.top).toEqual(100)
-      expect(Mercury.displayRect.height).toEqual(500 - 100)
+      expect(Mercury.displayRect.top).toEqual(100+50)
+      expect(Mercury.displayRect.height).toEqual(500 - (100+50))
 
     it "resizes the iframe", ->
       @pageEditor.resize()
-      expect($('.mercury-iframe').css('height')).toEqual("#{500 - 100}px")
+      expect($('.mercury-iframe').css('height')).toEqual("#{500 - (100+50)}px")
 
     it "triggers a resize event", ->
       spy = spyOn(Mercury, 'trigger').andCallFake(=>)
@@ -521,11 +531,12 @@ describe "Mercury.PageEditor", ->
       expect(spy.callCount).toEqual(1)
 
 
-  describe "#iframeSrc", ->
+  xdescribe "#iframeSrc", ->
 
     beforeEach ->
       Mercury.PageEditor.prototype.initializeFrame = ->
-      @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test')})
+      spyOn(Date.prototype, 'getTime').andReturn(1234)
+      @pageEditor = new Mercury.PageEditor('', {appendTo: fixture.el})
 
     it "takes the location and removes the /editor", ->
       expect(@pageEditor.iframeSrc('http://foo.com/editor/path')).toEqual('http://foo.com/path')
@@ -537,17 +548,43 @@ describe "Mercury.PageEditor", ->
       Mercury.config.editorUrlRegEx = original
 
     it "adds query params", ->
-      expect(@pageEditor.iframeSrc('http://foo.com/editor/path', true)).toEqual('http://foo.com/path?mercury_frame=true')
-      expect(@pageEditor.iframeSrc('http://foo.com/editor/path?something=true', true)).toEqual('http://foo.com/path?something=true&mercury_frame=true')
+      expect(@pageEditor.iframeSrc('http://foo.com/editor/path', true)).toEqual('http://foo.com/path?mercury_frame=true&_=1234')
+      expect(@pageEditor.iframeSrc('http://foo.com/editor/path?something=true', true)).toEqual('http://foo.com/path?something=true&mercury_frame=true&_=1234')
+
+
+  xdescribe "#loadIframeSrc", ->
 
+    beforeEach ->
+      Mercury.PageEditor.prototype.initializeFrame = ->
+      @pageEditor = new Mercury.PageEditor('', {appendTo: fixture.el})
+
+    it 'unbinds events to @document', ->
+      @pageEditor.document = {off: ->}
+      documentSpy = spyOn(@pageEditor.document, 'off')
+      @pageEditor.loadIframeSrc()
+      expect(documentSpy).toHaveBeenCalled()
+
+    it 'resets the iframe loaded data attribute', ->
+      @pageEditor.iframe.data('loaded', true)
+      @pageEditor.loadIframeSrc()
+      expect(@pageEditor.iframe.data('loaded')).toEqual(false)
+
+    it 'sets the iframe source', ->
+      iframe = {contentWindow: {document: {location: {}}}}
+      spyOn(Date.prototype, 'getTime').andReturn(1234)
+      @pageEditor.iframe = {data: (->), get: -> iframe}
+      @pageEditor.loadIframeSrc('boo')
+      expect(iframe.contentWindow.document.location.href).toEqual('boo?mercury_frame=true&_=1234')
 
-  describe "#hijackLinksAndForms", ->
+
+
+  xdescribe "#hijackLinksAndForms", ->
 
     beforeEach ->
       Mercury.config.nonHijackableClasses = ['lightview']
 
       Mercury.PageEditor.prototype.initializeFrame = ->
-      @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test')})
+      @pageEditor = new Mercury.PageEditor('', {appendTo: fixture.el})
       @pageEditor.document = $(document)
 
     afterEach ->
@@ -586,11 +623,11 @@ describe "Mercury.PageEditor", ->
       expect($('#form6').attr('target')).toEqual('foo')
 
 
-  describe "#beforeUnload", ->
+  xdescribe "#beforeUnload", ->
 
     beforeEach ->
       Mercury.PageEditor.prototype.initializeInterface = ->
-      @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test')})
+      @pageEditor = new Mercury.PageEditor('', {appendTo: fixture.el})
       Mercury.silent = false
       Mercury.changes = true
 
@@ -605,11 +642,11 @@ describe "Mercury.PageEditor", ->
       expect(@pageEditor.beforeUnload()).toEqual(null)
 
 
-  describe "#getRegionByName", ->
+  xdescribe "#getRegionByName", ->
 
     beforeEach ->
       Mercury.PageEditor.prototype.initializeInterface = ->
-      @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test')})
+      @pageEditor = new Mercury.PageEditor('', {appendTo: fixture.el})
       @iframeSrcSpy = spyOn(Mercury.PageEditor.prototype, 'iframeSrc').andCallFake(=> '/foo/baz')
       @ajaxSpy = spyOn($, 'ajax')
 
@@ -623,12 +660,12 @@ describe "Mercury.PageEditor", ->
       expect(@pageEditor.getRegionByName('foo')).toEqual(null)
 
 
-  describe "#save", ->
+  xdescribe "#save", ->
 
     describe "POST", ->
       beforeEach ->
         Mercury.PageEditor.prototype.initializeInterface = ->
-        @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test'), saveDataType: 'text'})
+        @pageEditor = new Mercury.PageEditor('', {appendTo: fixture.el, saveDataType: 'text', saveMethod: 'POST'})
         @iframeSrcSpy = spyOn(Mercury.PageEditor.prototype, 'iframeSrc').andCallFake(=> '/foo/baz')
         @ajaxSpy = spyOn($, 'ajax')
 
@@ -650,12 +687,12 @@ describe "Mercury.PageEditor", ->
         expect(@ajaxSpy.argsForCall[0][0]).toEqual('/foo/bar')
 
         @pageEditor.saveUrl = null
-        Mercury.saveURL = '/foo/bit'
+        Mercury.saveUrl = '/foo/bit'
         @pageEditor.save()
         expect(@ajaxSpy.argsForCall[1][0]).toEqual('/foo/bit')
 
         @pageEditor.saveUrl = null
-        Mercury.saveURL = null
+        Mercury.saveUrl = null
         @pageEditor.save()
         expect(@ajaxSpy.argsForCall[2][0]).toEqual('/foo/baz')
 
@@ -664,7 +701,7 @@ describe "Mercury.PageEditor", ->
         Mercury.config.saveStyle = 'json'
         spyOn(Mercury.PageEditor.prototype, 'serialize').andCallFake(=> {region1: 'region1'})
         @pageEditor.save()
-        expect(@ajaxSpy.argsForCall[0][1]['data']).toEqual({content: '{"region1":"region1"}' })
+        expect(@ajaxSpy.argsForCall[0][1]['data']).toEqual('{"content":{"region1":"region1"}}')
 
       it "can serialize as form values", ->
         @ajaxSpy.andCallFake(=>)
@@ -706,25 +743,32 @@ describe "Mercury.PageEditor", ->
           spy = spyOn(Mercury, 'trigger').andCallFake(=>)
           @pageEditor.save()
           expect(spy.callCount).toEqual(1)
-          expect(spy.argsForCall[0]).toEqual(['saved'])
+          expect(spy.argsForCall[0]).toEqual(['saved', 'data'])
 
       describe "on failed ajax request", ->
 
         beforeEach ->
-          @ajaxSpy.andCallFake((url, options) => options.error() )
+          @ajaxSpy.andCallFake((url, options) => options.error({'response': 'object'}) )
+
+        it "alerts and triggers save_failed with the url", ->
+          alert_spy = spyOn(window, 'alert').andCallFake(=>)
+          trigger_spy = spyOn(Mercury, 'trigger').andCallFake(=>)
 
-        it "alerts with the url", ->
-          spy = spyOn(window, 'alert').andCallFake(=>)
           @pageEditor.saveUrl = '/foo/bar'
           @pageEditor.save()
-          expect(spy.callCount).toEqual(1)
-          expect(spy.argsForCall[0]).toEqual(['Mercury was unable to save to the url: /foo/bar'])
+
+          expect(alert_spy.callCount).toEqual(1)
+          expect(alert_spy.argsForCall[0]).toEqual(['Mercury was unable to save to the url: /foo/bar'])
+
+          expect(trigger_spy.callCount).toEqual(1)
+          expect(trigger_spy.argsForCall[0][0]).toEqual('save_failed')
+          expect(trigger_spy.argsForCall[0][1]).toBeDefined()
 
     describe "PUT", ->
 
       beforeEach ->
         Mercury.PageEditor.prototype.initializeInterface = ->
-        @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test'), saveMethod: 'PUT'})
+        @pageEditor = new Mercury.PageEditor('', {appendTo: fixture.el, saveMethod: 'FOO'})
         @iframeSrcSpy = spyOn(Mercury.PageEditor.prototype, 'iframeSrc').andCallFake(=> '/foo/baz')
         @ajaxSpy = spyOn($, 'ajax')
 
@@ -732,14 +776,14 @@ describe "Mercury.PageEditor", ->
         @ajaxSpy.andCallFake(=>)
         spyOn(Mercury.PageEditor.prototype, 'serialize').andCallFake(=> {region1: 'region1'})
         @pageEditor.save()
-        expect(@ajaxSpy.argsForCall[0][1]['data']['_method']).toEqual('PUT')
+        expect(test=@ajaxSpy.argsForCall[0][1]['data']).toContain('"_method":"PUT"')
 
 
-  describe "#serialize", ->
+  xdescribe "#serialize", ->
 
     beforeEach ->
       Mercury.PageEditor.prototype.initializeInterface = ->
-      @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test')})
+      @pageEditor = new Mercury.PageEditor('', {appendTo: fixture.el})
       @pageEditor.regions = [
         {name: 'region1', serialize: -> 'region1'},
         {name: 'region2', serialize: -> 'region2'}