kiteditor 1.0.12 → 1.0.13

data/features/regions/editable/inserting_tables.feature

@@ -0,0 +1,109 @@
+@javascript
+Feature:
+  As a content editor type person
+  In order to manage content
+  I should be able to insert and edit complex tables
+
+  Background:
+    Given I am on an editable page
+    And the editor won't prompt when leaving the page
+
+  Scenario: A user can expect all this!
+
+
+#  Scenario: A user can insert a table
+    Given the content of the editable region is simple content
+    And I make a selection
+
+    When I click on the "Insert Table" button
+    Then the modal window should be visible
+    And I should see "Insert Table" within the modal title
+
+    When I click on the third cell in the first row
+    And I add a column before it
+    Then the table column count should be 4
+    And the selected cell should be the forth cell in the first row
+
+    When I add a column after
+    Then the table column count should be 5
+    And the selected cell should be the forth cell in the first row
+
+    When I add a row after
+    Then the table row count should be 3
+    And the selected cell should be the forth cell in the first row
+
+    When I add a row before
+    Then the table row count should be 4
+    And the selected cell should be the forth cell in the second row
+
+    When I delete the column
+    Then the table column count should be 4
+    And a selected cell should not be visible
+
+    When I click on the second cell in the second row
+    And delete the row
+    Then the table row count should be 3
+    And a selected cell should not be visible
+
+    When I click on the second cell in the second row
+    And increase the colspan
+    And click on the first cell in the first row
+    And increase the rowspan
+    And select "Right" from "Alignment"
+    And fill in "Border" with "2"
+    And fill in "Spacing" with "2"
+    And press "Insert Table"
+    Then the contents of the editable region should be "this is&nbsp;<table align='right' border='2' cellspacing='2'><tbody><tr><td rowspan='2'><br></td><td><br></td><td><br></td><td><br></td></tr><tr><td colspan='2'><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr></tbody></table> <b>content</b>"
+    And the modal window should not be visible
+
+
+#  Scenario: A user can edit a table after inserting one (in an editable region)
+    Given the content of the editable region has a table
+    And I make a selection
+
+    When I click on the add row before editor button
+    Then the table row count should be 3
+    And the contents of the editable region should be "this is a <table><tbody><tr><td><br></td><td><br></td></tr><tr><td><span>1</span></td><td><span>2</span></td></tr><tr><td><span>3</span></td><td><span>4</span></td></tr></tbody></table> <b>content</b>"
+
+    When I click on the add row after editor button
+    Then the table row count should be 4
+    And the contents of the editable region should be "this is a <table><tbody><tr><td><br></td><td><br></td></tr><tr><td><span>1</span></td><td><span>2</span></td></tr><tr><td><br></td><td><br></td></tr><tr><td><span>3</span></td><td><span>4</span></td></tr></tbody></table> <b>content</b>"
+
+    When I click on the add column before editor button
+    Then the column count should be 3
+    And the contents of the editable region should be "this is a <table><tbody><tr><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><span>1</span></td><td><span>2</span></td></tr><tr><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><span>3</span></td><td><span>4</span></td></tr></tbody></table> <b>content</b>"
+
+    When I click on the add column after editor button
+    Then the column count should be 4
+    And the contents of the editable region should be "this is a <table><tbody><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><span>1</span></td><td><br></td><td><span>2</span></td></tr><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><span>3</span></td><td><br></td><td><span>4</span></td></tr></tbody></table> <b>content</b>"
+
+    When I click on the delete row editor button
+    Then the table row count should be 3
+    And the contents of the editable region should be "this is a <table><tbody><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><span>3</span></td><td><br></td><td><span>4</span></td></tr></tbody></table> <b>content</b>"
+
+    When I make a selection
+    And click on the delete column editor button
+    Then the table column count should be 3
+    And the contents of the editable region should be "this is a <table><tbody><tr><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><span>4</span></td></tr></tbody></table> <b>content</b>"
+
+
+#  Scenario: A user can adjust the colspans of a table (in an editable region)
+    Given the content of the editable region has a table
+    And I make a selection
+
+    When I click on the increase colspan editor button
+    Then the contents of the editable region should be "this is a <table><tbody><tr><td colspan='2'><span>1</span></td></tr><tr><td><span>3</span></td><td><span>4</span></td></tr></tbody></table> <b>content</b>"
+
+    When I click on the decrease colspan editor button
+    Then the contents of the editable region should be "this is a <table><tbody><tr><td><span>1</span></td><td><br></td></tr><tr><td><span>3</span></td><td><span>4</span></td></tr></tbody></table> <b>content</b>"
+
+
+#  Scenario: A user can adjust the rowspans of a table (in an editable region)
+    Given the content of the editable region has a table
+    And I make a selection
+
+    When I click on the increase rowspan editor button
+    Then the contents of the editable region should be "this is a <table><tbody><tr><td rowspan='2'><span>1</span></td><td><span>2</span></td></tr><tr><td><span>4</span></td></tr></tbody></table> <b>content</b>"
+
+    When I click on the decrease rowspan editor button
+    Then the contents of the editable region should be "this is a <table><tbody><tr><td><span>1</span></td><td><span>2</span></td></tr><tr><td><br></td><td><span>4</span></td></tr></tbody></table> <b>content</b>"

data/features/saving/saving.feature

@@ -9,19 +9,19 @@ Feature:
     And save results will be cached
 
 
-  Scenario: A user can change content in a full region and save those changes
-    When I set the content of the full region to "new content"
+  Scenario: A user can change content in an editable region and save those changes
+    When I set the content of the editable region to "new content"
     And I click on the "Save" button
-    Then the save should have "new content" for the full region
+    Then the save should have "new content" for the editable region
 
 
-  Scenario: A user can change content in a markdown region and save those changes
-    When I set the content of the markdown region to "new content"
+  Scenario: A user can change content in a markupable region and save those changes
+    When I set the content of the markupable region to "new content"
     And I click on the "Save" button
-    Then the save should have "new content" for the markdown region
+    Then the save should have "new content" for the markupable region
 
 
-  Scenario: A user can put snippets into a full region and get the options on save
+  Scenario: A user can put snippets into an editable region and get the options on save
     # todo: finish
 
 
@@ -29,5 +29,5 @@ Feature:
     # todo: finish
 
 
-  Scenario: A user can put snippets into a markdown region and get the options on save
+  Scenario: A user can put snippets into a markupable region and get the options on save
     # todo: finish

data/features/step_definitions/mercury_steps.rb

@@ -1 +1,438 @@
-require 'mercury/cucumber/step_definitions'
+## Generic web steps
+#------------------------------------------------------------------------------
+When /^(?:|I )click on (.+)$/ do |locator|
+  selector = selector_for(locator)
+  find(selector, :message => "Unable to locate the element '#{selector}' to click on").click
+end
+
+Then /^(.+) should (not )?be visible$/ do |locator, boolean|
+  selector = selector_for(locator)
+  if boolean == 'not '
+    page.has_no_css?("#{selector}")
+  else
+    page.has_css?("#{selector}", :visible => true)
+  end
+end
+
+# scoping step for different windows
+When /^(.*) in the "([^"]*)" window$/ do |s, window|
+  page.driver.within_window(window) do
+    step(s)
+  end
+end
+
+
+## Mercury general steps
+#------------------------------------------------------------------------------
+Given /^(?:|I )adjust the configuration to have: \{([^\}]*)\}$/ do |javascript|
+  Rails.application.config.mercury_config = JSON.parse("{#{javascript}}")
+end
+
+# scoping step for the mercury content frame
+When /^(.*) in the content frame$/ do |s|
+  page.driver.within_frame('mercury_iframe') do
+    step(s)
+  end
+end
+
+# silence mercury's onbeforeunload confirmation
+Given /^the editor won't prompt when leaving the page$/ do
+  page.driver.execute_script('Mercury.silent = true;')
+end
+
+
+## Toolbar specific steps
+#------------------------------------------------------------------------------
+# for the select dropdowns
+When /^(?:|I )select (.*?) from the dropdown$/ do |locator|
+  selector = selector_for(locator)
+  find(selector, :message => "Unable to locate the element '#{selector}' to click on").click
+end
+
+
+## Panel specific steps
+#------------------------------------------------------------------------------
+When /^(?:I )(?:open|close|toggle) the (.*?) panel$/ do |panel_locator|
+  step(%Q{I click on the "#{panel_locator}" button})
+end
+
+
+## Modal specific steps
+#------------------------------------------------------------------------------
+When /^(?:I )close the modal(?: window)?$/ do
+  step(%Q{I click on the modal close button})
+end
+
+
+## Region specific steps
+#------------------------------------------------------------------------------
+# setting content
+Given /^the content of (.*?) (?:is|are|has|includes) (.*?)$/ do |region_locator, contents|
+  step(%Q{I set the contents of #{region_locator} to #{contents}})
+end
+
+When /^(?:|I )(?:change|set) the contents? of (.*?) to (.*?)$/ do |region_locator, contents|
+  region_id = region_selector_for(region_locator).gsub('#', '')
+  content = contents[0] == '"' ? contents : "\"#{contents_for(contents)}\""
+  page.driver.within_frame('mercury_iframe') do
+    find("##{region_id}", :message => "Unable to locate a region matching '##{region_id}'")
+    page.driver.execute_script <<-JAVASCRIPT
+      var element = top.jQuery(document).find('##{region_id}');
+      if (element.data('type') == 'markupable') {
+        element.find('textarea').val(#{content});
+      } else {
+        var region = top.mercuryInstance.getRegionByName('#{region_id}');
+        region.content(#{content});
+      }
+    JAVASCRIPT
+  end
+end
+
+# setting/making selections
+When /^(?:|I )(?:make|have) a selection$/ do
+  step(%Q{I have a selection for "span"})
+end
+
+When /^(?:|I )(?:make|have) a selection (?:in (.*?) )?for "([^"]*)"$/ do |region_locator, selector|
+  step(%Q{I can simulate complex javascript events})
+  # assume the first editable region if one wasn't provided'
+  region_selector = region_selector_for(region_locator || 'the editable region')
+  page.driver.within_frame('mercury_iframe') do
+    find("#{region_selector}", :message => "Unable to locate a region matching '#{region_selector}'")
+    find("#{region_selector} #{selector}", :message => "Unable to locate a match for '#{selector}' inside '#{region_locator}'")
+    page.driver.execute_script <<-JAVASCRIPT
+      var element = top.jQuery(document).find('#{region_selector}');
+      if (element.data('type') == 'markupable') {
+        alert('unimplemented');
+        throw('unimplemented');
+      } else {
+        var selectedElement = element.find('#{selector}');
+        var selection = new top.Mercury.Regions.Editable.Selection(window.getSelection(), document);
+        selection.selectNode(selectedElement.get(0));
+        selectedElement.simulate('mouseup');
+      }
+    JAVASCRIPT
+  end
+end
+
+# other events
+When /^(?:|I )double click on (.*?) in (.*?)$/ do |locator, region_locator|
+  step(%Q{I can simulate complex javascript events})
+  selector = selector_for(locator)
+  # assume the first editable region if one wasn't provided'
+  region_selector = region_selector_for(region_locator || 'the editable region')
+  page.driver.within_frame('mercury_iframe') do
+    find("#{region_selector}", :message => "Unable to locate a region matching '#{region_selector}'")
+    find("#{region_selector} #{selector}", :message => "Unable to locate a match for '#{selector}' inside '#{region_locator}'")
+    page.driver.execute_script <<-JAVASCRIPT
+      top.jQuery(document).find('#{region_selector} #{selector}').simulate('dblclick');
+    JAVASCRIPT
+  end
+end
+
+# getting contents
+Then /^the contents? of (.*?) should be "([^"]*)"$/ do |region_locator, content|
+  region_selector = region_selector_for(region_locator)
+  page.driver.within_frame('mercury_iframe') do
+    find("#{region_selector}", :message => "Unable to locate a region matching '#{region_selector}'")
+    results = page.driver.execute_script <<-JAVASCRIPT
+      var element = top.jQuery(document).find('#{region_selector}');
+      if (element.data('type') == 'markupable') {
+        return element.find('textarea').val();
+      } else {
+        return element.html();
+      }
+    JAVASCRIPT
+    assert_equal content, results.gsub('"', "'").gsub("\n", '')
+  end
+end
+
+
+## Saving specific steps
+#------------------------------------------------------------------------------
+# caching for the last save -- a request will still be made
+Given /^save results will be cached$/ do
+  page.driver.execute_script <<-JAVASCRIPT
+    Mercury.PageEditor.prototype.save = function() {
+      window.cachedResults = this.serialize();
+    }
+  JAVASCRIPT
+end
+
+# check for the last save cached results
+Then /^the save should have (.*?) for (.*?)$/ do |contents, region_locator|
+  region_id = region_selector_for(region_locator).gsub('#', '')
+  content = contents[0] == '"' ? contents : "\"#{contents_for(contents)}\""
+  results = page.driver.execute_script <<-JAVASCRIPT
+    return (window.cachedResults['#{region_id}']) ?
+      window.cachedResults['#{region_id}']['value'] : null;
+  JAVASCRIPT
+  assert_equal content, "\"#{results}\""
+end
+
+
+## Table editing specific steps
+#------------------------------------------------------------------------------
+# in the modal window
+When /^(?:|I )(?:add|insert) a (row|column) (before|after)(?: it)?$/ do |row_or_column, before_or_after|
+  name = "insert_#{row_or_column}_#{before_or_after}".camelcase(:lower)
+  step(%Q{I click on ".mercury-modal-content input[name=#{name}]"})
+end
+
+When /^(?:|I )delete the(?: current)? (row|column)$/ do |row_or_column|
+  name = "delete_#{row_or_column}".camelcase(:lower)
+  step(%Q{I click on ".mercury-modal-content input[name=#{name}]"})
+end
+
+When /^(?:|I )(increase|decrease) the (rowspan|colspan)$/ do |increase_or_decrease, rowspan_or_colspan|
+  name = "#{increase_or_decrease}_#{rowspan_or_colspan}".camelcase(:lower)
+  step(%Q{I click on ".mercury-modal-content input[name=#{name}]"})
+end
+
+Then /^the selected cell should be (.*?)$/ do |locator|
+  selector = selector_for(locator).gsub('td:', 'td.selected:')
+  find("#{selector}", :message => "Unable to locate the selected cell for '#{selector}'")
+end
+
+# in general
+Then /^the(?: table)? (row|column) count should be (\d+)$/ do |row_or_column, expected_count|
+  method = "get_#{row_or_column}_count".camelcase(:lower)
+  actual_count = page.driver.execute_script("return Mercury.tableEditor.#{method}()")
+  assert_equal expected_count.to_i, actual_count.to_i
+end
+
+
+## Snippet specific steps
+#------------------------------------------------------------------------------
+# setting snippet options
+Given /^the options for the (.*?) snippet "([^"]*)" are (.*?)$/ do |snippet_name, snippet_id, options|
+  @snippet_id = snippet_id
+  options_json = parse_snippet_options_from(options)
+  page.driver.execute_script <<-JAVASCRIPT
+    Mercury.Snippet.load({#{snippet_id}: {name: '#{snippet_name}', options: #{options_json}}});
+  JAVASCRIPT
+end
+
+# dragging/dropping
+When /^(?:|I )(?:drag|drop) (.*?) (?:into|on) (.*?)$/ do |snippet_locator, region_locator|
+  snippet_name = snippet_name_for(snippet_locator)
+  region_id = region_selector_for(region_locator).gsub('#', '')
+  page.driver.within_frame('mercury_iframe') do
+    find("##{region_id}", :message => "Unable to locate a region matching '##{region_id}'")
+    page.driver.execute_script <<-JAVASCRIPT
+      var element = top.jQuery(document).find('##{region_id}');
+      if (element.data('type') == 'markupable') {
+        alert('unimplemented');
+        throw('unimplemented');
+      } else {
+        var region = top.mercuryInstance.getRegionByName('#{region_id}');
+        region.selection().range.collapse(true);
+        document.execCommand('insertHTML', false, '<img data-snippet="#{snippet_name}" src="/assets/mercury/default-snippet.png">');
+        element.trigger('possible:drop');
+      }
+    JAVASCRIPT
+  end
+end
+
+When /^(?:|I )hover over (.*?)(?: in (.*?))?$/ do |locator, region_locator|
+  step(%Q{I can simulate complex javascript events})
+  selector = selector_for(locator)
+  region_selector = region_selector_for(region_locator || 'the editable region')
+  page.driver.within_frame('mercury_iframe') do
+    find("#{region_selector}", :message => "Unable to locate a region matching '#{region_selector}'")
+    page.driver.execute_script <<-JAVASCRIPT
+      var element = top.jQuery(document).find('#{region_selector}');
+      if (element.data('type') == 'markupable') {
+        alert('unimplemented');
+        throw('unimplemented');
+      } else {
+        element.find('#{selector}').simulate('mousemove');
+      }
+    JAVASCRIPT
+  end
+end
+
+When /^(?:|I )edit the snippet$/ do
+  step(%{I hover over the snippet})
+  step(%{click on the edit snippet settings toolbar button})
+end
+
+
+## Dropping image specific steps
+#------------------------------------------------------------------------------
+#When /^(?:|I )drop an image into (.*?) from a different browser/ do |region_locator|
+#  Given(%Q{I can simulate complex javascript events})
+#  region_selector = region_selector_for(region_locator || 'the editable region')
+#  page.driver.within_frame('mercury_iframe') do
+#    find("#{region_selector}", :message => "Unable to locate a region matching '#{region_selector}'")
+#    page.driver.execute_script <<-JAVASCRIPT
+#      var element = top.jQuery(document).find('#{region_selector}');
+#      if (element.data('type') == 'markupable') {
+#        alert('unimplemented');
+#        throw('unimplemented');
+#      } else {
+#        element.find('#{region_selector}').simulate('drop', {'text/html': '<img src="testing.gif"/>'});
+#      }
+#    JAVASCRIPT
+#  end
+#end
+
+
+## Javascript event simulation steps
+#------------------------------------------------------------------------------
+Given /^(?:|I )can simulate complex javascript events$/ do
+  page.driver.execute_script(EVENT_SIMULATION_JAVASCRIPT)
+end
+
+#------------------------------------------------------------------------------
+
+EVENT_SIMULATION_JAVASCRIPT = <<-JAVASCRIPT
+  /*
+   * jquery.simulate - simulate browser mouse and keyboard events
+   *
+   * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+   * Dual licensed under the MIT or GPL Version 2 licenses.
+   * http://jquery.org/license
+   *
+   */
+  ;(function($) {
+
+  $.fn.extend({
+    simulate: function(type, options) {
+      return this.each(function() {
+        var opt = $.extend({}, $.simulate.defaults, options || {});
+        new $.simulate(this, type, opt);
+      });
+    }
+  });
+
+  $.simulate = function(el, type, options) {
+    this.target = el;
+    this.options = options;
+
+    if (/^drag$/.test(type)) {
+      this[type].apply(this, [this.target, options]);
+    } else {
+      this.simulateEvent(el, type, options);
+    }
+  }
+
+  $.extend($.simulate.prototype, {
+    simulateEvent: function(el, type, options) {
+      var evt = this.createEvent(type, options);
+      this.dispatchEvent(el, type, evt, options);
+      return evt;
+    },
+    createEvent: function(type, options) {
+      if (/^mouse(over|out|down|up|move)|(dbl)?click$/.test(type)) {
+        return this.mouseEvent(type, options);
+      } else if (/^key(up|down|press)$/.test(type)) {
+        return this.keyboardEvent(type, options);
+      }
+    },
+    mouseEvent: function(type, options) {
+      var evt;
+      var e = $.extend({
+        bubbles: true, cancelable: (type != "mousemove"), view: window, detail: 0,
+        screenX: 0, screenY: 0, clientX: 0, clientY: 0,
+        ctrlKey: false, altKey: false, shiftKey: false, metaKey: false,
+        button: 0, relatedTarget: undefined
+      }, options);
+
+      var relatedTarget = $(e.relatedTarget)[0];
+
+      if ($.isFunction(document.createEvent)) {
+        evt = document.createEvent("MouseEvents");
+        evt.initMouseEvent(type, e.bubbles, e.cancelable, e.view, e.detail,
+          e.screenX, e.screenY, e.clientX, e.clientY,
+          e.ctrlKey, e.altKey, e.shiftKey, e.metaKey,
+          e.button, e.relatedTarget || document.body.parentNode);
+      } else if (document.createEventObject) {
+        evt = document.createEventObject();
+        $.extend(evt, e);
+        evt.button = { 0:1, 1:4, 2:2 }[evt.button] || evt.button;
+      }
+      return evt;
+    },
+    keyboardEvent: function(type, options) {
+      var evt;
+
+      var e = $.extend({ bubbles: true, cancelable: true, view: window,
+        ctrlKey: false, altKey: false, shiftKey: false, metaKey: false,
+        keyCode: 0, charCode: 0
+      }, options);
+
+      if ($.isFunction(document.createEvent)) {
+        try {
+          evt = document.createEvent("KeyEvents");
+          evt.initKeyEvent(type, e.bubbles, e.cancelable, e.view,
+            e.ctrlKey, e.altKey, e.shiftKey, e.metaKey,
+            e.keyCode, e.charCode);
+        } catch(err) {
+          evt = document.createEvent("Events");
+          evt.initEvent(type, e.bubbles, e.cancelable);
+          $.extend(evt, { view: e.view,
+            ctrlKey: e.ctrlKey, altKey: e.altKey, shiftKey: e.shiftKey, metaKey: e.metaKey,
+            keyCode: e.keyCode, charCode: e.charCode
+          });
+        }
+      } else if (document.createEventObject) {
+        evt = document.createEventObject();
+        $.extend(evt, e);
+      }
+      if ($.browser.msie || $.browser.opera) {
+        evt.keyCode = (e.charCode > 0) ? e.charCode : e.keyCode;
+        evt.charCode = undefined;
+      }
+      return evt;
+    },
+    dispatchEvent: function(el, type, evt) {
+      if (el.dispatchEvent) {
+        el.dispatchEvent(evt);
+      } else if (el.fireEvent) {
+        el.fireEvent('on' + type, evt);
+      }
+      return evt;
+    },
+    drag: function(el) {
+      var self = this, center = this.findCenter(this.target),
+        options = this.options,	x = Math.floor(center.x), y = Math.floor(center.y),
+        dx = options.dx || 0, dy = options.dy || 0, target = this.target;
+      var coord = { clientX: x, clientY: y };
+      this.simulateEvent(target, "mousedown", coord);
+      coord = { clientX: x + 1, clientY: y + 1 };
+      this.simulateEvent(document, "mousemove", coord);
+      coord = { clientX: x + dx, clientY: y + dy };
+      this.simulateEvent(document, "mousemove", coord);
+      this.simulateEvent(document, "mousemove", coord);
+      this.simulateEvent(target, "mouseup", coord);
+      this.simulateEvent(target, "click", coord);
+    },
+    findCenter: function(el) {
+      var el = $(this.target), o = el.offset(), d = $(document);
+      return {
+        x: o.left + el.outerWidth() / 2 - d.scrollLeft(),
+        y: o.top + el.outerHeight() / 2 - d.scrollTop()
+      };
+    }
+  });
+
+  $.extend($.simulate, {
+    defaults: {
+      speed: 'sync'
+    },
+    VK_TAB: 9,
+    VK_ENTER: 13,
+    VK_ESC: 27,
+    VK_PGUP: 33,
+    VK_PGDN: 34,
+    VK_END: 35,
+    VK_HOME: 36,
+    VK_LEFT: 37,
+    VK_UP: 38,
+    VK_RIGHT: 39,
+    VK_DOWN: 40
+  });
+
+  })(jQuery);
+JAVASCRIPT

data/features/support/env.rb

@@ -4,16 +4,14 @@
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 
-ENV["RAILS_ROOT"] = File.expand_path('../../../spec/dummy', __FILE__)
 require 'cucumber/rails'
 require 'capybara/firebug'
-require 'aruba/cucumber'
 
 # 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 3 use 1.6.2
-# Selenium::WebDriver::Firefox::Profile.firebug_version = ENV['FIREBUG_VERSION'] || '1.8.3'
+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
@@ -46,11 +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
-
-Before('@use_hidden_elements') do
-  Capybara.ignore_hidden_elements = false
-end
-
-After('@use_hidden_elements') do
-  Capybara.ignore_hidden_elements = true
-end

data/{lib/mercury/cucumber → features}/support/mercury_contents.rb

@@ -2,7 +2,7 @@ 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 '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>"
@@ -15,11 +15,11 @@ module MercuryContentsHelpers
   def parse_snippet_options_from(options_string)
     json = []
     options_string.scan(/(?:,\s)?([^:]*): ("[^"]*")/).each do |pair|
-      json << %Q{'#{pair[0]}': #{pair[1]}}
+      json << %Q{'options[#{pair[0]}]': #{pair[1]}}
     end
 
     "{#{json.join(', ')}}"
   end
 end
 
-World(MercuryContentsHelpers)
+World(MercuryContentsHelpers)