RubyGems - kiteditor - Versions diffs - 1.0.12 → 1.0.13 - Mend

kiteditor 1.0.12 → 1.0.13

Files changed (289) hide show

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

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

data/spec/javascripts/mercury/palette_spec.js.coffee CHANGED Viewed

@@ -1,7 +1,8 @@
 describe "Mercury.Palette", ->
+  template 'mercury/palette.html'
   beforeEach ->
-    fixture.load('mercury/palette.html')
     $.fx.off = true
   afterEach ->
@@ -11,7 +12,7 @@ describe "Mercury.Palette", ->
   describe "#build", ->
     it "builds an element", ->
-      @palette = new Mercury.Palette('/blank.html', 'foo', {appendTo: fixture.el, for: $('#button')})
+      @palette = new Mercury.Palette('/blank.html', 'foo', {appendTo: '#test', for: $('#button')})
       html = $('<div>').html(@palette.element).html()
       expect(html).toContain('class="mercury-palette mercury-foo-palette loading"')
       expect(html).toContain('style="display:none"')
@@ -24,7 +25,7 @@ describe "Mercury.Palette", ->
   describe "observed events", ->
     beforeEach ->
-      @palette = new Mercury.Palette('/blank.html', 'foo', {appendTo: fixture.el, for: $('#button')})
+      @palette = new Mercury.Palette('/blank.html', 'foo', {appendTo: '#test', for: $('#button')})
     it "hides", ->
       @palette.element.css({display: 'block'})
@@ -40,7 +41,7 @@ describe "Mercury.Palette", ->
   describe "#position", ->
     beforeEach ->
-      @palette = new Mercury.Palette('/blank.html', 'foo', {appendTo: fixture.el, for: $('#button')})
+      @palette = new Mercury.Palette('/blank.html', 'foo', {appendTo: '#test', for: $('#button')})
     it "positions based on it's button", ->
       @palette.element.css({display: 'block'})

data/spec/javascripts/mercury/panel_spec.js.coffee CHANGED Viewed

@@ -1,7 +1,8 @@
 describe "Mercury.Panel", ->
+  template 'mercury/panel.html'
   beforeEach ->
-    fixture.load('mercury/panel.html')
     Mercury.displayRect = {top: 20, left: 20, width: 200, height: 200}
     $.fx.off = true
     Mercury.determinedLocale =
@@ -17,11 +18,11 @@ describe "Mercury.Panel", ->
   describe "#build", ->
     it "builds an element", ->
-      @panel = new Mercury.Panel('/evergreen/resources/panel.html', 'foo', {appendTo: fixture.el, title: 'foo panel'})
+      @panel = new Mercury.Panel('/evergreen/resources/panel.html', 'foo', {appendTo: '#test', title: 'foo panel'})
       html = $('<div>').html(@panel.element).html()
       expect(html).toContain('class="mercury-panel loading"')
       expect(html).toContain('style="display:none;"')
-      expect(html).toContain('<h1><span>foo panel</span></h1><div class="mercury-panel-pane"></div>')
+      expect(html).toContain('<h1>foo panel</h1><div class="mercury-panel-pane"></div>')
       expect(html).not.toContain('class="mercury-panel-close"')
     it "appends to any element", ->
@@ -29,7 +30,7 @@ describe "Mercury.Panel", ->
       expect($('#panel_container .mercury-panel').length).toEqual(1)
     it "creates a close button if it should", ->
-      @panel = new Mercury.Panel('/evergreen/resources/panel.html', 'foo', {appendTo: fixture.el, title: 'foo panel', closeButton: true})
+      @panel = new Mercury.Panel('/evergreen/resources/panel.html', 'foo', {appendTo: '#test', title: 'foo panel', closeButton: true})
       html = $('<div>').html(@panel.element).html()
       expect(html).toContain('class="mercury-panel-close"')
       expect(@panel.element.find('.mercury-panel-close').css('opacity')).toEqual('0')
@@ -38,7 +39,7 @@ describe "Mercury.Panel", ->
   describe "observed events", ->
     beforeEach ->
-      @panel = new Mercury.Panel('/evergreen/resources/panel.html', 'foo', {appendTo: fixture.el, title: 'foo panel', for: $('#button'), closeButton: true})
+      @panel = new Mercury.Panel('/evergreen/resources/panel.html', 'foo', {appendTo: '#test', title: 'foo panel', for: $('#button'), closeButton: true})
     describe "custom event: resize", ->
@@ -84,7 +85,7 @@ describe "Mercury.Panel", ->
   describe "#show", ->
     beforeEach ->
-      @panel = new Mercury.Panel('/evergreen/resources/panel.html', 'foo', {appendTo: fixture.el, title: 'foo panel'})
+      @panel = new Mercury.Panel('/evergreen/resources/panel.html', 'foo', {appendTo: '#test', title: 'foo panel'})
     it "hides other panels and dialogs", ->
       spyOn(Mercury.Panel.prototype, 'position')
@@ -145,7 +146,7 @@ describe "Mercury.Panel", ->
   describe "#loadContent", ->
     beforeEach ->
-      @panel = new Mercury.Panel('/evergreen/resources/panel.html', 'foo', {appendTo: fixture.el, title: 'foo panel'})
+      @panel = new Mercury.Panel('/evergreen/resources/panel.html', 'foo', {appendTo: '#test', title: 'foo panel'})
     it "sets loaded to be true", ->
       @panel.loadContent()
@@ -158,14 +159,16 @@ describe "Mercury.Panel", ->
     it "sets the element html to be the data passed to it", ->
       @panel.loadContent('<span>hello world!</span>')
       html = @panel.element.html()
+      expect(html).toContain('<h1>foo panel</h1>')
       expect(html).toContain('class="mercury-panel-pane"')
       expect(html).toContain('style="visibility: hidden;')
       expect(html).toContain('hello world!')
-    it "sets the element html to be the data passed to it -- translated", ->
+    it "sets the element html to be the data passed to it", ->
       Mercury.config.localization.enabled = true
       @panel.loadContent('<span>hello world!</span>')
       html = @panel.element.html()
+      expect(html).toContain('<h1>foo panel</h1>')
       expect(html).toContain('class="mercury-panel-pane"')
       expect(html).toContain('style="visibility: hidden;')
       expect(html).toContain('bork! bork!')
@@ -174,7 +177,7 @@ describe "Mercury.Panel", ->
   describe "#makesDraggable", ->
     beforeEach ->
-      @panel = new Mercury.Panel('/evergreen/resources/panel.html', 'foo', {appendTo: fixture.el, title: 'foo panel'})
+      @panel = new Mercury.Panel('/evergreen/resources/panel.html', 'foo', {appendTo: '#test', title: 'foo panel'})
     it "makes the element draggable", ->
       spy = spyOn($.fn, 'draggable').andCallFake(=>)