kiteditor 1.0.11 → 1.0.12

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

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

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

@@ -1,6 +1,7 @@
 describe "Mercury.Snippet", ->
 
-  template 'mercury/snippet.html'
+  beforeEach ->
+    fixture.load('mercury/snippet.html')
 
   afterEach ->
     Mercury.Snippet.all = []
@@ -35,7 +36,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="mercury-snippet"')
+      expect(html).toContain('class="foo-snippet"')
       expect(html).toContain('contenteditable="false"')
       expect(html).toContain('data-snippet="identity"')
       expect(html).toContain('data-version="1"')
@@ -53,6 +54,19 @@ 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", ->
 
@@ -142,6 +156,11 @@ 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", ->
 
@@ -151,11 +170,11 @@ describe "Mercury.Snippet", ->
 
     it "sets the version", ->
       @snippet.setVersion(5)
-      expect(@snippet.version).toEqual(4)
+      expect(@snippet.version).toEqual(5)
 
     it "accepts a version (can be a string)", ->
       @snippet.setVersion('2')
-      expect(@snippet.version).toEqual(1)
+      expect(@snippet.version).toEqual(2)
 
     it "pulls the version out of the history buffer", ->
       @snippet.setVersion(3)
@@ -177,7 +196,7 @@ describe "Mercury.Snippet", ->
 
     it "returns an object with name and options", ->
       ret = @snippet.serialize()
-      expect(ret).toEqual({name: 'foo', options: {foo: 'bar'}})
+      expect(ret).toEqual({name: 'foo', foo: 'bar'})
 
 
 
@@ -190,16 +209,45 @@ describe "Mercury.Snippet class methods", ->
 
     beforeEach ->
       @modalSpy = spyOn(Mercury, 'modal').andCallFake(=>)
+      @triggerSpy = spyOn(Mercury, 'trigger').andCallFake(=>)
 
-    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'}])
+    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 "sets the snippet back to nothing", ->
-      Mercury.snippet = 'foo'
-      Mercury.Snippet.displayOptionsFor('foo')
-      expect(Mercury.snippet).toEqual(null)
+      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 "sets the snippet back to nothing", ->
+        Mercury.snippet = 'foo'
+        Mercury.Snippet.displayOptionsFor('foo', {}, false)
+        expect(Mercury.snippet).toEqual(null)
 
 
   describe ".create", ->
@@ -219,6 +267,30 @@ 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", ->
 
@@ -236,10 +308,14 @@ describe "Mercury.Snippet class methods", ->
 
     beforeEach ->
       @snippets = {
-        snippet_1: {name: 'foo', options: {foo: 'bar'}}
-        snippet_2: {name: 'bar', options: {baz: 'pizza'}}
+        snippet_1: {name: 'foo', something: {foo: 'bar'}}
+        snippet_2: {name: 'bar', something: {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')
+