RubyGems - mercury-rails - Versions diffs - 0.2.3 → 0.3.1 - Mend

mercury-rails 0.2.3 → 0.3.1

Files changed (134) hide show

data/app/controllers/{images_controller.rb → mercury/images_controller.rb} RENAMED

@@ -1,17 +1,17 @@
-class ImagesController < MercuryController
+class Mercury::ImagesController < MercuryController
   respond_to :json
   # POST /images.json
   def create
-    @image = Image.new(params[:image])
+    @image = Mercury::Image.new(params[:image])
     @image.save
     respond_with @image
   end
   # DELETE /images/1.json
   def destroy
-    @image = Image.find(params[:id])
+    @image = Mercury::Image.find(params[:id])
     @image.destroy
     respond_with @image
   end

data/app/controllers/mercury_controller.rb CHANGED

@@ -1,24 +1,34 @@
 class MercuryController < ActionController::Base
+  include ::Mercury::Authentication
   protect_from_forgery
+  before_filter :authenticate, :only => :edit
+  layout false
   def edit
     render :text => '', :layout => 'mercury'
   end
   def resource
-    render :action => "/#{params[:type]}/#{params[:resource]}", :layout => false
+    render :action => "/#{params[:type]}/#{params[:resource]}"
   end
   def snippet_options
-    render :action => "/snippets/#{params[:name]}/options", :layout => false
+    @options = params[:options] || {}
+    render :action => "/snippets/#{params[:name]}/options"
   end
   def snippet_preview
-    render :action => "/snippets/#{params[:name]}/preview", :layout => false
+    render :action => "/snippets/#{params[:name]}/preview"
   end
   def test_page
     render :text => params
   end
+  private
+  def authenticate
+    redirect_to "/#{params[:requested_uri]}" unless can_edit?
+  end
 end

data/app/models/{image.rb → mercury/image.rb} RENAMED

@@ -1,4 +1,6 @@
-class Image < ActiveRecord::Base
+class Mercury::Image < ActiveRecord::Base
+  self.table_name = :mercury_images
   has_attached_file :image, :styles => { :medium => "300x300>", :thumb => "100x100>" }

data/app/views/layouts/mercury.html.erb CHANGED

@@ -5,20 +5,28 @@
     <%= csrf_meta_tags %>
     <title>Mercury Editor</title>
     <%= stylesheet_link_tag    'mercury', 'mercury_overrides' %>
-    <%= javascript_include_tag 'mercury' %>
+    <%= javascript_include_tag 'mercury', 'mercury_overrides' %>
   </head>
   <body>
-    <% if Rails.application.config.respond_to?(:mercury_config) %>
-      <%= javascript_tag("jQuery.extend(Mercury.config, #{Rails.application.config.mercury_config});") %>
-    <% end -%>
     <script type="text/javascript">
-      var saveUrl = null;
+      var saveUrl = null; // Set to the url that you want to save any given page to.
       var options = {
         saveStyle: null,  // 'form', or 'json' (default json)
         saveMethod: null, // 'POST', or 'PUT', (create, vs. update -- default POST)
         visible: null     // if the interface should start visible or not (default true)
       };
+      <!-- Mix in any configurations provided through Rails.application.config.mercury_config -->
+      <% if Rails.application.config.respond_to?(:mercury_config) %>
+        jQuery.extend(Mercury.config, <%= Rails.application.config.mercury_config.to_json.html_safe %>);
+      <% end -%>
+      <!-- Mix in any options for PageEditor provided through Rails.application.config.mercury_page_editor_config -->
+      <% if Rails.application.config.respond_to?(:mercury_page_editor_config) %>
+        jQuery.extend(options, <%= Rails.application.config.mercury_page_editor_config.to_json.html_safe %>);
+      <% end -%>
+      <!-- Instantiate the PageEditor -->
       new Mercury.PageEditor(saveUrl, options);
     </script>
   </body>

data/app/views/mercury/lightviews/about.html CHANGED

@@ -1,7 +1,11 @@
-<div class="mercury-about-lightview">
-  <p>Mercury Editor is an open source project written by <a href="http://twitter.com/jejacks0n" target="_blank">Jeremy Jackson</a> and released under the MIT license.  Check the license for more information.</p>
+<div id="mercury_about">
+  <p>
+    Mercury Editor is an open source HTML5 WYSIWYG editor written in Coffeescript using jQuery.  The project has been released under the MIT license.
+    <br/><br/>
+    Documentation and other useful information can be found on the project pages.
+  </p>
   <ul>
     <li><a href="http://jejacks0n.github.com/mercury" target="_blank">Project Home</a></li>
     <li><a href="http://github.com/jejacks0n/mercury" target="_blank">Project Source</a></li>
   </ul>
-</div>
+</div>

data/app/views/mercury/modals/character.html CHANGED

@@ -1,7 +1,7 @@
 <form id="mercury_character" style="width:456px">
-  <div class="mercury-modal-pane-container">
-    <div class="mercury-modal-pane">
+  <div class="mercury-display-pane-container">
+    <div class="mercury-display-pane">
       <div class="character" data-entity="#34"   title="quotation mark (APL quote)">&#34;</div>
       <div class="character" data-entity="#38"   title="ampersand">&#38;</div>
       <div class="character" data-entity="#60"   title="less-than sign">&#60;</div>

data/app/views/mercury/modals/htmleditor.html CHANGED

@@ -1,8 +1,8 @@
 <form id="mercury_html_editor" style="width:650px">
-  <textarea class="mercury-modal-pane-container" rows="5"></textarea>
+  <textarea class="mercury-display-pane-container" rows="5" style="width:100%"></textarea>
-  <div class="mercury-modal-controls">
+  <div class="mercury-display-controls">
     <fieldset class="buttons">
       <ol>
         <li class="commit button"><input class="submit" name="commit" type="submit" value="Save and Replace"/></li>

data/app/views/mercury/modals/link.html CHANGED

@@ -1,7 +1,7 @@
 <form id="mercury_link" style="width:600px">
-  <div class="mercury-modal-pane-container">
-    <div class="mercury-modal-pane">
+  <div class="mercury-display-pane-container">
+    <div class="mercury-display-pane">
       <fieldset class="inputs" id="link_text_container">
         <ol>
@@ -64,7 +64,7 @@
     </div>
   </div>
-  <div class="mercury-modal-controls">
+  <div class="mercury-display-controls">
     <fieldset class="buttons">
       <ol>
         <li class="commit button"><input class="submit" name="commit" type="submit" value="Insert Link"/></li>

data/app/views/mercury/modals/media.html CHANGED

@@ -1,7 +1,7 @@
 <form id="mercury_media" style="width:600px">
-  <div class="mercury-modal-pane-container">
-    <div class="mercury-modal-pane">
+  <div class="mercury-display-pane-container">
+    <div class="mercury-display-pane">
       <fieldset class="inputs">
         <legend><span>Images</span></legend>
@@ -71,7 +71,7 @@
     </div>
   </div>
-  <div class="mercury-modal-controls">
+  <div class="mercury-display-controls">
     <fieldset class="buttons">
       <ol>
         <li class="commit button"><input class="submit" name="commit" type="submit" value="Insert Media"/></li>

data/app/views/mercury/modals/table.html CHANGED

@@ -1,7 +1,7 @@
 <form id="mercury_table" style="width:700px">
-  <div class="mercury-modal-pane-container">
-    <div class="mercury-modal-pane">
+  <div class="mercury-display-pane-container">
+    <div class="mercury-display-pane">
       <div id="table_display">
         <table border="1" cellspacing="0">
@@ -73,7 +73,7 @@
     </div>
   </div>
-  <div class="mercury-modal-controls">
+  <div class="mercury-display-controls">
     <fieldset class="buttons">
       <ol>
         <li class="commit button"><input class="submit" name="commit" type="submit" value="Insert Table" /></li>

data/app/views/mercury/panels/snippets.html CHANGED

@@ -6,7 +6,7 @@
     <li data-filter="example, snippet, favorite, beer">
       <img alt="Snippet Name" data-snippet="example" src="/assets/mercury/default-snippet.png"/>
       <h4>Snippet Name</h4>
-      <div class="description">A one to two line long description of what this snippet does.</div>
+      <div class="description">A one or two line long description of what this snippet does.</div>
     </li>
   </ul>
 </div>

data/app/views/mercury/selects/formatblock.html CHANGED

@@ -1,11 +1,11 @@
 <div class="mercury-select-options">
-  <h1 data-tag="h1">Heading 1 &lt;h1&gt;</h1>
-  <h2 data-tag="h2">Heading 2 &lt;h2&gt;</h2>
-  <h3 data-tag="h3">Heading 3 &lt;h3&gt;</h3>
-  <h4 data-tag="h4">Heading 4 &lt;h4&gt;</h4>
-  <h5 data-tag="h5">Heading 5 &lt;h5&gt;</h5>
-  <h6 data-tag="h6">Heading 6 &lt;h6&gt;</h6>
-  <div data-tag="p">Paragraph &lt;p&gt;</div>
-  <div data-tag="blockquote">Blockquote &lt;blockquote&gt;</div>
-  <div data-tag="pre">Formatted &lt;pre&gt;</div>
+  <h1 data-tag="h1">Heading 1 <span>&lt;h1&gt;</span></h1>
+  <h2 data-tag="h2">Heading 2 <span>&lt;h2&gt;</span></h2>
+  <h3 data-tag="h3">Heading 3 <span>&lt;h3&gt;</span></h3>
+  <h4 data-tag="h4">Heading 4 <span>&lt;h4&gt;</span></h4>
+  <h5 data-tag="h5">Heading 5 <span>&lt;h5&gt;</span></h5>
+  <h6 data-tag="h6">Heading 6 <span>&lt;h6&gt;</span></h6>
+  <div data-tag="p">Paragraph <span>&lt;p&gt;</span></div>
+  <div data-tag="blockquote">Blockquote <span>&lt;blockquote&gt;</span></div>
+  <div data-tag="pre">Formatted <span>&lt;pre&gt;</span></div>
 </div>

data/app/views/mercury/snippets/example/options.html.erb CHANGED

@@ -1,23 +1,34 @@
-<% @options = params[:options] || {} %>
-<%= semantic_form_for 'options', { :html => { :style => 'width:600px' } } do |f| %>
+<%= form_for 'options', { :html => { :style => 'width:600px' } } do |f| %>
-  <div class="mercury-modal-pane-container">
-    <div class="mercury-modal-pane">
-      <%= f.inputs do %>
-        <%= f.input :first_name, :required => false, :label => 'First Name',
-                    :input_html => {:value => @options[:first_name] || 'First Name'} %>
-      <% end %>
-      <%= f.inputs 'Options' do %>
-        <%= f.input :favorite_beer, :required => false, :label => 'Favorite Beer',
-                    :input_html => {:value => @options[:favorite_beer] || 'PBR'} %>
-      <% end %>
+  <div class="mercury-display-pane-container">
+    <div class="mercury-display-pane">
+      <fieldset class="inputs">
+        <ol>
+          <li class="string input optional stringish" id="options_first_name_input">
+            <label class="label" for="options_first_name">First Name</label>
+            <input id="options_first_name" name="options[first_name]" type="text" value="<%= @options[:first_name] %>"/>
+          </li>
+        </ol>
+      </fieldset>
+      <fieldset class="inputs">
+        <legend><span>Options</span></legend>
+        <ol>
+          <li class="string input optional stringish" id="options_favorite_beer_input">
+            <label class="label" for="options_favorite_beer">Favorite Beer</label>
+            <input id="options_favorite_beer" name="options[favorite_beer]" type="text" value="<%= @options[:favorite_beer] %>"/>
+          </li>
+        </ol>
+      </fieldset>
     </div>
   </div>
-  <div class="mercury-modal-controls">
-    <%= f.buttons do %>
-      <%= f.commit_button 'Insert Snippet' %>
-    <% end %>
+  <div class="mercury-display-controls">
+    <fieldset class="buttons">
+      <ol>
+        <li class="commit button"><input class="submit" name="commit" type="submit" value="Insert Snippet"/></li>
+      </ol>
+    </fieldset>
   </div>
 <% end %>

data/config/engine.rb CHANGED

@@ -2,5 +2,40 @@ require "rails"
 module Mercury
   class Engine < Rails::Engine
+    # Additional application configuration to include precompiled assets.
+    initializer :assets do |app|
+      app.config.assets.precompile += %w( mercury.js mercury.css mercury_overrides.css )
+    end
+    # Require mercury authentication module and potentially other aspects later (so they can be overridden).
+    initializer 'mercury.add_lib' do |app|
+      require 'mercury/authentication'
+    end
+    # To load the routes for this Engine, within your main apps routes.rb file include:
+    #
+    # Mercury::Engine.routes
+    #
+    def self.routes
+      Rails.application.routes.draw do
+        match '/editor(/*requested_uri)' => "mercury#edit", :as => :mercury_editor
+        namespace :mercury do
+          resources :images
+        end
+        scope '/mercury' do
+          match ':type/:resource' => "mercury#resource"
+          match 'snippets/:name/options' => "mercury#snippet_options"
+          match 'snippets/:name/preview' => "mercury#snippet_preview"
+        end
+        if defined?(Mercury::Application)
+          match 'mercury/test_page' => "mercury#test_page"
+        end
+      end
+    end
   end
 end

data/db/migrate/{20110526035601_create_images.rb → 20110526035601_create_mercury_images.rb} RENAMED

@@ -1,6 +1,6 @@
-class CreateImages < ActiveRecord::Migration
+class CreateMercuryImages < ActiveRecord::Migration
   def change
-    create_table :images do |t|
+    create_table :mercury_images do |t|
       t.string :image_file_name
       t.string :image_content_type
       t.integer :image_file_size

data/features/loading/loading.feature CHANGED

@@ -19,4 +19,4 @@ Feature:
   Scenario: A user can expect to see the status bar
-    Then I should see "Mercury Editor v0.2.1" within the statusbar
+    Then I should see "Mercury Editor v0.3.0" within the statusbar

data/features/loading/navigating.feature CHANGED

@@ -5,7 +5,7 @@ Feature:
   I should be able to expect the editor to not get in the way when I navigate and submit forms
   Background:
-    Given I adjust the configuration to have: "{nonHijackableClasses: ['lightview']}"
+    Given I adjust the configuration to have: {"nonHijackableClasses": ["lightview"]}
     And am on an editable page

data/features/loading/user_interface.feature CHANGED

@@ -12,8 +12,8 @@ Feature:
 #  Scenario: A user can view and close the about dialog
     When I click on the about the editor link
-    Then I should see "About Mercury Editor" within the lightview title
-    And I should see "Mercury Editor is an open source project written by Jeremy Jackson" within the lightview window
+    Then I should see "Mercury Editor" within the lightview title
+    And I should see "Mercury Editor is an open source HTML5 WYSIWYG editor written in Coffeescript using jQuery. The project has been released under the MIT license." within the lightview window
     And I should see "Project Home" within the lightview window
     And I should see "Project Source" within the lightview window

data/features/regions/editable/basic_editing.feature CHANGED

@@ -91,16 +91,16 @@ Feature:
     And I make a selection
     When I click on the justify left editor button
-    Then the contents of the editable region should be "<div>first line</div><br><div align='left'>this is <span>justifiable</span> <b>content</b></div>"
+    Then the contents of the editable region should be "<div>first line</div><br><div align='left'>this is <span>justifiable</span><b>content</b></div> "
     When I click on the justify center editor button
-    Then the contents of the editable region should be "<div>first line</div><br><div align='center'>this is <span>justifiable</span> <b>content</b></div>"
+    Then the contents of the editable region should be "<div>first line</div><br><div align='center'>this is <span>justifiable</span><b>content</b></div> "
     When I click on the justify right editor button
-    Then the contents of the editable region should be "<div>first line</div><br><div align='right'>this is <span>justifiable</span> <b>content</b></div>"
+    Then the contents of the editable region should be "<div>first line</div><br><div align='right'>this is <span>justifiable</span><b>content</b></div> "
     When I click on the full justification editor button
-    Then the contents of the editable region should be "<div>first line</div><br><div align='justify'>this is <span>justifiable</span> <b>content</b></div>"
+    Then the contents of the editable region should be "<div>first line</div><br><div align='justify'>this is <span>justifiable</span><b>content</b></div> "
 #  Scenario: A user can make an unordered list
@@ -128,16 +128,16 @@ Feature:
     And I make a selection
     When I click on the indent editor button
-    Then the contents of the editable region should be "<div>first line</div><br><blockquote>this is <span>justifiable</span> <b>content</b></blockquote>"
+    Then the contents of the editable region should be "<div>first line</div><br><blockquote>this is <span>justifiable</span><b>content</b></blockquote> "
     When I click on the indent editor button
-    Then the contents of the editable region should be "<div>first line</div><br><blockquote><blockquote>this is <span>justifiable</span> <b>content</b></blockquote></blockquote>"
+    Then the contents of the editable region should be "<div>first line</div><br><blockquote><blockquote>this is <span>justifiable</span><b>content</b></blockquote></blockquote> "
     When I click on the outdent editor button
-    Then the contents of the editable region should be "<div>first line</div><br><blockquote>this is <span>justifiable</span> <b>content</b></blockquote>"
+    Then the contents of the editable region should be "<div>first line</div><br><blockquote>this is <span>justifiable</span><b>content</b></blockquote> "
     When I click on the outdent editor button
-    Then the contents of the editable region should be "<div>first line</div><br>this is <span>justifiable</span> <b>content</b>"
+    Then the contents of the editable region should be "<div>first line</div><br>this is <span>justifiable</span><b>content</b> "
 #  Scenario: A user can insert horizontal rules

data/features/regions/editable/inserting_snippets.feature CHANGED

@@ -96,8 +96,7 @@ Feature:
     Then the contents of the editable region should be "<div data-version='4' data-snippet='snippet_42' class='mercury-snippet' contenteditable='false'><strong>Jen</strong> likes Miller High Life</div> <b>content</b>"
-  Scenario: When a user saves, the snippets should be gone from the html, but the options are serialized
-    Given the options for the example snippet "snippet_42" are first_name: "Hipsters", favorite_beer: "PBR"
-    And the content of the editable region has that snippet
-    When I click on the "Save" button
+#  Scenario: When a user saves, the snippets should be gone from the html, but the options are serialized
+#    Given the options for the example snippet "snippet_42" are first_name: "Hipsters", favorite_beer: "PBR"
+#    And the content of the editable region has that snippet
+#    When I click on the "Save" button

data/features/regions/editable/inserting_tables.feature CHANGED

@@ -53,7 +53,7 @@ Feature:
     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'>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr><tr><td colspan='2'>&nbsp;</td><td>&nbsp;</td></tr><tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr></tbody></table> <b>content</b>"
+    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
@@ -63,28 +63,28 @@ Feature:
     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>&nbsp;</td><td>&nbsp;</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>"
+    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>&nbsp;</td><td>&nbsp;</td></tr><tr><td><span>1</span></td><td><span>2</span></td></tr><tr><td>&nbsp;</td><td>&nbsp;</td></tr><tr><td><span>3</span></td><td><span>4</span></td></tr></tbody></table> <b>content</b>"
+    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>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr><tr><td>&nbsp;</td><td><span>1</span></td><td><span>2</span></td></tr><tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr><tr><td>&nbsp;</td><td><span>3</span></td><td><span>4</span></td></tr></tbody></table> <b>content</b>"
+    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>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr><tr><td>&nbsp;</td><td><span>1</span></td><td>&nbsp;</td><td><span>2</span></td></tr><tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr><tr><td>&nbsp;</td><td><span>3</span></td><td>&nbsp;</td><td><span>4</span></td></tr></tbody></table> <b>content</b>"
+    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>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr><tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr><tr><td>&nbsp;</td><td><span>3</span></td><td>&nbsp;</td><td><span>4</span></td></tr></tbody></table> <b>content</b>"
+    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>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr><tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr><tr><td>&nbsp;</td><td>&nbsp;</td><td><span>4</span></td></tr></tbody></table> <b>content</b>"
+    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)
@@ -95,7 +95,7 @@ Feature:
     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>&nbsp;</td></tr><tr><td><span>3</span></td><td><span>4</span></td></tr></tbody></table> <b>content</b>"
+    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)
@@ -106,4 +106,4 @@ Feature:
     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>&nbsp;</td><td><span>4</span></td></tr></tbody></table> <b>content</b>"
+    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>"