kiteditor 1.0.12 → 1.0.13

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

@@ -1,7 +1,6 @@
 describe "Mercury.Snippet", ->
 
-  beforeEach ->
-    fixture.load('mercury/snippet.html')
+  template 'mercury/snippet.html'
 
   afterEach ->
     Mercury.Snippet.all = []
@@ -36,7 +35,7 @@ describe "Mercury.Snippet", ->
     it "builds an element (in whatever context is provided", ->
       ret = @snippet.getHTML($(document))
       html = $('<div>').html(ret).html()
-      expect(html).toContain('class="foo-snippet"')
+      expect(html).toContain('class="mercury-snippet"')
       expect(html).toContain('contenteditable="false"')
       expect(html).toContain('data-snippet="identity"')
       expect(html).toContain('data-version="1"')
@@ -54,19 +53,6 @@ describe "Mercury.Snippet", ->
       @snippet.getHTML($(document), callback)
       expect(@loadPreviewSpy.argsForCall[0][1]).toEqual(callback)
 
-    it "wraps the snippet in the specified wrapperTag", ->
-      @snippet.wrapperTag = 'li'
-      ret = @snippet.getHTML($(document))
-      container = $('<div>')
-      container.html(ret)
-      expect($(container.children()[0]).is('li')).toEqual(true)
-
-    it "adds the specified wrapperClass to the wrapperTag", ->
-      @snippet.wrapperClass = 'something'
-      ret = @snippet.getHTML($(document))
-      container = $('<div>')
-      container.html(ret)
-      expect($(container.children()[0]).hasClass('something')).toEqual(true)
 
   describe "#getText", ->
 
@@ -156,11 +142,6 @@ describe "Mercury.Snippet", ->
       @snippet.setOptions({foo: 'baz'})
       expect(@snippet.history.stack.length).toEqual(2)
 
-    it "can set the wrapperTag attribute from options", ->
-      expect(@snippet.wrapperTag).toEqual('div')
-      @snippet.setOptions({wrapperTag: 'li'})
-      expect(@snippet.wrapperTag).toEqual('li')
-
 
   describe "#setVersion", ->
 
@@ -170,11 +151,11 @@ describe "Mercury.Snippet", ->
 
     it "sets the version", ->
       @snippet.setVersion(5)
-      expect(@snippet.version).toEqual(5)
+      expect(@snippet.version).toEqual(4)
 
     it "accepts a version (can be a string)", ->
       @snippet.setVersion('2')
-      expect(@snippet.version).toEqual(2)
+      expect(@snippet.version).toEqual(1)
 
     it "pulls the version out of the history buffer", ->
       @snippet.setVersion(3)
@@ -196,7 +177,7 @@ describe "Mercury.Snippet", ->
 
     it "returns an object with name and options", ->
       ret = @snippet.serialize()
-      expect(ret).toEqual({name: 'foo', foo: 'bar'})
+      expect(ret).toEqual({name: 'foo', options: {foo: 'bar'}})
 
 
 
@@ -209,45 +190,16 @@ describe "Mercury.Snippet class methods", ->
 
     beforeEach ->
       @modalSpy = spyOn(Mercury, 'modal').andCallFake(=>)
-      @triggerSpy = spyOn(Mercury, 'trigger').andCallFake(=>)
-
-    describe "with options", ->
-
-      it "opens a modal with the name in the url", ->
-        Mercury.Snippet.displayOptionsFor('foo')
-        expect(@modalSpy.callCount).toEqual(1)
-        expect(@modalSpy.argsForCall[0]).toEqual(["/mercury/snippets/foo/options.html", {title: 'Snippet Options', handler: 'insertSnippet', snippetName: 'foo', loadType : 'POST'}])
-
-      it "sets the snippet back to nothing", ->
-        Mercury.snippet = 'foo'
-        Mercury.Snippet.displayOptionsFor('foo')
-        expect(Mercury.snippet).toEqual(null)
-
-      it "can pass options to the modal", ->
-        Mercury.Snippet.displayOptionsFor('foo', {option1: 'option1'})
-        expect(@modalSpy.callCount).toEqual(1)
-        expect(@modalSpy.argsForCall[0]).toEqual(["/mercury/snippets/foo/options.html", {title: 'Snippet Options', handler: 'insertSnippet', snippetName: 'foo', loadType: 'POST', option1: 'option1'}])
 
-      it "doesn't trigger an event to insert the snippet", ->
-        Mercury.Snippet.displayOptionsFor('foo')
-        expect(@triggerSpy.callCount).toEqual(0)
-
-    describe "without options", ->
-
-      it "triggers an event to insert the snippet", ->
-        Mercury.Snippet.displayOptionsFor('foo', {}, false)
-        expect(@triggerSpy.callCount).toEqual(1)
-        expect(@triggerSpy.argsForCall[0][0]).toEqual('action')
-        expect(@triggerSpy.argsForCall[0][1]['action']).toEqual('insertSnippet')
-
-      it "doesn't open a modal", ->
-        Mercury.Snippet.displayOptionsFor('foo', {}, false)
-        expect(@modalSpy.callCount).toEqual(0)
+    it "opens a modal with the name in the url", ->
+      Mercury.Snippet.displayOptionsFor('foo')
+      expect(@modalSpy.callCount).toEqual(1)
+      expect(@modalSpy.argsForCall[0]).toEqual(["/mercury/snippets/foo/options.html", {title: 'Snippet Options', handler: 'insertSnippet', snippetName: 'foo'}])
 
-      it "sets the snippet back to nothing", ->
-        Mercury.snippet = 'foo'
-        Mercury.Snippet.displayOptionsFor('foo', {}, false)
-        expect(Mercury.snippet).toEqual(null)
+    it "sets the snippet back to nothing", ->
+      Mercury.snippet = 'foo'
+      Mercury.Snippet.displayOptionsFor('foo')
+      expect(Mercury.snippet).toEqual(null)
 
 
   describe ".create", ->
@@ -267,30 +219,6 @@ describe "Mercury.Snippet class methods", ->
       Mercury.Snippet.create('foo', {foo: 'bar'})
       expect(Mercury.Snippet.all.length).toEqual(1)
 
-    describe "when a snippet exist with an identical identity", ->
-      it "generates a unique identity", ->
-        Mercury.Snippet.load
-          snippet_0: {name: 'foo0', options: {foo: 'bar'}}
-          snippet_1: {name: 'foo1', options: {foo: 'bar'}}
-          snippet_3: {name: 'bar3', options: {baz: 'pizza'}}
-
-        ret = Mercury.Snippet.create('noobie', {noobie: 'one'})
-        expect(ret.identity).toEqual('snippet_2')
-
-      it "generates a unique identity with an un-ordered snippet list", ->
-        Mercury.Snippet.load
-          snippet_0: {name: 'foo0', options: {foo: 'bar'}}
-          snippet_1: {name: 'foo1', options: {foo: 'bar'}}
-          snippet_2: {name: 'foo2', options: {foo: 'bar'}}
-          snippet_12: {name: 'bar12', options: {baz: 'pizza'}}
-          snippet_6: {name: 'bar6', options: {baz: 'pizza'}}
-          snippet_7: {name: 'bar7', options: {baz: 'pizza'}}
-          snippet_3: {name: 'foo3', options: {foo: 'bar'}}
-          snippet_4: {name: 'foo4', options: {foo: 'bar'}}
-          snippet_5: {name: 'foo5', options: {foo: 'bar'}}
-
-        ret = Mercury.Snippet.create('noobie', {noobie: 'one'})
-        expect(ret.identity).toEqual('snippet_8')
 
   describe ".find", ->
 
@@ -308,14 +236,10 @@ describe "Mercury.Snippet class methods", ->
 
     beforeEach ->
       @snippets = {
-        snippet_1: {name: 'foo', something: {foo: 'bar'}}
-        snippet_2: {name: 'bar', something: {baz: 'pizza'}}
+        snippet_1: {name: 'foo', options: {foo: 'bar'}}
+        snippet_2: {name: 'bar', options: {baz: 'pizza'}}
       }
-      Mercury.Snippet.load(@snippets)
 
     it "creates a new instance for each item in the collection", ->
+      Mercury.Snippet.load(@snippets)
       expect(Mercury.Snippet.all.length).toEqual(2)
-
-    it 'sets the options', ->
-      expect(Mercury.Snippet.find('snippet_1').options.something.foo).toEqual('bar')
-

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

@@ -1,7 +1,8 @@
 describe "Mercury.SnippetToolbar", ->
 
+  template 'mercury/snippet_toolbar.html'
+
   beforeEach ->
-    fixture.load('mercury/snippet_toolbar.html')
     $.fx.off = true
 
   afterEach ->
@@ -28,7 +29,7 @@ describe "Mercury.SnippetToolbar", ->
   describe "#build", ->
 
     it "builds an element", ->
-      @snippetToolbar = new Mercury.SnippetToolbar($('document'), {appendTo: fixture.el})
+      @snippetToolbar = new Mercury.SnippetToolbar($('document'), {appendTo: '#test'})
       html = $('<div>').html(@snippetToolbar.element).html()
       expect(html).toContain('class="mercury-toolbar mercury-snippet-toolbar"')
       expect(html).toContain('style="display:none"')
@@ -41,7 +42,7 @@ describe "Mercury.SnippetToolbar", ->
   describe "observed events", ->
 
     beforeEach ->
-      @snippetToolbar = new Mercury.SnippetToolbar($('document'), {appendTo: fixture.el})
+      @snippetToolbar = new Mercury.SnippetToolbar($('document'), {appendTo: '#test'})
 
     describe "custom event: show:toolbar", ->
 
@@ -71,34 +72,21 @@ describe "Mercury.SnippetToolbar", ->
 
       it "clears the hide timeout", ->
         spy = spyOn(window, 'clearTimeout').andCallFake(=>)
-        jasmine.simulate.mousemove($('.mercury-snippet-toolbar', fixture.el).get(0))
+        jasmine.simulate.mousemove($('#test .mercury-snippet-toolbar').get(0))
         expect(spy.callCount).toEqual(1)
 
     describe "mouseout", ->
 
       it "calls hide", ->
         spy = spyOn(Mercury.SnippetToolbar.prototype, 'hide').andCallFake(=>)
-        jasmine.simulate.mouseout($('.mercury-snippet-toolbar', fixture.el).get(0))
+        jasmine.simulate.mouseout($('#test .mercury-snippet-toolbar').get(0))
         expect(spy.callCount).toEqual(1)
 
-    describe "releasing events", ->
-
-      it 'makes the following events releasable', ->
-        events = (eventName for [target, eventName, handler] in @snippetToolbar._boundEvents)
-        expect(events).toEqual(['show:toolbar', 'hide:toolbar', 'scroll'])
-
-      it 'calls off to unbind the events on release', ->
-        targets = (target for [target, eventName, handler] in @snippetToolbar._boundEvents)
-        # we bind to Mercury twice so pop the first one off for spying
-        targets.shift()
-        spys = (spyOn(target, 'off') for target in targets)
-        @snippetToolbar.release()
-        expect(spy).toHaveBeenCalled() for spy in spys
 
   describe "#show", ->
 
     beforeEach ->
-      @snippetToolbar = new Mercury.SnippetToolbar($('document'), {appendTo: fixture.el})
+      @snippetToolbar = new Mercury.SnippetToolbar($('document'), {appendTo: '#test'})
       @positionSpy = spyOn(Mercury.SnippetToolbar.prototype, 'position').andCallFake(=>)
       @appearSpy = spyOn(Mercury.SnippetToolbar.prototype, 'appear').andCallFake(=>)
 
@@ -119,22 +107,22 @@ describe "Mercury.SnippetToolbar", ->
 
     beforeEach ->
       Mercury.displayRect = {top: 20}
-      @snippetToolbar = new Mercury.SnippetToolbar($('document'), {appendTo: fixture.el, visible: true})
+      @snippetToolbar = new Mercury.SnippetToolbar($('document'), {appendTo: '#test', visible: true})
       @snippetToolbar.snippet = $('#snippet')
 
     it "positions itself based on the snippet", ->
       @snippetToolbar.element.show()
       @snippetToolbar.position()
-      # use a tolerance since there are measurement differences between browsers we want it between 14-18
-      expect(@snippetToolbar.element.offset().top).toBeLessThan(19)
-      expect(@snippetToolbar.element.offset().top).toBeGreaterThan(0)
-      expect(@snippetToolbar.element.offset().left).toEqual(200)
+      if $.browser.webkit
+        expect(@snippetToolbar.element.offset()).toEqual({top: 18, left : 200})
+      else
+        expect(@snippetToolbar.element.offset()).toEqual({top: 14, left : 200})
 
 
   describe "#appear", ->
 
     beforeEach ->
-      @snippetToolbar = new Mercury.SnippetToolbar($('document'), {appendTo: fixture.el})
+      @snippetToolbar = new Mercury.SnippetToolbar($('document'), {appendTo: '#test'})
 
     it "clears the hide timeout", ->
       spy = spyOn(window, 'clearTimeout').andCallFake(=>)
@@ -153,9 +141,7 @@ describe "Mercury.SnippetToolbar", ->
   describe "#hide", ->
 
     beforeEach ->
-      @snippetToolbar = new Mercury.SnippetToolbar($('document'), {appendTo: fixture.el})
-
-    afterEach -> @snippetToolbar.release()
+      @snippetToolbar = new Mercury.SnippetToolbar($('document'), {appendTo: '#test'})
 
     it "it clears the hide timeout", ->
       spy = spyOn(window, 'clearTimeout').andCallFake(=>)
@@ -188,12 +174,11 @@ describe "Mercury.SnippetToolbar", ->
         expect(@setTimeoutSpy.callCount).toEqual(1)
 
       it "hides the element", ->
-        @setTimeoutSpy.andCallFake((callback, timeout) => callback())
+        @setTimeoutSpy.andCallFake((timeout, callback) => callback())
         @snippetToolbar.hide()
         expect(@snippetToolbar.element.css('display')).toEqual('none')
 
       it "sets visible", ->
-        @setTimeoutSpy.andCallFake((callback, timeout) => callback())
+        @setTimeoutSpy.andCallFake((timeout, callback) => callback())
         @snippetToolbar.hide()
         expect(@snippetToolbar.visible).toEqual(false)
-

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

@@ -1,7 +1,8 @@
 describe "Mercury.Statusbar", ->
 
+  template 'mercury/statusbar.html'
+
   beforeEach ->
-    fixture.load('mercury/statusbar.html')
     $.fx.off = true
     @region = {
       path: -> [{tagName: 'A'}, {tagName: 'B'}, {tagName: 'C'}]
@@ -16,7 +17,7 @@ describe "Mercury.Statusbar", ->
     beforeEach ->
       @buildSpy = spyOn(Mercury.Statusbar.prototype, 'build')
       @bindEventsSpy = spyOn(Mercury.Statusbar.prototype, 'bindEvents')
-      @statusbar = new Mercury.Statusbar({appendTo: fixture.el, foo: 'bar', visible: false})
+      @statusbar = new Mercury.Statusbar({appendTo: '#test', foo: 'bar', visible: false})
 
     it "accepts options", ->
       expect(@statusbar.options.foo).toEqual('bar')
@@ -54,7 +55,7 @@ describe "Mercury.Statusbar", ->
   describe "observed events ", ->
 
     beforeEach ->
-      @statusbar = new Mercury.Statusbar({appendTo: fixture.el})
+      @statusbar = new Mercury.Statusbar({appendTo: '#test'})
 
     describe "custom event: region:update", ->
 
@@ -75,7 +76,7 @@ describe "Mercury.Statusbar", ->
 
     beforeEach ->
       spyOn(Mercury.Statusbar.prototype, 'bindEvents').andCallFake(=>)
-      @statusbar = new Mercury.Statusbar({appendTo: fixture.el, visible: true})
+      @statusbar = new Mercury.Statusbar({appendTo: '#test', visible: true})
 
     it "knows it's own height", ->
       expect(@statusbar.height()).toEqual(20) # styled with css in the template
@@ -87,7 +88,7 @@ describe "Mercury.Statusbar", ->
 
       beforeEach ->
         spyOn(Mercury.Statusbar.prototype, 'bindEvents').andCallFake(=>)
-        @statusbar = new Mercury.Statusbar({appendTo: fixture.el, visible: true})
+        @statusbar = new Mercury.Statusbar({appendTo: '#test', visible: true})
 
       it "returns the offset top of the element", ->
         expect(@statusbar.top()).toEqual($('.mercury-statusbar').offset().top)
@@ -96,7 +97,7 @@ describe "Mercury.Statusbar", ->
 
       beforeEach ->
         spyOn(Mercury.Statusbar.prototype, 'bindEvents').andCallFake(=>)
-        @statusbar = new Mercury.Statusbar({appendTo: fixture.el, visible: false})
+        @statusbar = new Mercury.Statusbar({appendTo: '#test', visible: false})
 
       it "returns the offset top of the element + it's outer height", ->
         expect(@statusbar.top()).toEqual($('.mercury-statusbar').offset().top + $('.mercury-statusbar').outerHeight())
@@ -105,7 +106,7 @@ describe "Mercury.Statusbar", ->
   describe "#setPath", ->
 
     beforeEach ->
-      @statusbar = new Mercury.Statusbar({appendTo: fixture.el})
+      @statusbar = new Mercury.Statusbar({appendTo: '#test'})
 
     it "builds a path and displays it", ->
       @statusbar.setPath(@region.path())
@@ -115,7 +116,7 @@ describe "Mercury.Statusbar", ->
   describe "#show", ->
 
     beforeEach ->
-      @statusbar = new Mercury.Statusbar({appendTo: fixture.el, visible: false})
+      @statusbar = new Mercury.Statusbar({appendTo: '#test', visible: false})
 
     it "sets visible to true", ->
       @statusbar.visible = false
@@ -136,7 +137,7 @@ describe "Mercury.Statusbar", ->
   describe "#hide", ->
 
     beforeEach ->
-      @statusbar = new Mercury.Statusbar({appendTo: fixture.el, visible: true})
+      @statusbar = new Mercury.Statusbar({appendTo: '#test', visible: true})
 
     it "sets visible to false", ->
       @statusbar.visible = true

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

@@ -1,7 +1,8 @@
 describe "Mercury.tableEditor", ->
 
+  template 'mercury/table_editor.html'
+
   beforeEach ->
-    fixture.load('mercury/table_editor.html')
     @table = $('#table1')
     @cell = @table.find('th, td').first()
 

data/spec/javascripts/mercury/toolbar.button_group_spec.js.coffee

@@ -1,10 +1,11 @@
 describe "Mercury.Toolbar.ButtonGroup", ->
 
+  template 'mercury/toolbar.button_group.html'
+
   beforeEach ->
-    fixture.load('mercury/toolbar.button_group.html')
     Mercury.Toolbar.ButtonGroup.contexts.foo = -> false
     @region = {
-      element: $('<div>')
+      element: $('<div class="mercury-region">')
       currentElement: -> $('<div>')
     }
 
@@ -49,8 +50,8 @@ describe "Mercury.Toolbar.ButtonGroup", ->
 
       beforeEach ->
         @region = {
-          type: -> 'full'
-          element: $('<div>')
+          type: 'editable'
+          element: $('<div class="mercury-region">')
         }
 
       it "disables if the region type isn't supported", ->
@@ -60,7 +61,7 @@ describe "Mercury.Toolbar.ButtonGroup", ->
         expect(@buttonGroup.hasClass('disabled')).toEqual(true)
 
       it "enables if the region type is supported", ->
-        @buttonGroup = new Mercury.Toolbar.ButtonGroup('foo', {_regions: ['full']})
+        @buttonGroup = new Mercury.Toolbar.ButtonGroup('foo', {_regions: ['editable']})
         @buttonGroup.addClass('disabled')
         Mercury.trigger('region:focused', {region: @region})
         expect(@buttonGroup.hasClass('disabled')).toEqual(false)
@@ -68,7 +69,7 @@ describe "Mercury.Toolbar.ButtonGroup", ->
     describe "custom event: region:blurred", ->
 
       it "disables if it's a button group for specific region types", ->
-        @buttonGroup = new Mercury.Toolbar.ButtonGroup('foo', {_regions: ['full']})
+        @buttonGroup = new Mercury.Toolbar.ButtonGroup('foo', {_regions: ['editable']})
         @buttonGroup.removeClass('disabled')
         Mercury.trigger('region:blurred', {region: @region})
 
@@ -76,8 +77,9 @@ describe "Mercury.Toolbar.ButtonGroup", ->
 
 describe "Mercury.Toolbar.ButtonGroup.contexts", ->
 
+  template 'mercury/toolbar.button_group.html'
+
   beforeEach ->
-    fixture.load('mercury/toolbar.button_group.html')
     @contexts = Mercury.Toolbar.ButtonGroup.contexts
     @region = $('#context_container')
 

data/spec/javascripts/mercury/toolbar.button_spec.js.coffee

@@ -1,12 +1,13 @@
 describe "Mercury.Toolbar.Button", ->
 
+  template 'mercury/toolbar.button.html'
+
   beforeEach ->
-    fixture.load('mercury/toolbar.button.html')
-    Mercury.displayRect = {top: 0, left: 0, width: 500, height: 200}
+    Mercury.displayRect = {0, 0, 500, 200}
     Mercury.Toolbar.Button.contexts.foo = -> true
     @region = {
-      type: -> 'full'
-      element: $('<div>')
+      type: 'editable'
+      element: $('<div class="mercury-region">')
       currentElement: -> $('<div>')
     }
     Mercury.preloadedViews['/nothing'] = 'nothing'
@@ -27,7 +28,7 @@ describe "Mercury.Toolbar.Button", ->
       expect(html).toContain('<em>title</em>')
 
     it "accepts summary, types and options", ->
-      @button = new Mercury.Toolbar.Button('foo', 'title', 'summary', {palette: '/nothing'}, {appendDialogsTo: fixture.el})
+      @button = new Mercury.Toolbar.Button('foo', 'title', 'summary', {palette: '/nothing'}, {appendDialogsTo: $('#test')})
       html = $('<div>').html(@button).html()
       expect(html).toContain('title="summary"')
       expect(html).toContain('class="mercury-button mercury-foo-button mercury-button-palette"')
@@ -70,15 +71,15 @@ describe "Mercury.Toolbar.Button", ->
       expect(spy.argsForCall[0]).toEqual(['mode', {mode: 'foo'}])
 
     it "builds buttons that understand context", ->
-      @button = new Mercury.Toolbar.Button('foo', 'title', 'summary', {context: true}, {appendDialogsTo: fixture.el})
+      @button = new Mercury.Toolbar.Button('foo', 'title', 'summary', {context: true})
 
       expect(@button.hasClass('active')).toEqual(false)
       Mercury.trigger('region:update', {region: @region})
       expect(@button.hasClass('active')).toEqual(true)
 
     it "builds panel buttons (and assigns toggle)", ->
-      @button = new Mercury.Toolbar.Button('foo', 'title', 'summary', {panel: '/blank.html'}, {appendDialogsTo: fixture.el})
-      expect($('.mercury-panel', fixture.el).length).toEqual(1)
+      @button = new Mercury.Toolbar.Button('foo', 'title', 'summary', {panel: '/blank.html'}, {appendDialogsTo: $('#test')})
+      expect($('#test .mercury-panel').length).toEqual(1)
 
       jasmine.simulate.click(@button.get(0))
       expect(@button.hasClass('pressed')).toEqual(true)
@@ -86,36 +87,20 @@ describe "Mercury.Toolbar.Button", ->
       jasmine.simulate.click(@button.get(0))
       expect(@button.hasClass('pressed')).toEqual(false)
 
-    it "builds a panel button with a custom panel object", ->
-      namespace = {}
-      namespace.customPanel = ->
-      namespace.customPanel::toggle = ->
-        'toggled'
-      handler = (name)->
-        new namespace.customPanel()
-
-      constructorSpy = spyOn(namespace, 'customPanel').andCallThrough()
-      panelSpy = spyOn(Mercury, 'Panel')
-
-      @button = new Mercury.Toolbar.Button('customFoo', 'title', 'summary', {panel: handler}, {appendDialogsTo: fixture.el})
-      expect(constructorSpy).toHaveBeenCalled()
-      expect(panelSpy).wasNotCalled()
-
-
     it "builds palette buttons", ->
-      @button = new Mercury.Toolbar.Button('foo', 'title', 'summary', {palette: '/blank.html'}, {appendDialogsTo: fixture.el})
-      expect($('.mercury-palette', fixture.el).length).toEqual(1)
+      @button = new Mercury.Toolbar.Button('foo', 'title', 'summary', {palette: '/blank.html'}, {appendDialogsTo: $('#test')})
+      expect($('#test .mercury-palette').length).toEqual(1)
 
     it "builds select buttons", ->
-      @button = new Mercury.Toolbar.Button('foo', 'title', 'summary', {select: '/blank.html'}, {appendDialogsTo: fixture.el})
-      expect($('.mercury-select', fixture.el).length).toEqual(1)
+      @button = new Mercury.Toolbar.Button('foo', 'title', 'summary', {select: '/blank.html'}, {appendDialogsTo: $('#test')})
+      expect($('#test .mercury-select').length).toEqual(1)
 
     it "builds modal buttons", ->
-      @button = new Mercury.Toolbar.Button('foo', 'title', 'summary', {modal: '/blank.html'}, {appendDialogsTo: fixture.el})
+      @button = new Mercury.Toolbar.Button('foo', 'title', 'summary', {modal: '/blank.html'}, {appendDialogsTo: $('#test')})
       # nothing unique about this in building -- the modal is built/fired on click
 
     it "builds lightview buttons", ->
-      @button = new Mercury.Toolbar.Button('foo', 'title', 'summary', {lightview: '/blank.html'}, {appendDialogsTo: fixture.el})
+      @button = new Mercury.Toolbar.Button('foo', 'title', 'summary', {lightview: '/blank.html'}, {appendDialogsTo: $('#test')})
       # nothing unique about this in building -- the lightview is built/fired on click
 
     it "throws an error when an unknown type is encountered", ->
@@ -128,13 +113,12 @@ describe "Mercury.Toolbar.Button", ->
 
     describe "custom event: button", ->
 
-      it "calls click on the button itself" #, ->
-#        todo: ! bleed over -- elements remain
-#        @button = new Mercury.Toolbar.Button('foo', 'title', 'summary', {context: true})
-#        spy = spyOn(@button, 'click').andCallFake(=>)
-#
-#        Mercury.trigger('button', {action: 'foo'})
-#        expect(spy.callCount).toEqual(1)
+      it "calls click on the button itself", ->
+        @button = new Mercury.Toolbar.Button('foo', 'title', 'summary', {context: true})
+        spy = spyOn(@button, 'click').andCallFake(=>)
+
+        Mercury.trigger('button', {action: 'foo'})
+        expect(spy.callCount).toEqual(1)
 
     describe "custom event: mode", ->
 
@@ -166,7 +150,7 @@ describe "Mercury.Toolbar.Button", ->
         expect(@button.hasClass('disabled')).toEqual(true)
 
       it "enables if the region type is supported", ->
-        @button = new Mercury.Toolbar.Button('foo', 'title', 'summary', {context: true, regions: ['full']})
+        @button = new Mercury.Toolbar.Button('foo', 'title', 'summary', {context: true, regions: ['editable']})
         @button.addClass('disabled')
         Mercury.trigger('region:focused', {region: @region})
         expect(@button.hasClass('disabled')).toEqual(false)
@@ -174,7 +158,7 @@ describe "Mercury.Toolbar.Button", ->
     describe "custom event: region:blurred", ->
 
       it "disables if it's a button for specific region types", ->
-        @button = new Mercury.Toolbar.Button('foo', 'title', 'summary', {context: true, regions: ['full']})
+        @button = new Mercury.Toolbar.Button('foo', 'title', 'summary', {context: true, regions: ['editable']})
         @button.addClass('disabled')
         Mercury.trigger('region:blurred', {region: @region})
         expect(@button.hasClass('disabled')).toEqual(true)
@@ -219,7 +203,7 @@ describe "Mercury.Toolbar.Button", ->
 
       it "triggers a focus:frame event", ->
         spy = spyOn(Mercury, 'trigger').andCallFake(=>)
-        @button = new Mercury.Toolbar.Button('foo', 'title', 'summary', {}, {regions: ['full']})
+        @button = new Mercury.Toolbar.Button('foo', 'title', 'summary', {}, {regions: ['editable']})
 
         jasmine.simulate.click(@button.get(0))
         expect(spy.argsForCall[1]).toEqual(['focus:frame'])
@@ -284,25 +268,12 @@ describe "Mercury.Toolbar.Button", ->
         jasmine.simulate.click(@button.get(0))
         expect(spy.callCount).toEqual(2)
 
-    it "shows and hides the custom panel", ->
-      namespace = {}
-      namespace.customPanel = ->
-      namespace.customPanel::toggle = ->
-        'toggled'
-      handler = (name)->
-        new namespace.customPanel()
-
-      toggleSpy = spyOn(namespace.customPanel.prototype, 'toggle')
-      @button = new Mercury.Toolbar.Button('foo', 'title', 'summary', {panel: handler}, {appendDialogsTo: fixture.el})
-
-      jasmine.simulate.click(@button.get(0))
-      expect(toggleSpy).toHaveBeenCalled()
-
 
 describe "Mercury.Toolbar.Button.contexts", ->
 
+  template 'mercury/toolbar.button.html'
+
   beforeEach ->
-    fixture.load('mercury/toolbar.button.html')
     @contexts = Mercury.Toolbar.Button.contexts
     @region = $('#context_container')
     @element = $('#context_button')