kiteditor 1.0.11 → 1.0.12

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

@@ -1,10 +1,9 @@
 describe "Mercury.modalHandlers.htmlEditor", ->
 
-  template 'mercury/modals/htmleditor.html'
-
   beforeEach ->
+    fixture.load('mercury/modals/htmleditor.html')
     @modal =
-      element: $('#test')
+      element: $(fixture.el)
       hide: ->
     Mercury.region =
       content: -> '<span>html \ncontent</span>'
@@ -13,7 +12,7 @@ describe "Mercury.modalHandlers.htmlEditor", ->
   describe "loading", ->
 
     it "sets the value of the textarea", ->
-      expect($('#test textarea').val()).toEqual('<span>html \ncontent</span>')
+      expect($('textarea', fixture.el).val()).toEqual('<span>html \ncontent</span>')
 
 
   describe "submitting", ->
@@ -22,7 +21,7 @@ describe "Mercury.modalHandlers.htmlEditor", ->
       spy = spyOn(Mercury, 'trigger').andCallFake(=>)
       jasmine.simulate.click($('#submit').get(0))
       expect(spy.callCount).toEqual(1)
-      expect(spy.argsForCall[0]).toEqual(['action', {action: 'replaceHTML', value: '<span>html content</span>'}])
+      expect(spy.argsForCall[0]).toEqual(['action', {action: 'replaceHTML', value: '<span>html \ncontent</span>'}])
 
     it "hides the modal", ->
       spy = spyOn(@modal, 'hide').andCallFake(=>)

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

@@ -1,10 +1,9 @@
 describe "Mercury.modalHandlers.insertCharacter", ->
 
-  template 'mercury/modals/insertcharacter.html'
-
   beforeEach ->
+    fixture.load('mercury/modals/insertcharacter.html')
     @modal =
-      element: $('#test')
+      element: $(fixture.el)
       hide: ->
     @modalHideSpy = spyOn(@modal, 'hide').andCallFake(=>)
     Mercury.modalHandlers.insertCharacter.call(@modal)

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

@@ -1,19 +1,19 @@
 describe "Mercury.modalHandlers.insertLink", ->
 
-  template 'mercury/modals/insertlink.html'
-
   beforeEach ->
+    fixture.load('mercury/modals/insertlink.html')
     Mercury.region = null
     @modal =
-      element: $('#test')
+      element: $(fixture.el)
       hide: ->
       resize: ->
+    @insertLink = $.extend(@modal, Mercury.modalHandlers.insertLink)
     window.mercuryInstance = {document: $(document)}
 
   describe "initializing", ->
 
     beforeEach ->
-      Mercury.modalHandlers.insertLink.call(@modal)
+      @insertLink.initialize()
 
     it "loads all links with a name into the existing bookmarks pulldown", ->
       options = $('#link_existing_bookmark').html()
@@ -25,28 +25,35 @@ describe "Mercury.modalHandlers.insertLink", ->
   describe "clicking on a radio button (in a label)", ->
 
     beforeEach ->
-      Mercury.modalHandlers.insertLink.call(@modal)
+      @insertLink.initialize()
 
     it "focuses the next input with a selectable class", ->
       spy = spyOn($.fn, 'focus').andCallFake(=>)
-      jasmine.simulate.click($('#checkbox1').get(0))
+      jasmine.simulate.click($('input[value=external_url]').get(0))
       expect(spy.callCount).toEqual(1)
 
 
   describe "focusing an input", ->
 
     beforeEach ->
-      Mercury.modalHandlers.insertLink.call(@modal)
+      @insertLink.initialize()
 
     it "checks the corresponding checkbox", ->
       $('#link_existing_bookmark').focus()
-      expect($('#checkbox2').get(0).checked).toEqual(true)
+      expect($('input[value=existing_bookmark]').get(0).checked).toEqual(true)
 
 
   describe "changing the link target", ->
 
     it "shows options for whatever was selected", ->
+      $('#link_target').val('popup')
+      @insertLink.onChangeTarget()
+      expect($('#popup_options').is(':visible')).toEqual(true)
+
     it "calls resize", ->
+      spy = spyOn(@modal, 'resize')
+      @insertLink.onChangeTarget()
+      expect(spy.callCount).toEqual(1)
 
 
   describe "when editing", ->
@@ -56,12 +63,11 @@ describe "Mercury.modalHandlers.insertLink", ->
       beforeEach ->
         Mercury.region = selection: => {
           commonAncestor: -> $('<a>', {href: 'http://cnn.com', target: '_top'}).html('foo'),
-          textContent: -> 'content'
-          }
-        Mercury.modalHandlers.insertLink.call(@modal)
+        }
+        @insertLink.initialize()
 
       it "hides the link text input", ->
-        expect($('#link_text_container').css('display')).toEqual('none')
+        expect($('#link_text_container').is(':visible')).toEqual(false)
 
       it "pre-fills the link url input", ->
         expect($('#link_external_url').val()).toEqual('http://cnn.com')
@@ -69,17 +75,16 @@ describe "Mercury.modalHandlers.insertLink", ->
       it "selects the target if one's available", ->
         expect($('#link_target').val()).toEqual('_top')
 
-      it "fills the content", ->
-        expect($('#link_text').val()).toEqual('content')
-
     describe "a javascript popup link", ->
 
       beforeEach ->
-        Mercury.region = selection: => {commonAncestor: -> $('<a>', {href: "javascript:void(window.open('http://cnn.com', 'popup_window', 'width=100,height=42,menubar=no,toolbar=no'))"}).html('foo')}
-        Mercury.modalHandlers.insertLink.call(@modal)
+        Mercury.region = selection: => {
+          commonAncestor: -> $('<a>', {href: "javascript:void(window.open('http://cnn.com', 'popup_window', 'width=100,height=42,menubar=no,toolbar=no'))"}).html('foo')
+        }
+        @insertLink.initialize()
 
       it "hides the link text input", ->
-        expect($('#link_text_container').css('display')).toEqual('none')
+        expect($('#link_text_container').is(':visible')).toEqual(false)
 
       it "pre-fills the link url input", ->
         expect($('#link_external_url').val()).toEqual('http://cnn.com')
@@ -94,11 +99,13 @@ describe "Mercury.modalHandlers.insertLink", ->
     describe "a bookmark link", ->
 
       beforeEach ->
-        Mercury.region = selection: => {commonAncestor: -> $('<a>', {href: '#link2'}).html('foo')}
-        Mercury.modalHandlers.insertLink.call(@modal)
+        Mercury.region = selection: => {
+          commonAncestor: -> $('<a>', {href: '#link2'}).html('foo')
+        }
+        @insertLink.initialize()
 
       it "hides the link text input", ->
-        expect($('#link_text_container').css('display')).toEqual('none')
+        expect($('#link_text_container').is(':visible')).toEqual(false)
 
       it "checks the existing bookmark radio", ->
         expect($('input[value=existing_bookmark]').get(0).checked).toEqual(true)
@@ -109,8 +116,10 @@ describe "Mercury.modalHandlers.insertLink", ->
     describe "a bookmark target", ->
 
       beforeEach ->
-        Mercury.region = selection: => {commonAncestor: -> $('<a>', {name: 'link3'}).html('foo')}
-        Mercury.modalHandlers.insertLink.call(@modal)
+        Mercury.region = selection: => {
+          commonAncestor: -> $('<a>', {name: 'link3'}).html('foo')
+        }
+        @insertLink.initialize()
 
       it "hides the link text input", ->
         expect($('#link_text_container').css('display')).toEqual('none')
@@ -122,18 +131,80 @@ describe "Mercury.modalHandlers.insertLink", ->
         expect($('#link_new_bookmark').val()).toEqual('link3')
 
 
+  describe "validating", ->
+
+    beforeEach ->
+      @insertLink.initialize()
+      @triggerSpy = spyOn(Mercury, 'trigger').andCallFake(=>)
+      $('#link_text').val('foo')
+
+    it "displays an error if there's no content", ->
+      $('#link_text').val('')
+      @insertLink.validateForm()
+      expect(@insertLink.valid).toEqual(false)
+      expect($('#link_text').closest('.control-group').find('.error-message').html()).toEqual("can't be blank")
+
+    describe "a standard link", ->
+
+      it "displays an error", ->
+        @insertLink.validateForm()
+        expect(@insertLink.valid).toEqual(false)
+        expect($('#link_external_url').closest('.control-group').find('.error-message').html()).toEqual("can't be blank")
+
+      it "doesn't submit", ->
+        @insertLink.validateForm()
+        expect(@triggerSpy.callCount).toEqual(0)
+
+    describe "a bookmark link", ->
+
+      beforeEach ->
+        jasmine.simulate.click($('input[value=existing_bookmark]').get(0))
+        $('#link_existing_bookmark').html('').val('')
+
+      it "displays an error", ->
+        @insertLink.validateForm()
+        expect(@insertLink.valid).toEqual(false)
+        expect($('#link_existing_bookmark').closest('.control-group').find('.error-message').html()).toEqual("can't be blank")
+
+      it "doesn't submit", ->
+        @insertLink.validateForm()
+        expect(@triggerSpy.callCount).toEqual(0)
+
+    describe "a bookmark target", ->
+
+      beforeEach ->
+        jasmine.simulate.click($('input[value=new_bookmark]').get(0))
+
+      it "displays an error", ->
+        @insertLink.validateForm()
+        expect(@insertLink.valid).toEqual(false)
+        expect($('#link_new_bookmark').closest('.control-group').find('.error-message').html()).toEqual("can't be blank")
+
+      it "doesn't submit", ->
+        @insertLink.validateForm()
+        expect(@triggerSpy.callCount).toEqual(0)
+
+
   describe "submitting", ->
 
     describe "a new link", ->
 
       beforeEach ->
-        Mercury.modalHandlers.insertLink.call(@modal)
+        @insertLink.initialize()
         @triggerSpy = spyOn(Mercury, 'trigger').andCallFake(=>)
         $('#link_text').val('foo')
 
+      it "doesn't submit unless it's valid", ->
+        $('#link_text').val('')
+        spy = spyOn(@modal, 'hide')
+        jasmine.simulate.click($('input[type=submit]').get(0))
+        expect(spy.callCount).toEqual(0)
+        expect(@insertLink.valid).toEqual(false)
+
       it "hides the modal", ->
-        spy = spyOn(@modal, 'hide').andCallFake(=>)
-        jasmine.simulate.click($('#submit').get(0))
+        $('#link_external_url').val('http://cnn.com')
+        spy = spyOn(@modal, 'hide')
+        jasmine.simulate.click($('input[type=submit]').get(0))
         expect(spy.callCount).toEqual(1)
 
       describe "as a standard link", ->
@@ -143,7 +214,7 @@ describe "Mercury.modalHandlers.insertLink", ->
           $('#link_target').val('_top')
 
         it "triggers an action with the proper values", ->
-          jasmine.simulate.click($('#submit').get(0))
+          jasmine.simulate.click($('input[type=submit]').get(0))
           expect(@triggerSpy.callCount).toEqual(1)
           expect(@triggerSpy.argsForCall[0][0]).toEqual('action')
           expect(@triggerSpy.argsForCall[0][1]['action']).toEqual('insertLink')
@@ -158,7 +229,7 @@ describe "Mercury.modalHandlers.insertLink", ->
           $('#link_popup_height').val('42')
 
         it "triggers an action with the proper values", ->
-          jasmine.simulate.click($('#submit').get(0))
+          jasmine.simulate.click($('input[type=submit]').get(0))
           expect(@triggerSpy.callCount).toEqual(1)
           expect(@triggerSpy.argsForCall[0][0]).toEqual('action')
           expect(@triggerSpy.argsForCall[0][1]['action']).toEqual('insertLink')
@@ -171,7 +242,7 @@ describe "Mercury.modalHandlers.insertLink", ->
           $('input[value=existing_bookmark]').prop('checked', true)
 
         it "triggers an action with the proper values", ->
-          jasmine.simulate.click($('#submit').get(0))
+          jasmine.simulate.click($('input[type=submit]').get(0))
           expect(@triggerSpy.callCount).toEqual(1)
           expect(@triggerSpy.argsForCall[0][0]).toEqual('action')
           expect(@triggerSpy.argsForCall[0][1]['action']).toEqual('insertLink')
@@ -184,7 +255,7 @@ describe "Mercury.modalHandlers.insertLink", ->
           $('input[value=new_bookmark]').prop('checked', true)
 
         it "triggers an action with the proper values", ->
-          jasmine.simulate.click($('#submit').get(0))
+          jasmine.simulate.click($('input[type=submit]').get(0))
           expect(@triggerSpy.callCount).toEqual(1)
           expect(@triggerSpy.argsForCall[0][0]).toEqual('action')
           expect(@triggerSpy.argsForCall[0][1]['action']).toEqual('insertLink')
@@ -194,14 +265,16 @@ describe "Mercury.modalHandlers.insertLink", ->
 
       beforeEach ->
         @existingLink = $('<a>', {name: 'link3'}).html('foo')
-        Mercury.region = selection: => {commonAncestor: => @existingLink}
-        Mercury.modalHandlers.insertLink.call(@modal)
+        Mercury.region = selection: => {
+          commonAncestor: => @existingLink
+        }
+        @insertLink.initialize()
         @triggerSpy = spyOn(Mercury, 'trigger').andCallFake(=>)
         $('#link_text').val('foo')
 
       it "hides the modal", ->
         spy = spyOn(@modal, 'hide').andCallFake(=>)
-        jasmine.simulate.click($('#submit').get(0))
+        jasmine.simulate.click($('input[type=submit]').get(0))
         expect(spy.callCount).toEqual(1)
 
       describe "as a standard link", ->
@@ -212,7 +285,7 @@ describe "Mercury.modalHandlers.insertLink", ->
           $('input[value=external_url]').prop('checked', true)
 
         it "triggers an action with the proper values", ->
-          jasmine.simulate.click($('#submit').get(0))
+          jasmine.simulate.click($('input[type=submit]').get(0))
           expect(@triggerSpy.callCount).toEqual(1)
           expect(@triggerSpy.argsForCall[0][0]).toEqual('action')
           expect(@triggerSpy.argsForCall[0][1]['action']).toEqual('replaceLink')

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

@@ -1,43 +1,44 @@
 describe "Mercury.modalHandlers.insertMedia", ->
 
-  template 'mercury/modals/insertmedia.html'
-
   beforeEach ->
+    fixture.load('mercury/modals/insertmedia.html')
     Mercury.region = null
-    spyOn(window, 'setTimeout').andCallFake((timeout, callback) => callback())
+    spyOn(window, 'setTimeout').andCallFake((callback, timeout) => callback())
     @modal =
-      element: $('#test')
+      element: $(fixture.el)
       hide: ->
       resize: ->
+    @insertMedia = $.extend(@modal, Mercury.modalHandlers.insertMedia)
+    window.mercuryInstance = {document: $(document)}
 
   describe "clicking on a radio button (in a label)", ->
 
     beforeEach ->
-      Mercury.modalHandlers.insertMedia.call(@modal)
+      @insertMedia.initialize()
 
     it "focuses the next input with a selectable class", ->
       spy = spyOn($.fn, 'focus').andCallFake(=>)
-      jasmine.simulate.click($('#checkbox1').get(0))
+      jasmine.simulate.click($('input[value=image_url]').get(0))
       expect(spy.callCount).toEqual(1)
 
 
   describe "focusing an input", ->
 
     beforeEach ->
-      Mercury.modalHandlers.insertMedia.call(@modal)
+      @insertMedia.initialize()
 
     it "checks the corresponding checkbox", ->
       $('#media_youtube_url').focus()
-      expect($('#checkbox2').get(0).checked).toEqual(true)
+      expect($('input[value=youtube_url]').get(0).checked).toEqual(true)
 
     it "hides all the option divs", ->
       $('#media_youtube_url').focus()
-      expect($('#image_url').css('display')).toEqual('none')
-      expect($('#vimeo_url').css('display')).toEqual('none')
+      expect($('#image_url_options').css('display')).toEqual('none')
+      expect($('#vimeo_url_options').css('display')).toEqual('none')
 
     it "shows the options for the item that was focused", ->
       $('#media_youtube_url').focus()
-      expect($('#youtube_url').css('display')).toNotEqual('none')
+      expect($('#youtube_url_options').css('display')).toNotEqual('none')
 
     it "calls resize", ->
       spy = spyOn(@modal, 'resize').andCallFake(=>)
@@ -51,30 +52,33 @@ describe "Mercury.modalHandlers.insertMedia", ->
 
       beforeEach ->
         @focusSpy = spyOn($.fn, 'focus').andCallThrough()
-        @selection = {is: -> $('<img>', {src: '/foo.gif', align: 'right'})}
+        @selection = {is: -> $('<img>', {src: '/foo.gif', align: 'right', style: 'float: left;'})}
         Mercury.region = selection: => @selection
-        Mercury.modalHandlers.insertMedia.call(@modal)
+        @insertMedia.initialize()
 
       it "pre-fills the image url", ->
         expect($('#media_image_url').val()).toEqual('/foo.gif')
 
       it "focuses the url input", ->
-        expect(@focusSpy.callCount).toEqual(1)
+        expect(@focusSpy.callCount).toEqual(2)
         expect($('input[value=image_url]').get(0).checked).toEqual(true)
 
       it "sets the image alignment option", ->
         expect($('#media_image_alignment').val()).toEqual('right')
 
+      it "sets the image float option", ->
+        expect($('#media_image_float').val()).toEqual('left')
+
     describe "an existing youtube video", ->
 
       beforeEach ->
         @focusSpy = spyOn($.fn, 'focus').andCallThrough()
-        @selection = {is: -> $('<iframe>', {src: 'http://www.youtube.com/embed/foo?wmode=transparent', style: 'width:100px;height:42px'})}
+        @selection = {is: -> $('<iframe>', {src: 'https://www.youtube.com/embed/foo?wmode=transparent', style: 'width:100px;height:42px'})}
         Mercury.region = selection: => @selection
-        Mercury.modalHandlers.insertMedia.call(@modal)
+        @insertMedia.initialize()
 
       it "pre-fills the url", ->
-        expect($('#media_youtube_url').val()).toEqual('http://youtu.be/foo')
+        expect($('#media_youtube_url').val()).toEqual('https://youtu.be/foo')
 
       it "focuses the url input", ->
         expect($('input[value=youtube_url]').get(0).checked).toEqual(true)
@@ -91,7 +95,7 @@ describe "Mercury.modalHandlers.insertMedia", ->
         @focusSpy = spyOn($.fn, 'focus').andCallThrough()
         @selection = {is: -> $('<iframe>', {src: 'http://player.vimeo.com/video/foo?title=1&byline=1&portrait=0&color=ffffff', style: 'width:100px;height:42px'})}
         Mercury.region = selection: => @selection
-        Mercury.modalHandlers.insertMedia.call(@modal)
+        @insertMedia.initialize()
 
       it "pre-fills the url", ->
         expect($('#media_vimeo_url').val()).toEqual('http://vimeo.com/foo')
@@ -106,15 +110,67 @@ describe "Mercury.modalHandlers.insertMedia", ->
         expect($('#media_vimeo_height').val()).toEqual('42')
 
 
+  describe "validating", ->
+
+    beforeEach ->
+      @insertMedia.initialize()
+      @triggerSpy = spyOn(Mercury, 'trigger').andCallFake(=>)
+
+    describe "an image", ->
+
+      it "displays an error", ->
+        @insertMedia.validateForm()
+        expect(@insertMedia.valid).toEqual(false)
+        expect($('#media_image_url').closest('.control-group').find('.error-message').html()).toEqual("can't be blank")
+
+      it "doesn't submit", ->
+        @insertMedia.validateForm()
+        expect(@triggerSpy.callCount).toEqual(0)
+
+    describe "a youtube video", ->
+
+      beforeEach ->
+        $('input[value=youtube_url]').prop('checked', true)
+
+      it "displays an error", ->
+        @insertMedia.validateForm()
+        expect(@insertMedia.valid).toEqual(false)
+        expect($('#media_youtube_url').closest('.control-group').find('.error-message').html()).toEqual("is invalid")
+
+      it "doesn't submit", ->
+        @insertMedia.validateForm()
+        expect(@triggerSpy.callCount).toEqual(0)
+
+    describe "a vimeo video", ->
+      beforeEach ->
+        $('input[value=vimeo_url]').prop('checked', true)
+
+      it "displays an error", ->
+        @insertMedia.validateForm()
+        expect(@insertMedia.valid).toEqual(false)
+        expect($('#media_vimeo_url').closest('.control-group').find('.error-message').html()).toEqual("is invalid")
+
+      it "doesn't submit", ->
+        @insertMedia.validateForm()
+        expect(@triggerSpy.callCount).toEqual(0)
+
+
   describe "submitting", ->
 
     beforeEach ->
-      Mercury.modalHandlers.insertMedia.call(@modal)
+      @insertMedia.initialize()
       @triggerSpy = spyOn(Mercury, 'trigger').andCallFake(=>)
 
+    it "doesn't submit unless it's valid", ->
+      spy = spyOn(@modal, 'hide')
+      jasmine.simulate.click($('input[type=submit]').get(0))
+      expect(spy.callCount).toEqual(0)
+      expect(@insertMedia.valid).toEqual(false)
+
     it "hides the modal", ->
-      spy = spyOn(@modal, 'hide').andCallFake(=>)
-      jasmine.simulate.click($('#submit').get(0))
+      $('#media_image_url').val('foo.gif')
+      spy = spyOn(@modal, 'hide')
+      jasmine.simulate.click($('input[type=submit]').get(0))
       expect(spy.callCount).toEqual(1)
 
     describe "an image", ->
@@ -122,13 +178,14 @@ describe "Mercury.modalHandlers.insertMedia", ->
       beforeEach ->
         $('#media_image_url').val('http://domain/foo.gif')
         $('#media_image_alignment').val('right')
+        $('#media_image_float').val('left')
 
       it "triggers an action with the proper values", ->
-        jasmine.simulate.click($('#submit').get(0))
+        jasmine.simulate.click($('input[type=submit]').get(0))
         expect(@triggerSpy.callCount).toEqual(1)
         expect(@triggerSpy.argsForCall[0][0]).toEqual('action')
         expect(@triggerSpy.argsForCall[0][1]['action']).toEqual('insertImage')
-        expect(@triggerSpy.argsForCall[0][1]['value']).toEqual({src: 'http://domain/foo.gif', align: 'right'})
+        expect(@triggerSpy.argsForCall[0][1]['value']).toEqual({src: 'http://domain/foo.gif', align: 'right', style: 'float: left;'})
 
     describe "a youtube video", ->
 
@@ -139,7 +196,8 @@ describe "Mercury.modalHandlers.insertMedia", ->
         $('input[value=youtube_url]').prop('checked', true)
 
       it "triggers an action with the proper values", ->
-        jasmine.simulate.click($('#submit').get(0))
+        $('#media_youtube_url').val('http://youtu.be/foo')
+        jasmine.simulate.click($('input[type=submit]').get(0))
         expect(@triggerSpy.callCount).toEqual(1)
         expect(@triggerSpy.argsForCall[0][0]).toEqual('action')
         expect(@triggerSpy.argsForCall[0][1]['action']).toEqual('insertHTML')
@@ -148,16 +206,27 @@ describe "Mercury.modalHandlers.insertMedia", ->
         expect(value).toContain('42px')
         expect(value).toContain('src="http://www.youtube.com/embed/foo?wmode=transparent"')
 
+      it "triggers an action with the proper values using https", ->
+        $('#media_youtube_url').val('https://youtu.be/foo')
+        jasmine.simulate.click($('input[type=submit]').get(0))
+        expect(@triggerSpy.callCount).toEqual(1)
+        expect(@triggerSpy.argsForCall[0][0]).toEqual('action')
+        expect(@triggerSpy.argsForCall[0][1]['action']).toEqual('insertHTML')
+        value = $('<div>').html(@triggerSpy.argsForCall[0][1]['value']).html()
+        expect(value).toContain('100px')
+        expect(value).toContain('42px')
+        expect(value).toContain('src="https://www.youtube.com/embed/foo?wmode=transparent"')
+
     describe "a vimeo video", ->
 
       beforeEach ->
-        $('#media_vimeo_url').val('http://vimeo.com/foo')
         $('#media_vimeo_width').val(100)
         $('#media_vimeo_height').val('42')
         $('input[value=vimeo_url]').prop('checked', true)
 
       it "triggers an action with the proper values", ->
-        jasmine.simulate.click($('#submit').get(0))
+        $('#media_vimeo_url').val('http://vimeo.com/foo')
+        jasmine.simulate.click($('input[type=submit]').get(0))
         expect(@triggerSpy.callCount).toEqual(1)
         expect(@triggerSpy.argsForCall[0][0]).toEqual('action')
         expect(@triggerSpy.argsForCall[0][1]['action']).toEqual('insertHTML')
@@ -165,3 +234,14 @@ describe "Mercury.modalHandlers.insertMedia", ->
         expect(value).toContain('100px')
         expect(value).toContain('42px')
         expect(value).toContain('http://player.vimeo.com/video/foo?title=1&amp;byline=1&amp;portrait=0&amp;color=ffffff')
+
+      it "triggers an action with the proper values using https", ->
+        $('#media_vimeo_url').val('https://vimeo.com/foo')
+        jasmine.simulate.click($('input[type=submit]').get(0))
+        expect(@triggerSpy.callCount).toEqual(1)
+        expect(@triggerSpy.argsForCall[0][0]).toEqual('action')
+        expect(@triggerSpy.argsForCall[0][1]['action']).toEqual('insertHTML')
+        value = $('<div>').html(@triggerSpy.argsForCall[0][1]['value']).html()
+        expect(value).toContain('100px')
+        expect(value).toContain('42px')
+        expect(value).toContain('https://player.vimeo.com/video/foo?title=1&amp;byline=1&amp;portrait=0&amp;color=ffffff')