kiteditor 1.0.12 → 1.0.13

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

@@ -1,8 +1,9 @@
 describe "Mercury.Region", ->
 
+  template 'mercury/region.html'
+
   beforeEach ->
-    fixture.load('mercury/region.html')
-    Mercury.config.regions.attribute = 'custom-region-attribute'
+    Mercury.config.regions.className = 'custom-region-class'
     Mercury.config.regions.dataAttributes = []
 
   afterEach ->
@@ -126,17 +127,17 @@ describe "Mercury.Region", ->
 
       it "does nothing if in preview mode", ->
         @region.previewing = true
-        jasmine.simulate.mousemove($('#region_with_snippet .example-snippet').get(0))
+        jasmine.simulate.mousemove($('#region_with_snippet .mercury-snippet').get(0))
         expect(@triggerSpy.callCount).toEqual(0)
 
       it "does nothing if it's not the active region", ->
         Mercury.region = {}
-        jasmine.simulate.mousemove($('#region_with_snippet .example-snippet').get(0))
+        jasmine.simulate.mousemove($('#region_with_snippet .mercury-snippet').get(0))
         expect(@triggerSpy.callCount).toEqual(0)
 
       it "shows the snippet toolbar if a snippet was moused over", ->
         Mercury.region = @region
-        jasmine.simulate.mousemove($('#region_with_snippet .example-snippet').get(0))
+        jasmine.simulate.mousemove($('#region_with_snippet .mercury-snippet').get(0))
         expect(@triggerSpy.callCount).toEqual(1)
         expect(@triggerSpy.argsForCall[0][0]).toEqual('show:toolbar')
 
@@ -156,7 +157,7 @@ describe "Mercury.Region", ->
         expect(@triggerSpy.argsForCall[0]).toEqual(['hide:toolbar', {type: 'snippet', immediately: false}])
 
 
-  describe "#content", ->
+  describe "#html", ->
 
     beforeEach ->
       @region = new Mercury.Region($('#region_with_snippet'), window)
@@ -165,15 +166,11 @@ describe "Mercury.Region", ->
 
       it "returns the html of the element", ->
         content = @region.content()
-        expect(content).toEqual('contents<div class="example-snippet" data-snippet="snippet_1" data-version="1">snippet</div>')
+        expect(content).toEqual('contents<div class="mercury-snippet" data-snippet="snippet_1" data-version="1">snippet</div>')
 
       it "replaces snippet content with an indentifier if asked", ->
         content = @region.content(null, true)
-        expect(content).toEqual('contents<div class="example-snippet" data-snippet="snippet_1">[snippet_1]</div>')
-
-      it "does not execute JavaScript contained within the region (bug fix)", ->
-        (new Mercury.Region($('#region_with_javascript_snippet'), window)).content()
-        expect($('#modifiable-element').children().length).toEqual(0)
+        expect(content).toEqual('contents<div class="mercury-snippet" data-snippet="snippet_1">[snippet_1]</div>')
 
     describe "setting html", ->
 
@@ -198,8 +195,9 @@ describe "Mercury.Region", ->
       it "sets previewing to true", ->
         expect(@region.previewing).toEqual(true)
 
-      it "removes the data attribute", ->
-        expect(@region.element.attr('custom-region-attribute')).toEqual(null)
+      it "swaps classes on the element", ->
+        expect(@region.element.hasClass('custom-region-class')).toEqual(false)
+        expect(@region.element.hasClass('custom-region-class-preview')).toEqual(true)
 
       it "triggers a blur event", ->
         expect(@triggerSpy.callCount).toEqual(1)
@@ -214,8 +212,9 @@ describe "Mercury.Region", ->
       it "sets previewing to false", ->
         expect(@region.previewing).toEqual(false)
 
-      it "adds the correct data attribute back", ->
-        expect(@region.element.attr('custom-region-attribute')).toEqual('unknown')
+      it "swaps classes on the element", ->
+        expect(@region.element.hasClass('custom-region-class-preview')).toEqual(false)
+        expect(@region.element.hasClass('custom-region-class')).toEqual(true)
 
       it "calls focus if it's the active region", ->
         expect(@focusSpy.callCount).toEqual(1)
@@ -271,10 +270,6 @@ describe "Mercury.Region", ->
       @region.element.attr('data-version', 2)
       expect(@region.dataAttributes()).toEqual({scope: 'scope', version: '2'})
 
-    it "looks to @container if it's set", ->
-      @region.container = $('<div>').attr('data-version', 3)
-      expect(@region.dataAttributes()).toEqual({scope: undefined, version: '3'})
-
 
   describe "#serialize", ->
 
@@ -285,7 +280,7 @@ describe "Mercury.Region", ->
 
       it "returns an object with it's type, value, and snippets", ->
         serialized = @region.serialize()
-        expect(serialized.type).toEqual('unknown')
+        expect(serialized.type).toEqual('region')
         expect(serialized.value).toEqual('contents')
         expect(serialized.snippets).toEqual({})
         expect(serialized.data).toEqual({})
@@ -297,7 +292,7 @@ describe "Mercury.Region", ->
 
       it "returns an object with it's type, value, data and snippets", ->
         serialized = @region.serialize()
-        expect(serialized.type).toEqual('unknown')
+        expect(serialized.type).toEqual('region')
         expect(serialized.value).toEqual('contents')
         expect(serialized.snippets).toEqual({})
         expect(serialized.data).toEqual({scope: 'scope', version: '1'})

data/spec/javascripts/mercury/regions/{full_spec.js.coffee → editable_spec.js.coffee}

@@ -1,35 +1,36 @@
-describe "Mercury.Regions.Full", ->
+describe "Mercury.Regions.Editable", ->
+
+  template 'mercury/regions/editable.html'
 
   beforeEach ->
-    fixture.load('mercury/regions/full.html')
-    @regionElement = $('#full_region1')
+    @regionElement = $('#editable_region1')
 
   describe "constructor", ->
 
-    beforeEach ->
-      @buildSpy = spyOn(Mercury.Regions.Full.prototype, 'build').andCallFake(=>)
-      @bindEventsSpy = spyOn(Mercury.Regions.Full.prototype, 'bindEvents').andCallFake(=>)
+     beforeEach ->
+       @buildSpy = spyOn(Mercury.Regions.Editable.prototype, 'build').andCallFake(=>)
+       @bindEventsSpy = spyOn(Mercury.Regions.Editable.prototype, 'bindEvents').andCallFake(=>)
 
-    it "expects an element and window", ->
-      @region = new Mercury.Regions.Full(@regionElement, window)
-      expect(@region.element.get(0)).toEqual($('#full_region1').get(0))
-      expect(@region.window).toEqual(window)
+     it "expects an element and window", ->
+       @region = new Mercury.Regions.Editable(@regionElement, window)
+       expect(@region.element.get(0)).toEqual($('#editable_region1').get(0))
+       expect(@region.window).toEqual(window)
 
-    it "accepts options", ->
-      @region = new Mercury.Regions.Full(@regionElement, window, {foo: 'something'})
-      expect(@region.options).toEqual({foo: 'something'})
+     it "accepts options", ->
+       @region = new Mercury.Regions.Editable(@regionElement, window, {foo: 'something'})
+       expect(@region.options).toEqual({foo: 'something'})
 
-    it "sets it's type", ->
-      @region = new Mercury.Regions.Full(@regionElement, window)
-      expect(@region.type()).toEqual('full')
+     it "sets it's type", ->
+       @region = new Mercury.Regions.Editable(@regionElement, window)
+       expect(@region.type).toEqual('editable')
 
-    it "calls build", ->
-      @region = new Mercury.Regions.Full(@regionElement, window)
-      expect(@buildSpy.callCount).toEqual(1)
+     it "calls build", ->
+       @region = new Mercury.Regions.Editable(@regionElement, window)
+       expect(@buildSpy.callCount).toEqual(1)
 
-    it "calls bindEvents", ->
-      @region = new Mercury.Regions.Full(@regionElement, window)
-      expect(@bindEventsSpy.callCount).toEqual(1)
+     it "calls bindEvents", ->
+       @region = new Mercury.Regions.Editable(@regionElement, window)
+       expect(@bindEventsSpy.callCount).toEqual(1)
 
 
   describe "#build", ->
@@ -325,12 +326,13 @@ describe "Mercury.Regions.Full", ->
 
 
 
-describe "Mercury.Regions.Full.actions", ->
+describe "Mercury.Regions.Editable.actions", ->
+
+  template 'mercury/regions/editable.html'
 
   beforeEach ->
-    fixture.load('mercury/regions/full.html')
-    #@region = new Mercury.Regions.Full($('#full_region1'), window)
-    #@actions = Mercury.Regions.Full.actions
+    #@region = new Mercury.Regions.Editable($('#editable_region1'), window)
+    #@actions = Mercury.Regions.Editable.actions
 
   #
   # behaviors

data/spec/javascripts/mercury/regions/{markdown_spec.js.coffee → markupable_spec.js.coffee}

@@ -1,42 +1,43 @@
-describe "Mercury.Regions.Markdown", ->
+describe "Mercury.Regions.Markupable", ->
+
+  template 'mercury/regions/markupable.html'
 
   beforeEach ->
-    fixture.load('mercury/regions/markdown.html')
-    @regionElement = $('#markdown_region1')
+    @regionElement = $('#markupable_region1')
 
   describe "constructor", ->
 
-    beforeEach ->
-      @buildSpy = spyOn(Mercury.Regions.Markdown.prototype, 'build').andCallFake(=>)
-      @bindEventsSpy = spyOn(Mercury.Regions.Markdown.prototype, 'bindEvents').andCallFake(=>)
-      spyOn(Mercury.Regions.Markdown.prototype, 'pushHistory').andCallFake(=>)
+     beforeEach ->
+       @buildSpy = spyOn(Mercury.Regions.Markupable.prototype, 'build').andCallFake(=>)
+       @bindEventsSpy = spyOn(Mercury.Regions.Markupable.prototype, 'bindEvents').andCallFake(=>)
+       spyOn(Mercury.Regions.Markupable.prototype, 'pushHistory').andCallFake(=>)
 
-    it "expects an element and window", ->
-      @region = new Mercury.Regions.Markdown(@regionElement, window)
-      expect(@region.element.get(0)).toEqual($('#markdown_region1').get(0))
-      expect(@region.window).toEqual(window)
+     it "expects an element and window", ->
+       @region = new Mercury.Regions.Markupable(@regionElement, window)
+       expect(@region.element.get(0)).toEqual($('#markupable_region1').get(0))
+       expect(@region.window).toEqual(window)
 
-    it "accepts options", ->
-      @region = new Mercury.Regions.Markdown(@regionElement, window, {foo: 'something'})
-      expect(@region.options).toEqual({foo: 'something'})
+     it "accepts options", ->
+       @region = new Mercury.Regions.Markupable(@regionElement, window, {foo: 'something'})
+       expect(@region.options).toEqual({foo: 'something'})
 
-    it "sets it's type", ->
-      @region = new Mercury.Regions.Markdown(@regionElement, window)
-      expect(@region.type()).toEqual('markdown')
+     it "sets it's type", ->
+       @region = new Mercury.Regions.Markupable(@regionElement, window)
+       expect(@region.type).toEqual('markupable')
 
-    it "creates a markdown converter using Showdown", ->
-      spy = spyOn(Showdown, 'converter').andCallFake(=>)
-      @region = new Mercury.Regions.Markdown(@regionElement, window)
-      expect(spy.callCount).toEqual(1)
-      expect(@region.converter).toBeDefined()
+     it "creates a markdown converter using Showdown", ->
+       spy = spyOn(Showdown, 'converter').andCallFake(=>)
+       @region = new Mercury.Regions.Markupable(@regionElement, window)
+       expect(spy.callCount).toEqual(1)
+       expect(@region.converter).toBeDefined()
 
-    it "calls build", ->
-      @region = new Mercury.Regions.Markdown(@regionElement, window)
-      expect(@buildSpy.callCount).toEqual(1)
+     it "calls build", ->
+       @region = new Mercury.Regions.Markupable(@regionElement, window)
+       expect(@buildSpy.callCount).toEqual(1)
 
-    it "calls bindEvents", ->
-      @region = new Mercury.Regions.Markdown(@regionElement, window)
-      expect(@bindEventsSpy.callCount).toEqual(1)
+     it "calls bindEvents", ->
+       @region = new Mercury.Regions.Markupable(@regionElement, window)
+       expect(@bindEventsSpy.callCount).toEqual(1)
 
 
   describe "#build", ->
@@ -265,12 +266,13 @@ describe "Mercury.Regions.Markdown", ->
 
 
 
-describe "Mercury.Regions.Markdown.actions", ->
+describe "Mercury.Regions.Markupable.actions", ->
+
+  template 'mercury/regions/markupable.html'
 
   beforeEach ->
-    fixture.load('mercury/regions/markdown.html')
-    #@region = new Mercury.Regions.Markdown($('#markdown_region1'), window)
-    #@actions = Mercury.Regions.Markdown.actions
+    #@region = new Mercury.Regions.Markupable($('#markupable_region1'), window)
+    #@actions = Mercury.Regions.Markupable.actions
 
   describe ".undo", ->
 

data/spec/javascripts/mercury/regions/{snippets_spec.js.coffee → snippetable_spec.js.coffee}

@@ -1,8 +1,9 @@
-describe "Mercury.Regions.Snippets", ->
+describe "Mercury.Regions.Snippetable", ->
+
+  template 'mercury/regions/snippetable.html'
 
   beforeEach ->
-    fixture.load('mercury/regions/snippets.html')
-    @regionElement = $('#snippets_region1')
+    @regionElement = $('#snippetable_region1')
 
   afterEach ->
     @region = null
@@ -11,50 +12,50 @@ describe "Mercury.Regions.Snippets", ->
   describe "constructor", ->
 
     beforeEach ->
-      @buildSpy = spyOn(Mercury.Regions.Snippets.prototype, 'build').andCallFake(=>)
-      @bindEventsSpy = spyOn(Mercury.Regions.Snippets.prototype, 'bindEvents').andCallFake(=>)
-      @makeSortableSpy = spyOn(Mercury.Regions.Snippets.prototype, 'makeSortable').andCallFake(=>)
+      @buildSpy = spyOn(Mercury.Regions.Snippetable.prototype, 'build').andCallFake(=>)
+      @bindEventsSpy = spyOn(Mercury.Regions.Snippetable.prototype, 'bindEvents').andCallFake(=>)
+      @makeSortableSpy = spyOn(Mercury.Regions.Snippetable.prototype, 'makeSortable').andCallFake(=>)
 
     it "expects an element and window", ->
-      @region = new Mercury.Regions.Snippets(@regionElement, window)
-      expect(@region.element.get(0)).toEqual($('#snippets_region1').get(0))
+      @region = new Mercury.Regions.Snippetable(@regionElement, window)
+      expect(@region.element.get(0)).toEqual($('#snippetable_region1').get(0))
       expect(@region.window).toEqual(window)
 
     it "accepts options", ->
-      @region = new Mercury.Regions.Snippets(@regionElement, window, {foo: 'something'})
+      @region = new Mercury.Regions.Snippetable(@regionElement, window, {foo: 'something'})
       expect(@region.options).toEqual({foo: 'something'})
 
     it "sets it's type", ->
-      @region = new Mercury.Regions.Snippets(@regionElement, window)
-      expect(@region.type()).toEqual('snippets')
+      @region = new Mercury.Regions.Snippetable(@regionElement, window)
+      expect(@region.type).toEqual('snippetable')
 
     it "calls build", ->
-      @region = new Mercury.Regions.Snippets(@regionElement, window)
+      @region = new Mercury.Regions.Snippetable(@regionElement, window)
       expect(@buildSpy.callCount).toEqual(1)
 
     it "calls bindEvents", ->
-      @region = new Mercury.Regions.Snippets(@regionElement, window)
+      @region = new Mercury.Regions.Snippetable(@regionElement, window)
       expect(@bindEventsSpy.callCount).toEqual(1)
 
     it "makes the snippets sortable", ->
-      @region = new Mercury.Regions.Snippets(@regionElement, window)
+      @region = new Mercury.Regions.Snippetable(@regionElement, window)
       expect(@makeSortableSpy.callCount).toEqual(1)
 
 
   describe "#build", ->
 
     beforeEach ->
-      spyOn(Mercury.Regions.Snippets.prototype, 'bindEvents').andCallFake(=>)
+      spyOn(Mercury.Regions.Snippetable.prototype, 'bindEvents').andCallFake(=>)
 
     it "sets the element min-height to 20 if it's min-height is 0 (or not set)", ->
-      @region = new Mercury.Regions.Snippets(@regionElement, window)
-      expect($('#snippets_region1').css('minHeight')).toEqual('20px')
+      @region = new Mercury.Regions.Snippetable(@regionElement, window)
+      expect($('#snippetable_region1').css('minHeight')).toEqual('20px')
 
 
   describe "observed events", ->
 
     beforeEach ->
-      @region = new Mercury.Regions.Snippets(@regionElement, window)
+      @region = new Mercury.Regions.Snippetable(@regionElement, window)
       Mercury.region = @region
 
     describe "custom event: unfocus:regions", ->
@@ -120,33 +121,33 @@ describe "Mercury.Regions.Snippets", ->
     describe "keydown on document (for undo / redo)", ->
 
       it "calls execCommand with undo on meta+z", ->
-        spy = spyOn(Mercury.Regions.Snippets.prototype, 'execCommand')
+        spy = spyOn(Mercury.Regions.Snippetable.prototype, 'execCommand')
         jasmine.simulate.keydown(document, {shiftKey: false, metaKey: true, keyCode: 90})
         expect(spy.callCount).toEqual(1)
         expect(spy.argsForCall[0]).toEqual(['undo'])
 
       it "calls execCommand with redo on shift+meta+z", ->
-        spy = spyOn(Mercury.Regions.Snippets.prototype, 'execCommand')
+        spy = spyOn(Mercury.Regions.Snippetable.prototype, 'execCommand')
         jasmine.simulate.keydown(document, {shiftKey: true, metaKey: true, keyCode: 90})
         expect(spy.callCount).toEqual(1)
         expect(spy.argsForCall[0]).toEqual(['redo'])
 
       it "does nothing if previewing", ->
         @region.previewing = true
-        spy = spyOn(Mercury.Regions.Snippets.prototype, 'execCommand')
+        spy = spyOn(Mercury.Regions.Snippetable.prototype, 'execCommand')
         jasmine.simulate.keydown(document, {shiftKey: true, metaKey: true, keyCode: 90})
         expect(spy.callCount).toEqual(0)
 
       it "does nothing if it's not the active region", ->
         Mercury.region = null
-        spy = spyOn(Mercury.Regions.Snippets.prototype, 'execCommand')
+        spy = spyOn(Mercury.Regions.Snippetable.prototype, 'execCommand')
         jasmine.simulate.keydown(document, {shiftKey: true, metaKey: true, keyCode: 90})
         expect(spy.callCount).toEqual(0)
 
     describe "mouseup", ->
 
       it "calls focus", ->
-        spy = spyOn(Mercury.Regions.Snippets.prototype, 'focus')
+        spy = spyOn(Mercury.Regions.Snippetable.prototype, 'focus')
         jasmine.simulate.mouseup(@region.element.get(0))
         expect(spy.callCount).toEqual(1)
 
@@ -157,7 +158,7 @@ describe "Mercury.Regions.Snippets", ->
 
       it "does nothing if previewing", ->
         @region.previewing = true
-        spy = spyOn(Mercury.Regions.Snippets.prototype, 'focus')
+        spy = spyOn(Mercury.Regions.Snippetable.prototype, 'focus')
         jasmine.simulate.mouseup(@region.element.get(0))
         expect(spy.callCount).toEqual(0)
 
@@ -180,7 +181,7 @@ describe "Mercury.Regions.Snippets", ->
   describe "#focus", ->
 
     beforeEach ->
-      @region = new Mercury.Regions.Snippets(@regionElement, window)
+      @region = new Mercury.Regions.Snippetable(@regionElement, window)
 
     it "sets the active mercury region", ->
       Mercury.region = null
@@ -188,19 +189,19 @@ describe "Mercury.Regions.Snippets", ->
       expect(Mercury.region).toEqual(@region)
 
     it "makes the snippets sortable again", ->
-      spy = spyOn(Mercury.Regions.Snippets.prototype, 'makeSortable')
+      spy = spyOn(Mercury.Regions.Snippetable.prototype, 'makeSortable')
       @region.focus()
       expect(spy.callCount).toEqual(1)
 
     it "adds the focus class to the element", ->
       @region.focus()
-      expect($('#snippets_region1').hasClass('focus')).toEqual(true)
+      expect($('#snippetable_region1').hasClass('focus')).toEqual(true)
 
 
   describe "#togglePreview", ->
 
     beforeEach ->
-      @region = new Mercury.Regions.Snippets(@regionElement, window)
+      @region = new Mercury.Regions.Snippetable(@regionElement, window)
 
     describe "when not previewing", ->
 
@@ -213,7 +214,7 @@ describe "Mercury.Regions.Snippets", ->
       it "removes the focus class", ->
         @regionElement.addClass('focus')
         @region.togglePreview()
-        expect($('#snippets_region1').hasClass('focus')).toEqual(false)
+        expect($('#snippetable_region1').hasClass('focus')).toEqual(false)
 
     describe "when previewing", ->
 
@@ -221,7 +222,7 @@ describe "Mercury.Regions.Snippets", ->
         @region.previewing = true
 
       it "makes the snippets sortable again", ->
-        spy = spyOn(Mercury.Regions.Snippets.prototype, 'makeSortable')
+        spy = spyOn(Mercury.Regions.Snippetable.prototype, 'makeSortable')
         @region.togglePreview()
         expect(spy.callCount).toEqual(1)
 
@@ -229,9 +230,9 @@ describe "Mercury.Regions.Snippets", ->
   describe "#execCommand", ->
 
     beforeEach ->
-      @region = new Mercury.Regions.Snippets(@regionElement, window)
-      Mercury.Regions.Snippets.actions['foo'] = ->
-      @handlerSpy = spyOn(Mercury.Regions.Snippets.actions, 'foo')
+      @region = new Mercury.Regions.Snippetable(@regionElement, window)
+      Mercury.Regions.Snippetable.actions['foo'] = ->
+      @handlerSpy = spyOn(Mercury.Regions.Snippetable.actions, 'foo')
 
     it "calls a handler (from the actions) if one exists", ->
       @region.execCommand('foo', {value: 'something'})
@@ -242,7 +243,7 @@ describe "Mercury.Regions.Snippets", ->
   describe "#makeSortable", ->
 
     beforeEach ->
-      @region = new Mercury.Regions.Snippets(@regionElement, window)
+      @region = new Mercury.Regions.Snippetable(@regionElement, window)
       @sortableSpy = spyOn($.fn, 'sortable')
 
     it "makes the snippets sortable", ->
@@ -260,25 +261,26 @@ describe "Mercury.Regions.Snippets", ->
       expect(spy.argsForCall[0]).toEqual(['hide:toolbar', {type: 'snippet', immediately: true}])
 
     it "pushes to the history after dragging", ->
-      spy = spyOn(Mercury.Regions.Snippets.prototype, 'pushHistory').andCallFake(=>)
-      spyOn(window, 'setTimeout').andCallFake((callback, timeout)=> callback())
+      spy = spyOn(Mercury.Regions.Snippetable.prototype, 'pushHistory').andCallFake(=>)
+      spyOn(window, 'setTimeout').andCallFake((timeout, callback)=> callback())
       @sortableSpy.andCallFake((arg) => if arg == 'destroy' then return @region.element else arg.stop())
       @region.makeSortable()
       expect(spy.callCount).toEqual(1)
 
 
 
-describe "Mercury.Regions.Snippets.actions", ->
+describe "Mercury.Regions.Snippetable.actions", ->
+
+  template 'mercury/regions/snippetable.html'
 
   beforeEach ->
-    fixture.load('mercury/regions/snippets.html')
-    @region = new Mercury.Regions.Snippets($('#snippets_region2'), window)
-    @actions = Mercury.Regions.Snippets.actions
+    @region = new Mercury.Regions.Snippetable($('#snippetable_region2'), window)
+    @actions = Mercury.Regions.Snippetable.actions
 
   describe ".undo", ->
 
     it "calls undo on the history buffer and sets the content", ->
-      htmlSpy = spyOn(Mercury.Regions.Snippets.prototype, 'content').andCallFake(=>)
+      htmlSpy = spyOn(Mercury.Regions.Snippetable.prototype, 'content').andCallFake(=>)
       historySpy = spyOn(@region.history, 'undo').andCallFake(=> 'history -1')
       @actions['undo'].call(@region)
       expect(historySpy.callCount).toEqual(1)
@@ -289,7 +291,7 @@ describe "Mercury.Regions.Snippets.actions", ->
   describe ".redo", ->
 
     it "calls redo on the history buffer and sets the content", ->
-      htmlSpy = spyOn(Mercury.Regions.Snippets.prototype, 'content').andCallFake(=>)
+      htmlSpy = spyOn(Mercury.Regions.Snippetable.prototype, 'content').andCallFake(=>)
       historySpy = spyOn(@region.history, 'redo').andCallFake(=> 'history +1')
       @actions['redo'].call(@region)
       expect(historySpy.callCount).toEqual(1)
@@ -300,7 +302,6 @@ describe "Mercury.Regions.Snippets.actions", ->
   describe ".insertSnippet", ->
 
     beforeEach ->
-      Mercury.Snippet.all = []
       Mercury.Snippet.load({
         'snippet_1': {name: 'example', options: {'foo': 'bar'}},
         'snippet_2': {name: 'example', options: {'foo': 'bar'}},
@@ -311,15 +312,15 @@ describe "Mercury.Regions.Snippets.actions", ->
 
       it "finds the snippet by it's identity and replaces it with the new snippet", ->
         @actions['insertSnippet'].call(@region, {value: Mercury.Snippet.find('snippet_1')})
-        expect($('#snippets_region2').html()).toContain('class="example-snippet"')
-        expect($('#snippets_region2').html()).toContain('contenteditable="false"')
-        expect($('#snippets_region2').html()).toContain('data-version="1"')
-        expect($('#snippets_region2').html()).toContain('data-snippet="snippet_1"')
-        expect($('#snippets_region2').html()).toContain('[snippet_1]')
+        expect($('#snippetable_region2').html()).toContain('class="mercury-snippet"')
+        expect($('#snippetable_region2').html()).toContain('contenteditable="false"')
+        expect($('#snippetable_region2').html()).toContain('data-version="1"')
+        expect($('#snippetable_region2').html()).toContain('data-snippet="snippet_1"')
+        expect($('#snippetable_region2').html()).toContain('[snippet_1]')
 
       it "pushes to the history after it's been rendered", ->
         spyOn(Mercury.Snippet.prototype, 'getHTML').andCallFake((x, callback) => callback() if callback)
-        spy = spyOn(Mercury.Regions.Snippets.prototype, 'pushHistory').andCallFake(=>)
+        spy = spyOn(Mercury.Regions.Snippetable.prototype, 'pushHistory').andCallFake(=>)
         @actions['insertSnippet'].call(@region, {value: Mercury.Snippet.find('snippet_1')})
         expect(spy.callCount).toEqual(1)
 
@@ -327,11 +328,11 @@ describe "Mercury.Regions.Snippets.actions", ->
 
       it "appends the new snippet html to the element", ->
         @actions['insertSnippet'].call(@region, {value: Mercury.Snippet.find('snippet_2')})
-        expect($('#snippets_region2 [data-snippet]').length).toEqual(2)
+        expect($('#snippetable_region2 .mercury-snippet').length).toEqual(2)
 
       it "pushes to the history after it's been rendered", ->
         spyOn(Mercury.Snippet.prototype, 'getHTML').andCallFake((x, callback) => callback() if callback)
-        spy = spyOn(Mercury.Regions.Snippets.prototype, 'pushHistory').andCallFake(=>)
+        spy = spyOn(Mercury.Regions.Snippetable.prototype, 'pushHistory').andCallFake(=>)
         @actions['insertSnippet'].call(@region, {value: Mercury.Snippet.find('snippet_2')})
         expect(spy.callCount).toEqual(1)
 
@@ -339,7 +340,7 @@ describe "Mercury.Regions.Snippets.actions", ->
   describe ".editSnippet", ->
 
     beforeEach ->
-      @region.snippet = $('#snippets_region2 [data-snippet]')
+      @region.snippet = $('#snippetable_region2 .mercury-snippet')
 
     it "finds and displays the options for the given snippet", ->
       spy = spyOn(Mercury.Snippet.prototype, 'displayOptions')
@@ -356,11 +357,11 @@ describe "Mercury.Regions.Snippets.actions", ->
   describe ".removeSnippet", ->
 
     beforeEach ->
-      @region.snippet = $('#snippets_region2 .mercury-snippet')
+      @region.snippet = $('#snippetable_region2 .mercury-snippet')
 
     it "removes the snippet if there's an active one", ->
       @actions['removeSnippet'].call(@region)
-      expect($('#snippets_region2 .mercury-snippet').length).toEqual(0)
+      expect($('#snippetable_region2 .mercury-snippet').length).toEqual(0)
 
     it "triggers the hide:toolbar event", ->
       spy = spyOn(Mercury, 'trigger').andCallFake(=>)

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

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