mercury-rails 0.2.0 → 0.2.3

data/features/support/env.rb

@@ -9,15 +9,16 @@ require 'capybara/firebug'
 
 # You can enable firebug in your tests by tagging them @firebug.
 # To change the version of firebug use the FIREBUG_VERSION environment variable.
-# For firefox 4 use 1.7.0
+# For firefox 4+ use 1.7.0
 # For firefox 3 use 1.6.2
-Selenium::WebDriver::Firefox::Profile.firebug_version = ENV['FIREBUG_VERSION'] || '1.7.0'
+Selenium::WebDriver::Firefox::Profile.firebug_version = ENV['FIREBUG_VERSION'] || '1.8.3'
 
 # Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
 # order to ease the transition to Capybara we set the default here. If you'd
 # prefer to use XPath just remove this line and adjust any selectors in your
 # steps to use the XPath syntax.
 Capybara.default_selector = :css
+Capybara.ignore_hidden_elements = true
 
 # By default, any exception happening in your Rails application will bubble up
 # to Cucumber so that your scenario will fail. This is a different from how
@@ -43,4 +44,3 @@ begin
 rescue NameError
   raise "You need to add database_cleaner to your Gemfile (in the :test group) if you wish to use it."
 end
-

data/features/support/mercury_contents.rb

@@ -0,0 +1,25 @@
+module MercuryContentsHelpers
+  def contents_for(name)
+    case name
+      when 'simple content' then "this is <span>simple</span> <b>content</b>"
+      when 'justifiable content' then "<div>first line</div><br/>this is <span>justifiable</span> <b>content</b>"
+      when 'wrapped content' then "<span>this <a href='http://google.com'>is</a> <i>wrapped</i> <b>content</b></span>"
+      when 'an image' then "this is <img src='/assets/mercury/temp-logo.png'> <b>content</b>"
+      when 'a table' then "this is a <table><tr><td><span>1</span></td><td><span>2</span></td></tr><tr><td><span>3</span></td><td><span>4</span></td></tr></table> <b>content</b>"
+      when 'the snippet', 'that snippet' then "<div class='mercury-snippet' data-snippet='#{@snippet_id || 'snippet_42'}'>#{@snippet_id || 'snippet_42'}</div> <b>content</b>"
+
+      else name
+    end
+  end
+
+  def parse_snippet_options_from(options_string)
+    json = []
+    options_string.scan(/(?:,\s)?([^:]*): ("[^"]*")/).each do |pair|
+      json << %Q{'options[#{pair[0]}]': #{pair[1]}}
+    end
+
+    "{#{json.join(', ')}}"
+  end
+end
+
+World(MercuryContentsHelpers)

data/features/support/mercury_selectors.rb

@@ -0,0 +1,147 @@
+module MercurySelectorsHelpers
+
+  def mercury_selector_for(locator)
+    case locator
+
+      # toolbar selectors
+      when 'the toolbar' then '.mercury-toolbar-container'
+
+      when /^the "(.*?)" button$/
+        ".mercury-primary-toolbar .mercury-#{mercury_button_mapping_for($1)}-button"
+
+      when /^the (.*?) editor (button|dropdown|palette)$/
+        ".mercury-editable-toolbar .mercury-#{mercury_button_mapping_for($1)}-button"
+
+      when /^the (.*?) toolbar button$/
+        ".mercury-snippet-toolbar .mercury-#{mercury_button_mapping_for($1)}-button"
+
+      when /^the (.*?) select$/
+        ".mercury-#{mercury_button_mapping_for($1)}-select"
+
+      when /^the (.*?) palette$/
+        ".mercury-#{mercury_button_mapping_for($1)}-palette"
+
+      # palette / select dropdown
+      when 'the color red' then '.mercury-palette .picker:nth-child(22n)'
+
+      when 'the red style' then '.mercury-select-options .red'
+      when 'the heading 2 block' then '.mercury-select-options h2'
+
+      # statusbar selectors
+      when 'the statusbar' then '.mercury-statusbar'
+      when 'the about the editor link' then 'a.mercury-statusbar-about'
+
+      # panel selectors
+      when 'the panel', /^the (.*?) panel$/ then '.mercury-panel'
+
+      # modal window selectors
+      when 'the modal', 'the modal window', /^the (.*?) modal$/ then '.mercury-modal'
+      when 'the modal overlay' then '.mercury-modal-overlay'
+      when 'the modal title' then '.mercury-modal h1.mercury-modal-title'
+      when 'the modal close button' then '.mercury-modal h1.mercury-modal-title a'
+
+      when 'the sweet snowman' then '.mercury-modal .character:nth-child(247n)'
+
+      when 'the first cell in the first row' then '.mercury-modal tr:nth-child(1n) td:nth-child(1n)'
+      when 'the third cell in the first row' then '.mercury-modal tr:nth-child(1n) td:nth-child(3n)'
+      when 'the forth cell in the first row' then '.mercury-modal tr:nth-child(1n) td:nth-child(4n)'
+      when 'the second cell in the second row' then '.mercury-modal tr:nth-child(2n) td:nth-child(2n)'
+      when 'the forth cell in the second row' then '.mercury-modal tr:nth-child(2n) td:nth-child(4n)'
+
+      when 'a selected cell' then '.mercury-modal td.selected'
+
+      # lightview selectors
+      when 'the lightview', 'the lightview window', /^the (.*?) lightview$/ then '.mercury-lightview'
+      when 'the lightview overlay' then '.mercury-lightview-overlay'
+      when 'the lightview title' then '.mercury-lightview h1.mercury-lightview-title'
+
+      # snippet selectors
+      when 'the snippet toolbar' then '.mercury-snippet-toolbar'
+      when 'the snippet', 'that snippet' then "div[data-snippet=#{@snippet_id || 'snippet_42'}]"
+
+      # other selectors
+      when 'the first image' then 'img:nth-child(1n)'
+
+    end
+  end
+
+  def mercury_button_mapping_for(locator)
+    case locator.downcase
+
+      # primary toolbar
+      when 'save' then 'save'
+      when 'preview' then 'preview'
+      when 'undo' then 'undo'
+      when 'redo' then 'redo'
+      when 'link', 'insert link' then 'insertLink'
+      when 'media', 'insert media' then 'insertMedia'
+      when 'table', 'insert table' then 'insertTable'
+      when 'character', 'insert character' then 'insertCharacter'
+      when 'snippet', 'insert snippet' then 'snippetPanel'
+      when 'history', 'view history' then 'historyPanel'
+      when 'notes', 'view notes' then 'notesPanel'
+
+      # editor toolbar
+      when 'predefined styles' then 'style'
+      when 'block format' then 'formatblock'
+      when 'backcolor', 'background color' then 'backColor'
+      when 'forecolor', 'foreground color' then 'foreColor'
+      when 'italicize' then 'italic'
+      when 'overline' then 'overline'
+      when 'strike through' then 'strikethrough'
+      when 'underline' then 'underline'
+      when 'subscript' then 'subscript'
+      when 'superscript' then 'superscript'
+      when 'justify left', 'left justify' then 'justifyLeft'
+      when 'justify center', 'center justify' then 'justifyCenter'
+      when 'justify right', 'right justify' then 'justifyRight'
+      when 'justify full', 'full justification' then 'justifyFull'
+      when 'unordered list', 'insert unordered list' then 'insertUnorderedList'
+      when 'ordered list', 'insert ordered list' then 'insertOrderedList'
+      when 'hr', 'insert hr', 'horizontal rule', 'insert horizontal rule' then 'horizontalRule'
+      when 'clean formatting', 'remove formatting' then 'removeFormatting'
+      when 'html editor' then 'htmlEditor'
+
+      # table context buttons
+      when 'add row before', 'insert row before' then 'insertRowBefore'
+      when 'add row after', 'insert row after' then 'insertRowAfter'
+      when 'delete row' then 'deleteRow'
+      when 'add column before', 'insert column before' then 'insertColumnBefore'
+      when 'add column after', 'insert column after' then 'insertColumnAfter'
+      when 'delete column' then 'deleteColumn'
+      when 'increase colspan' then 'increaseColspan'
+      when 'decrease colspan' then 'decreaseColspan'
+      when 'increase rowspan' then 'increaseRowspan'
+      when 'decrease rowspan' then 'decreaseRowspan'
+
+      # snippet toolbar
+      when 'edit snippet settings', 'edit snippet' then 'editSnippet'
+      when 'remove snippet' then 'removeSnippet'
+
+      else locator
+    end
+  end
+
+  def region_selector_for(locator)
+    case locator.downcase
+
+      when 'the first editable region', 'the editable region' then '#editable1'
+      when 'the first markupable region', 'the markupable region', 'the markdown region' then '#markupable1'
+      when 'the first snippetable region', 'the first snippet region', 'the snippetable region', 'the snippet region' then '#snippetable1'
+
+      else locator
+    end
+  end
+
+  def snippet_name_for(locator)
+    case locator.downcase
+
+      when 'the example snippet' then 'example'
+
+      else locator
+    end
+  end
+
+end
+
+World(MercurySelectorsHelpers)

data/features/support/paths.rb

@@ -8,27 +8,29 @@ module NavigationHelpers
   def path_to(page_name)
     case page_name
 
-    when 'an edit page' then '/edit'
+      when 'an editable page', 'the editable page' then '/editor'
+      when 'the test page' then '/mercury/test_page'
 
-    when /the root( page)?/ then '/'
-    when /the home\s?page/ then '/'
-    when /the url: "(.*)"/ then url_for($1)
 
-    # Add more mappings here.
-    # Here is an example that pulls values out of the Regexp:
-    #
-    #   when /^(.*)'s profile page$/i
-    #     user_profile_path(User.find_by_login($1))
+      when /the root( page)?/ then '/'
+      when /the home\s?page/ then '/'
+      when /the url: "(.*)"/ then url_for($1)
 
-    else
-      begin
-        page_name =~ /the (.*) page/
-        path_components = $1.split(/\s+/)
-        self.send(path_components.push('path').join('_').to_sym)
-      rescue Object => e
-        raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
-          "Now, go and add a mapping in #{__FILE__}"
-      end
+      # Add more mappings here.
+      # Here is an example that pulls values out of the Regexp:
+      #
+      #   when /^(.*)'s profile page$/i
+      #     user_profile_path(User.find_by_login($1))
+
+      else
+        begin
+          page_name =~ /the (.*) page/
+          path_components = $1.split(/\s+/)
+          self.send(path_components.push('path').join('_').to_sym)
+        rescue Object => e
+          raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
+            "Now, go and add a mapping in #{__FILE__}"
+        end
     end
   end
 end

data/features/support/selectors.rb

@@ -6,10 +6,12 @@ module HtmlSelectorsHelpers
   # step definitions in web_steps.rb
   #
   def selector_for(locator)
-    case locator
 
-      when 'the toolbar'
-        '.mercury-toolbar-container'
+    # add in for mercury support
+    result = mercury_selector_for(locator)
+    return result if result.present?
+
+    case locator
 
       when /the page/
         "html > body"

data/lib/generators/mercury/install/install_generator.rb

@@ -5,10 +5,24 @@ module Mercury
 
       desc "Installs Mercury into your application by copying the configuration file."
 
+      class_option :full, :type => :boolean, :aliases => "-f",
+                   :desc => 'Full installation will install the layout and css overrides for easier customization.'
+
       def copy_config
         copy_file 'vendor/assets/javascripts/mercury.js', 'app/assets/javascripts/mercury.js'
       end
 
+     def copy_layout_and_css_overrides
+        if options[:full] || yes?("Install the layout and CSS overrides files? [yN]")
+          copy_file 'app/views/layouts/mercury.html.erb', 'app/views/layouts/mercury.html.erb'
+          copy_file 'vendor/assets/stylesheets/mercury_overrides.css', 'app/assets/stylesheets/mercury_overrides.css'
+        end
+      end
+
+      def display_readme
+        readme 'POST_INSTALL'
+      end
+
     end
   end
 end

data/mercury-rails.gemspec

@@ -4,20 +4,21 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{mercury-rails}
-  s.version = "0.2.0"
+  s.name = "mercury-rails"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Jackson"]
-  s.date = %q{2011-09-25}
-  s.description = %q{A fully featured and advanced HTML5 WYSIWYG editor written in CoffeeScript on top of Rails 3.1}
-  s.email = %q{jejacks0n@gmail.com}
+  s.date = "2011-10-24"
+  s.description = "A fully featured and advanced HTML5 WYSIWYG editor written in CoffeeScript on top of Rails 3.1"
+  s.email = "jejacks0n@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"
   ]
   s.files = [
     "LICENSE",
+    "POST_INSTALL",
     "README.md",
     "VERSION",
     "annotated_source.template",
@@ -26,12 +27,10 @@ Gem::Specification.new do |s|
     "app/models/image.rb",
     "app/views/layouts/mercury.html.erb",
     "app/views/mercury/lightviews/about.html",
-    "app/views/mercury/lightviews/imageprocessor.html",
     "app/views/mercury/modals/character.html",
     "app/views/mercury/modals/htmleditor.html",
     "app/views/mercury/modals/link.html",
     "app/views/mercury/modals/media.html",
-    "app/views/mercury/modals/sanitizer.html",
     "app/views/mercury/modals/table.html",
     "app/views/mercury/palettes/backcolor.html",
     "app/views/mercury/palettes/forecolor.html",
@@ -40,15 +39,41 @@ Gem::Specification.new do |s|
     "app/views/mercury/panels/snippets.html",
     "app/views/mercury/selects/formatblock.html",
     "app/views/mercury/selects/style.html",
-    "app/views/mercury/snippets/example.html.erb",
-    "app/views/mercury/snippets/example_options.html.erb",
+    "app/views/mercury/snippets/example/options.html.erb",
+    "app/views/mercury/snippets/example/preview.html.erb",
     "config/engine.rb",
     "config/routes.rb",
     "db/migrate/20110526035601_create_images.rb",
-    "features/editing/basic.feature",
+    "features/loading/loading.feature",
+    "features/loading/navigating.feature",
+    "features/loading/user_interface.feature",
+    "features/regions/editable/advanced_editing.feature",
+    "features/regions/editable/basic_editing.feature",
+    "features/regions/editable/inserting_links.feature",
+    "features/regions/editable/inserting_media.feature",
+    "features/regions/editable/inserting_snippets.feature",
+    "features/regions/editable/inserting_special_characters.feature",
+    "features/regions/editable/inserting_tables.feature",
+    "features/regions/editable/pasting.feature",
+    "features/regions/editable/uploading_images.feature",
+    "features/regions/markupable/advanced_editing.feature",
+    "features/regions/markupable/basic_editing.feature",
+    "features/regions/markupable/inserting_links.feature",
+    "features/regions/markupable/inserting_media.feature",
+    "features/regions/markupable/inserting_snippets.feature",
+    "features/regions/markupable/inserting_special_characters.feature",
+    "features/regions/markupable/inserting_tables.feature",
+    "features/regions/markupable/uploading_images.feature",
+    "features/regions/snippetable/advanced_editing.feature",
+    "features/regions/snippetable/basic_editing.feature",
+    "features/regions/snippetable/inserting_snippets.feature",
+    "features/saving/saving.feature",
     "features/step_definitions/debug_steps.rb",
+    "features/step_definitions/mercury_steps.rb",
     "features/step_definitions/web_steps.rb",
     "features/support/env.rb",
+    "features/support/mercury_contents.rb",
+    "features/support/mercury_selectors.rb",
     "features/support/paths.rb",
     "features/support/selectors.rb",
     "lib/generators/mercury/install/install_generator.rb",
@@ -123,7 +148,7 @@ Gem::Specification.new do |s|
     "spec/javascripts/templates/mercury/tooltip.html",
     "spec/javascripts/templates/mercury/uploader.html",
     "vendor/assets/images/mercury/button.png",
-    "vendor/assets/images/mercury/clippy.png",
+    "vendor/assets/images/mercury/close.png",
     "vendor/assets/images/mercury/default-snippet.png",
     "vendor/assets/images/mercury/loading-dark.gif",
     "vendor/assets/images/mercury/loading-light.gif",
@@ -146,6 +171,12 @@ Gem::Specification.new do |s|
     "vendor/assets/images/mercury/toolbar/primary/undo.png",
     "vendor/assets/images/mercury/toolbar/snippetable/buttons.png",
     "vendor/assets/javascripts/mercury.js",
+    "vendor/assets/javascripts/mercury/dependencies/jquery-1.6.js",
+    "vendor/assets/javascripts/mercury/dependencies/jquery-ui-1.8.13.custom.js",
+    "vendor/assets/javascripts/mercury/dependencies/jquery.additions.js",
+    "vendor/assets/javascripts/mercury/dependencies/jquery.htmlClean.js",
+    "vendor/assets/javascripts/mercury/dependencies/liquidmetal.js",
+    "vendor/assets/javascripts/mercury/dependencies/showdown.js",
     "vendor/assets/javascripts/mercury/dialog.js.coffee",
     "vendor/assets/javascripts/mercury/dialogs/backcolor.js.coffee",
     "vendor/assets/javascripts/mercury/dialogs/forecolor.js.coffee",
@@ -167,6 +198,8 @@ Gem::Specification.new do |s|
     "vendor/assets/javascripts/mercury/page_editor.js.coffee",
     "vendor/assets/javascripts/mercury/palette.js.coffee",
     "vendor/assets/javascripts/mercury/panel.js.coffee",
+    "vendor/assets/javascripts/mercury/plugins/save_as_xml/mercury/page_editor.js.coffee",
+    "vendor/assets/javascripts/mercury/plugins/save_as_xml/plugin.js",
     "vendor/assets/javascripts/mercury/region.js.coffee",
     "vendor/assets/javascripts/mercury/regions/editable.js.coffee",
     "vendor/assets/javascripts/mercury/regions/markupable.js.coffee",
@@ -175,6 +208,7 @@ Gem::Specification.new do |s|
     "vendor/assets/javascripts/mercury/snippet.js.coffee",
     "vendor/assets/javascripts/mercury/snippet_toolbar.js.coffee",
     "vendor/assets/javascripts/mercury/statusbar.js.coffee",
+    "vendor/assets/javascripts/mercury/support/history.js",
     "vendor/assets/javascripts/mercury/table_editor.js.coffee",
     "vendor/assets/javascripts/mercury/toolbar.button.js.coffee",
     "vendor/assets/javascripts/mercury/toolbar.button_group.js.coffee",
@@ -182,11 +216,6 @@ Gem::Specification.new do |s|
     "vendor/assets/javascripts/mercury/toolbar.js.coffee",
     "vendor/assets/javascripts/mercury/tooltip.js.coffee",
     "vendor/assets/javascripts/mercury/uploader.js.coffee",
-    "vendor/assets/javascripts/mercury_dependencies/jquery-1.6.js",
-    "vendor/assets/javascripts/mercury_dependencies/jquery-ui-1.8.13.custom.js",
-    "vendor/assets/javascripts/mercury_dependencies/jquery.additions.js",
-    "vendor/assets/javascripts/mercury_dependencies/liquidmetal.js",
-    "vendor/assets/javascripts/mercury_dependencies/showdown.js",
     "vendor/assets/javascripts/mercury_loader.js",
     "vendor/assets/stylesheets/mercury.css",
     "vendor/assets/stylesheets/mercury/dialog.css",
@@ -196,13 +225,14 @@ Gem::Specification.new do |s|
     "vendor/assets/stylesheets/mercury/statusbar.css",
     "vendor/assets/stylesheets/mercury/toolbar.css",
     "vendor/assets/stylesheets/mercury/tooltip.css",
-    "vendor/assets/stylesheets/mercury/uploader.css"
+    "vendor/assets/stylesheets/mercury/uploader.css",
+    "vendor/assets/stylesheets/mercury_overrides.css"
   ]
-  s.homepage = %q{http://github.com/jejacks0n/mercury}
+  s.homepage = "http://github.com/jejacks0n/mercury"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{A fully featured and advanced HTML5 WYSIWYG editor written in CoffeeScript on top of Rails 3.1}
+  s.rubygems_version = "1.8.10"
+  s.summary = "A fully featured and advanced HTML5 WYSIWYG editor written in CoffeeScript on top of Rails 3.1"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

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

@@ -11,8 +11,8 @@ describe "Mercury.lightview", ->
   afterEach ->
     Mercury.lightview.initialized = false
     Mercury.lightview.visible = false
-    $(document).unbind('mercury:refresh')
-    $(document).unbind('mercury:resize')
+    $(window).unbind('mercury:refresh')
+    $(window).unbind('mercury:resize')
     $(document).unbind('keydown')
 
   describe "singleton method", ->
@@ -119,47 +119,75 @@ describe "Mercury.lightview", ->
       Mercury.lightview.build()
       expect($('#test .mercury-lightview-title span').html()).toEqual('title')
 
+    it "creates a close button if asked to in the options", ->
+      Mercury.lightview.options.closeButton = true
+      Mercury.lightview.build()
+      expect($('#test .mercury-lightview-close').length).toEqual(1)
+
 
   describe "observed events", ->
 
     beforeEach ->
       spyOn(Mercury.lightview, 'appear').andCallFake(=>)
-      Mercury.lightview('/foo', {appendTo: $('#test')})
 
-    describe "custom event: refresh", ->
+    describe "without a close button", ->
 
-      it "calls resize telling it stay visible", ->
-        spy = spyOn(Mercury.lightview, 'resize').andCallFake(=>)
-        Mercury.trigger('refresh')
-        expect(spy.callCount).toEqual(1)
-        expect(spy.argsForCall[0]).toEqual([true])
+      beforeEach ->
+        Mercury.lightview('/foo', {appendTo: $('#test')})
 
-    describe "custom event: resize", ->
+      describe "custom event: refresh", ->
 
-      beforeEach ->
-        Mercury.lightview.visible = true
+        it "calls resize telling it stay visible", ->
+          spy = spyOn(Mercury.lightview, 'resize').andCallFake(=>)
+          Mercury.trigger('refresh')
+          expect(spy.callCount).toEqual(1)
+          expect(spy.argsForCall[0]).toEqual([true])
 
-      it "calls position", ->
-        spy = spyOn(Mercury.lightview, 'position').andCallFake(=>)
-        Mercury.trigger('resize')
-        expect(spy.callCount).toEqual(1)
+      describe "custom event: resize", ->
 
-    describe "clicking on the overlay", ->
+        beforeEach ->
+          Mercury.lightview.visible = true
 
-      it "calls hide", ->
-        spy = spyOn(Mercury.lightview, 'hide').andCallFake(=>)
-        jasmine.simulate.click($('.mercury-lightview-overlay').get(0))
-        expect(spy.callCount).toEqual(1)
+        it "calls position", ->
+          spy = spyOn(Mercury.lightview, 'position').andCallFake(=>)
+          Mercury.trigger('resize')
+          expect(spy.callCount).toEqual(1)
+
+      describe "clicking on the overlay", ->
+
+        it "calls hide", ->
+          spy = spyOn(Mercury.lightview, 'hide').andCallFake(=>)
+          jasmine.simulate.click($('.mercury-lightview-overlay').get(0))
+          expect(spy.callCount).toEqual(1)
 
-    describe "pressing esc on document", ->
+      describe "pressing esc on document", ->
+
+        beforeEach ->
+          Mercury.lightview.visible = true
+
+        it "calls hide", ->
+          spy = spyOn(Mercury.lightview, 'hide').andCallFake(=>)
+          jasmine.simulate.keydown(document, {keyCode: 27})
+          expect(spy.callCount).toEqual(1)
+
+    describe "with a close button", ->
 
       beforeEach ->
-        Mercury.lightview.visible = true
+        Mercury.lightview('/foo', {appendTo: $('#test'), closeButton: true})
 
-      it "calls hide", ->
-        spy = spyOn(Mercury.lightview, 'hide').andCallFake(=>)
-        jasmine.simulate.keydown(document, {keyCode: 27})
-        expect(spy.callCount).toEqual(1)
+      describe "clicking on the close button", ->
+
+        it "calls hide", ->
+          spy = spyOn(Mercury.lightview, 'hide').andCallFake(=>)
+          jasmine.simulate.click($('.mercury-lightview-close').get(0))
+          expect(spy.callCount).toEqual(1)
+
+      describe "clicking on the overlay", ->
+
+        it "doesn't call hide", ->
+          spy = spyOn(Mercury.lightview, 'hide').andCallFake(=>)
+          jasmine.simulate.click($('.mercury-lightview-overlay').get(0))
+          expect(spy.callCount).toEqual(0)
 
 
   describe "#appear", ->