storytime 2.0.0 → 2.1.0

data/lib/generators/templates/storytime.rb

@@ -9,6 +9,12 @@ Storytime.configure do |config|
   # Path used to sign users in. 
   # config.login_path = '/users/sign_in'
 
+  # Path used to sign users out. 
+  # config.logout_path = '/users/sign_out'  
+
+  # Path used to register a new user. 
+  # config.registration_path = "/users/sign_up"
+
   # Method used for Storytime user logout path.
   # config.logout_method = :delete
 
@@ -28,25 +34,22 @@ Storytime.configure do |config|
   # handle how post content is sanitized (i.e. which tags,
   # HTML attributes to allow/disallow.
   # config.post_sanitizer = Proc.new do |draft_content|
-  #   white_list_sanitizer = if Rails::VERSION::MINOR <= 1
-  #     HTML::WhiteListSanitizer.new
+  #   if Rails::VERSION::MINOR <= 1
+  #     white_list_sanitizer = HTML::WhiteListSanitizer.new
+  #     tags = white_list_sanitizer.allowed_tags
+  #     attributes = white_list_sanitizer.allowed_attributes
   #   else
-  #     Rails::Html::WhiteListSanitizer.new
+  #     white_list_sanitizer = Rails::Html::WhiteListSanitizer.new
+  #     tags = Loofah::HTML5::WhiteList::ALLOWED_ELEMENTS_WITH_LIBXML2
+  #     attributes = Loofah::HTML5::WhiteList::ALLOWED_ATTRIBUTES
   #   end
   #
-  #   attributes = %w(
-  #     id class href style src title width height alt value 
-  #     target rel align disabled
-  #   )
+  #   # Add any additional tags or attributes to tags/attributes Sets here.
+  #   # tags.add("someCustomTag")
+  #   # attributes.add("someCustomAttribute")
   #
-  #   if Storytime.whitelisted_post_html_tags.blank?
-  #     white_list_sanitizer.sanitize(draft_content, attributes: attributes)
-  #   else
-  #     white_list_sanitizer.sanitize(draft_content,
-  #                                   tags: Storytime.whitelisted_post_html_tags,
-  #                                   attributes: attributes)
-  #   end
-  # end
+  #   white_list_sanitizer.sanitize(draft_content, tags: tags, attributes: attributes)
+  # # end
 
   # Enable Disqus comments using your forum's shortname,
   # the unique identifier for your website as registered on Disqus.
@@ -98,6 +101,10 @@ Storytime.configure do |config|
   # AWS Secret Key to use for file uploads.
   # config.aws_secret_key = <%= @aws_secret_key %>
 
+  # Superclass for Storytime::ApplicationController
+  # Defaults to the host app's ApplicationController
+  # config.application_controller_superclass = "::ApplicationController"
+
   if Rails.env.production?
     config.media_storage = <%= @prod_media_storage %>
     <%= @enable_file_upload && @prod_media_storage == ':s3' ? nil : '# ' %>config.s3_bucket = '<%= @s3_bucket %>'

data/lib/storytime/concerns/current_site.rb

@@ -3,7 +3,7 @@ module Storytime
     module CurrentSite
       def current_storytime_site(req = nil)
         req ||= request if respond_to?(:request)
-        @current_storytime_site = Storytime::Site.find_by(custom_domain: req.host) || Storytime::Site.first
+        @current_storytime_site = Storytime::Site.current || Storytime::Site.find_by(custom_domain: req.host) || Storytime::Site.first
       end
     end
   end

data/lib/storytime/concerns/has_versions.rb

@@ -18,11 +18,13 @@ module Storytime
       end
 
       def create_version
-        if self.latest_version.nil? || self.draft_content != self.latest_version.content
-          version = self.versions.new
-          version.content = self.draft_content
-          version.user_id = self.draft_user_id
-          version.save
+        unless self.draft_content.blank?
+          if self.latest_version.nil? || self.draft_content != self.latest_version.content
+            version = self.versions.new
+            version.content = self.draft_content
+            version.user_id = self.draft_user_id
+            version.save
+          end
         end
         self.publish! if self.published?
       end
@@ -38,7 +40,7 @@ module Storytime
 
       def publish!
         self.published = "1"
-        attrs = {self.class.draft_content_column => self.latest_version.content}
+        attrs = {self.class.draft_content_column => (self.latest_version.present? ? self.latest_version.content : "") }
         self.update_columns(attrs)
       end
 
@@ -78,8 +80,6 @@ module Storytime
 
         self.draft_content_column = :content
 
-        validates_presence_of :draft_content
-
         scope :published, -> { where("published_at IS NOT NULL").where("published_at <= ?", Time.now) }
         scope :draft, -> { where("published_at IS NULL OR published_at > ?", Time.now) }
       end

data/lib/storytime/constraints/page_constraint.rb

@@ -2,7 +2,7 @@ module Storytime
   module Constraints
     class PageConstraint
       include Storytime::Concerns::CurrentSite
-      
+
       def matches?(request)
         site = current_storytime_site(request)
         site.pages.friendly.exists?(request.params[:id]) ||
@@ -10,4 +10,4 @@ module Storytime
       end
     end
   end
-end
+end

data/lib/storytime/engine.rb

@@ -14,6 +14,8 @@ require 'pundit'
 require 'simple_form'
 require 'codemirror-rails'
 require 'storytime_admin'
+require 'cocoon'
+require 'acts_as_list'
 
 require 'storytime/concerns/has_versions'
 require 'storytime/concerns/storytime_user'

data/lib/storytime/storytime_helpers.rb

@@ -1,12 +1,14 @@
 module Storytime
   module StorytimeHelpers
     def storytime_snippet(name)
-      snippet = Storytime::Snippet.find_by(name: name)
+      snippet = Storytime::Snippet.find_by(name: name, site: current_storytime_site)
+
       if snippet.nil?
-        ""
-      else
-        render partial: "storytime/snippets/snippet", locals: {snippet: snippet}
+        content = I18n.exists?(name) ? I18n.t(name).html_safe : "Lorem ipsum dolor sit amet, consectetur adipiscing elit..."
+        snippet = Storytime::Snippet.create(name: name, content: content, site: current_storytime_site)
       end
+
+      render partial: "storytime/snippets/snippet", locals: {snippet: snippet}
     end
   end
-end
+end

data/lib/storytime/version.rb

@@ -1,3 +1,3 @@
 module Storytime
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/lib/storytime.rb

@@ -18,10 +18,18 @@ module Storytime
   mattr_accessor :dashboard_namespace_path
   @@dashboard_namespace_path = '/storytime'
 
-  # Path used to sign users in. 
+  # Path used to sign users in.
   mattr_accessor :login_path
   @@login_path = '/users/sign_in'
 
+  # Path used to sign users out.
+  mattr_accessor :logout_path
+  @@logout_path = '/users/sign_out'
+
+  # Path used to register a new user.
+  mattr_accessor :registration_path
+  @@registration_path = "/users/sign_up"
+
   # Method used for Storytime user logout path.
   mattr_accessor :logout_method
   @@logout_method = :delete
@@ -44,18 +52,19 @@ module Storytime
   # HTML attributes to allow/disallow.
   mattr_accessor :post_sanitizer
   @@post_sanitizer = Proc.new do |draft_content|
-    white_list_sanitizer = if Rails::VERSION::MINOR <= 1
-      HTML::WhiteListSanitizer.new
+    if Rails::VERSION::MAJOR == 4 && Rails::VERSION::MINOR <= 1
+      white_list_sanitizer = HTML::WhiteListSanitizer.new
+      tags = white_list_sanitizer.allowed_tags
+      attributes = white_list_sanitizer.allowed_attributes
     else
-      Rails::Html::WhiteListSanitizer.new
+      white_list_sanitizer = Rails::Html::WhiteListSanitizer.new
+      tags = Loofah::HTML5::WhiteList::ALLOWED_ELEMENTS_WITH_LIBXML2
+      attributes = Loofah::HTML5::WhiteList::ALLOWED_ATTRIBUTES
     end
 
-    attributes = %w(
-      id class href style src title width height alt value 
-      target rel align disabled
-    )
+    attributes << "style"
 
-    white_list_sanitizer.sanitize(draft_content, attributes: attributes)
+    white_list_sanitizer.sanitize(draft_content, tags: tags, attributes: attributes)
   end
 
   # Enable Disqus comments using your forum's shortname,
@@ -99,9 +108,14 @@ module Storytime
   mattr_accessor :aws_secret_key
   @@aws_secret_key = ENV['STORYTIME_AWS_SECRET_KEY']
 
+  # Superclass for Storytime::ApplicationController
+  # Defaults to the host app's ApplicationController
+  mattr_accessor :application_controller_superclass
+  @@application_controller_superclass = "::ApplicationController"
+
   class << self
     attr_accessor :layout, :media_storage, :s3_bucket, :post_types
-    
+
     def configure
       self.post_types ||= []
 
@@ -123,5 +137,9 @@ module Storytime
     def user_class_symbol
       @@user_class.underscore.to_sym
     end
+
+    def application_controller_superclass
+      @@application_controller_superclass.constantize
+    end
   end
-end
+end

data/spec/controllers/dashboard_controller_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe Storytime::DashboardController do
+describe Storytime::DashboardController, type: :controller do
   context "for actions of subclasses" do
     class WidgetsController < Storytime::DashboardController; end
 
     controller(WidgetsController) do
       def index; end
     end
-    
+
     it "requires login" do
       get :index
       flash[:alert].should == I18n.t('devise.failure.unauthenticated')
@@ -18,7 +18,7 @@ describe Storytime::DashboardController do
       controller.view_paths.unshift(ActionView::FixtureResolver.new("widgets/index.html.erb" => ""))
       FactoryGirl.create(:site)
       sign_in FactoryGirl.create(:writer)
-      get :index 
+      get :index
       expect(flash[:error]).to eq("You are not authorized to perform this action.")
     end
 
@@ -29,4 +29,4 @@ describe Storytime::DashboardController do
       response.should redirect_to(new_dashboard_site_path)
     end
   end
-end
+end

data/spec/dummy/config/environments/test.rb

@@ -13,7 +13,7 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files  = true
   config.static_cache_control = 'public, max-age=3600'
 
   config.assets.debug = true

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150402161427) do
+ActiveRecord::Schema.define(version: 20150529192058) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -24,10 +24,10 @@ ActiveRecord::Schema.define(version: 20150402161427) do
     t.datetime "created_at"
   end
 
-  add_index "friendly_id_slugs", ["slug", "sluggable_type", "scope"], name: "index_friendly_id_slugs_on_slug_and_sluggable_type_and_scope", unique: true
-  add_index "friendly_id_slugs", ["slug", "sluggable_type"], name: "index_friendly_id_slugs_on_slug_and_sluggable_type"
-  add_index "friendly_id_slugs", ["sluggable_id"], name: "index_friendly_id_slugs_on_sluggable_id"
-  add_index "friendly_id_slugs", ["sluggable_type"], name: "index_friendly_id_slugs_on_sluggable_type"
+  add_index "friendly_id_slugs", ["slug", "sluggable_type", "scope"], name: "index_friendly_id_slugs_on_slug_and_sluggable_type_and_scope", unique: true, using: :btree
+  add_index "friendly_id_slugs", ["slug", "sluggable_type"], name: "index_friendly_id_slugs_on_slug_and_sluggable_type", using: :btree
+  add_index "friendly_id_slugs", ["sluggable_id"], name: "index_friendly_id_slugs_on_sluggable_id", using: :btree
+  add_index "friendly_id_slugs", ["sluggable_type"], name: "index_friendly_id_slugs_on_sluggable_type", using: :btree
 
   create_table "storytime_actions", force: :cascade do |t|
     t.string   "name"
@@ -36,7 +36,7 @@ ActiveRecord::Schema.define(version: 20150402161427) do
     t.datetime "updated_at"
   end
 
-  add_index "storytime_actions", ["guid"], name: "index_storytime_actions_on_guid"
+  add_index "storytime_actions", ["guid"], name: "index_storytime_actions_on_guid", using: :btree
 
   create_table "storytime_autosaves", force: :cascade do |t|
     t.text     "content"
@@ -47,8 +47,8 @@ ActiveRecord::Schema.define(version: 20150402161427) do
     t.integer  "site_id"
   end
 
-  add_index "storytime_autosaves", ["autosavable_type", "autosavable_id"], name: "autosavable_index"
-  add_index "storytime_autosaves", ["site_id"], name: "index_storytime_autosaves_on_site_id"
+  add_index "storytime_autosaves", ["autosavable_type", "autosavable_id"], name: "autosavable_index", using: :btree
+  add_index "storytime_autosaves", ["site_id"], name: "index_storytime_autosaves_on_site_id", using: :btree
 
   create_table "storytime_comments", force: :cascade do |t|
     t.text     "content"
@@ -59,9 +59,24 @@ ActiveRecord::Schema.define(version: 20150402161427) do
     t.integer  "site_id"
   end
 
-  add_index "storytime_comments", ["post_id"], name: "index_storytime_comments_on_post_id"
-  add_index "storytime_comments", ["site_id"], name: "index_storytime_comments_on_site_id"
-  add_index "storytime_comments", ["user_id"], name: "index_storytime_comments_on_user_id"
+  add_index "storytime_comments", ["post_id"], name: "index_storytime_comments_on_post_id", using: :btree
+  add_index "storytime_comments", ["site_id"], name: "index_storytime_comments_on_site_id", using: :btree
+  add_index "storytime_comments", ["user_id"], name: "index_storytime_comments_on_user_id", using: :btree
+
+  create_table "storytime_links", force: :cascade do |t|
+    t.string   "text"
+    t.integer  "storytime_navigation_id"
+    t.integer  "linkable_id"
+    t.string   "linkable_type"
+    t.datetime "created_at",              null: false
+    t.datetime "updated_at",              null: false
+    t.integer  "position"
+    t.string   "url"
+  end
+
+  add_index "storytime_links", ["linkable_type", "linkable_id"], name: "index_storytime_links_on_linkable_type_and_linkable_id", using: :btree
+  add_index "storytime_links", ["position"], name: "index_storytime_links_on_position", using: :btree
+  add_index "storytime_links", ["storytime_navigation_id"], name: "index_storytime_links_on_storytime_navigation_id", using: :btree
 
   create_table "storytime_media", force: :cascade do |t|
     t.string   "file"
@@ -71,8 +86,8 @@ ActiveRecord::Schema.define(version: 20150402161427) do
     t.integer  "site_id"
   end
 
-  add_index "storytime_media", ["site_id"], name: "index_storytime_media_on_site_id"
-  add_index "storytime_media", ["user_id"], name: "index_storytime_media_on_user_id"
+  add_index "storytime_media", ["site_id"], name: "index_storytime_media_on_site_id", using: :btree
+  add_index "storytime_media", ["user_id"], name: "index_storytime_media_on_user_id", using: :btree
 
   create_table "storytime_memberships", force: :cascade do |t|
     t.integer  "user_id"
@@ -82,9 +97,19 @@ ActiveRecord::Schema.define(version: 20150402161427) do
     t.datetime "updated_at"
   end
 
-  add_index "storytime_memberships", ["site_id"], name: "index_storytime_memberships_on_site_id"
-  add_index "storytime_memberships", ["storytime_role_id"], name: "index_storytime_memberships_on_storytime_role_id"
-  add_index "storytime_memberships", ["user_id"], name: "index_storytime_memberships_on_user_id"
+  add_index "storytime_memberships", ["site_id"], name: "index_storytime_memberships_on_site_id", using: :btree
+  add_index "storytime_memberships", ["storytime_role_id"], name: "index_storytime_memberships_on_storytime_role_id", using: :btree
+  add_index "storytime_memberships", ["user_id"], name: "index_storytime_memberships_on_user_id", using: :btree
+
+  create_table "storytime_navigations", force: :cascade do |t|
+    t.string   "name"
+    t.string   "handle"
+    t.integer  "site_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  add_index "storytime_navigations", ["site_id"], name: "index_storytime_navigations_on_site_id", using: :btree
 
   create_table "storytime_permissions", force: :cascade do |t|
     t.integer  "role_id"
@@ -94,9 +119,9 @@ ActiveRecord::Schema.define(version: 20150402161427) do
     t.integer  "site_id"
   end
 
-  add_index "storytime_permissions", ["action_id"], name: "index_storytime_permissions_on_action_id"
-  add_index "storytime_permissions", ["role_id"], name: "index_storytime_permissions_on_role_id"
-  add_index "storytime_permissions", ["site_id"], name: "index_storytime_permissions_on_site_id"
+  add_index "storytime_permissions", ["action_id"], name: "index_storytime_permissions_on_action_id", using: :btree
+  add_index "storytime_permissions", ["role_id"], name: "index_storytime_permissions_on_role_id", using: :btree
+  add_index "storytime_permissions", ["site_id"], name: "index_storytime_permissions_on_site_id", using: :btree
 
   create_table "storytime_posts", force: :cascade do |t|
     t.integer  "user_id"
@@ -118,9 +143,9 @@ ActiveRecord::Schema.define(version: 20150402161427) do
     t.integer  "blog_id"
   end
 
-  add_index "storytime_posts", ["blog_id"], name: "index_storytime_posts_on_blog_id"
-  add_index "storytime_posts", ["slug"], name: "index_storytime_posts_on_slug"
-  add_index "storytime_posts", ["user_id"], name: "index_storytime_posts_on_user_id"
+  add_index "storytime_posts", ["blog_id"], name: "index_storytime_posts_on_blog_id", using: :btree
+  add_index "storytime_posts", ["slug"], name: "index_storytime_posts_on_slug", using: :btree
+  add_index "storytime_posts", ["user_id"], name: "index_storytime_posts_on_user_id", using: :btree
 
   create_table "storytime_roles", force: :cascade do |t|
     t.string   "name"
@@ -128,7 +153,7 @@ ActiveRecord::Schema.define(version: 20150402161427) do
     t.datetime "updated_at"
   end
 
-  add_index "storytime_roles", ["name"], name: "index_storytime_roles_on_name"
+  add_index "storytime_roles", ["name"], name: "index_storytime_roles_on_name", using: :btree
 
   create_table "storytime_sites", force: :cascade do |t|
     t.string   "title"
@@ -145,8 +170,8 @@ ActiveRecord::Schema.define(version: 20150402161427) do
     t.string   "discourse_name"
   end
 
-  add_index "storytime_sites", ["root_post_id"], name: "index_storytime_sites_on_root_post_id"
-  add_index "storytime_sites", ["user_id"], name: "index_storytime_sites_on_user_id"
+  add_index "storytime_sites", ["root_post_id"], name: "index_storytime_sites_on_root_post_id", using: :btree
+  add_index "storytime_sites", ["user_id"], name: "index_storytime_sites_on_user_id", using: :btree
 
   create_table "storytime_snippets", force: :cascade do |t|
     t.string   "name"
@@ -156,7 +181,7 @@ ActiveRecord::Schema.define(version: 20150402161427) do
     t.integer  "site_id"
   end
 
-  add_index "storytime_snippets", ["name"], name: "index_storytime_snippets_on_name"
+  add_index "storytime_snippets", ["name"], name: "index_storytime_snippets_on_name", using: :btree
 
   create_table "storytime_subscriptions", force: :cascade do |t|
     t.string   "email"
@@ -167,7 +192,7 @@ ActiveRecord::Schema.define(version: 20150402161427) do
     t.integer  "site_id"
   end
 
-  add_index "storytime_subscriptions", ["token"], name: "index_storytime_subscriptions_on_token"
+  add_index "storytime_subscriptions", ["token"], name: "index_storytime_subscriptions_on_token", using: :btree
 
   create_table "storytime_taggings", force: :cascade do |t|
     t.integer  "tag_id"
@@ -177,9 +202,9 @@ ActiveRecord::Schema.define(version: 20150402161427) do
     t.integer  "site_id"
   end
 
-  add_index "storytime_taggings", ["post_id"], name: "index_storytime_taggings_on_post_id"
-  add_index "storytime_taggings", ["site_id"], name: "index_storytime_taggings_on_site_id"
-  add_index "storytime_taggings", ["tag_id"], name: "index_storytime_taggings_on_tag_id"
+  add_index "storytime_taggings", ["post_id"], name: "index_storytime_taggings_on_post_id", using: :btree
+  add_index "storytime_taggings", ["site_id"], name: "index_storytime_taggings_on_site_id", using: :btree
+  add_index "storytime_taggings", ["tag_id"], name: "index_storytime_taggings_on_tag_id", using: :btree
 
   create_table "storytime_tags", force: :cascade do |t|
     t.string   "name"
@@ -198,9 +223,9 @@ ActiveRecord::Schema.define(version: 20150402161427) do
     t.integer  "site_id"
   end
 
-  add_index "storytime_versions", ["site_id"], name: "index_storytime_versions_on_site_id"
-  add_index "storytime_versions", ["user_id"], name: "index_storytime_versions_on_user_id"
-  add_index "storytime_versions", ["versionable_type", "versionable_id"], name: "versionable_index"
+  add_index "storytime_versions", ["site_id"], name: "index_storytime_versions_on_site_id", using: :btree
+  add_index "storytime_versions", ["user_id"], name: "index_storytime_versions_on_user_id", using: :btree
+  add_index "storytime_versions", ["versionable_type", "versionable_id"], name: "versionable_index", using: :btree
 
   create_table "users", force: :cascade do |t|
     t.string   "email",                  default: "", null: false
@@ -218,8 +243,8 @@ ActiveRecord::Schema.define(version: 20150402161427) do
     t.string   "storytime_name"
   end
 
-  add_index "users", ["email"], name: "index_users_on_email", unique: true
-  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
+  add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
+  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
 
   create_table "widgets", force: :cascade do |t|
     t.string   "name"
@@ -227,4 +252,5 @@ ActiveRecord::Schema.define(version: 20150402161427) do
     t.datetime "updated_at"
   end
 
+  add_foreign_key "storytime_links", "storytime_navigations"
 end

data/spec/factories/navigation_factories.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :navigation, class: Storytime::Navigation do
+    name "Main Navigation"
+    handle "main-navigation"
+  end
+end

data/spec/features/blogs_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe "Blogs" do
+describe "Blogs", type: :feature do
   before do
     setup_site(FactoryGirl.create(:admin))
   end
-  
+
   it "lists posts belonging to that blog" do
     3.times{ FactoryGirl.create(:post, blog: @current_site.blogs.first, site: @current_site) }
     other_blog_post = FactoryGirl.create(:post, site: @current_site)

data/spec/features/comments_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe "Comments" do
+describe "Comments", type: :feature do
   before do
     # setup_site
     login
   end
-  
+
   it "lists comments on a post" do
     post = FactoryGirl.create(:post, site: @current_site, blog: @current_site.blogs.first)
     3.times{ FactoryGirl.create(:comment, post: post, site: @current_site) }
@@ -48,10 +48,10 @@ describe "Comments" do
 
     expect(page).to have_content(comment_to_delete.content)
     click_link "delete_comment_#{comment_to_delete.id}"
-    
+
     expect(page).to_not have_content(comment_to_delete.content)
 
     expect{ comment_to_delete.reload }.to raise_error
   end
-  
+
 end

data/spec/features/dashboard/media_spec.rb

@@ -1,15 +1,15 @@
 require 'spec_helper'
 
-describe "In the dashboard, Media" do
+describe "In the dashboard, Media", type: :feature do
   include Storytime::Dashboard::MediaHelper
 
   before{ login_admin }
-  
+
   it "creates media", js: true do
     visit dashboard_media_index_path
 
     attach_file('media_file', "./spec/support/images/success-kid.jpg")
-    
+
     expect(find("#media_gallery").find("img")['src']).to have_content('success-kid.jpg')
   end
 
@@ -18,14 +18,14 @@ describe "In the dashboard, Media" do
     m2 = FactoryGirl.create(:media, site: @current_site)
 
     visit dashboard_media_index_path
-    
+
     page.should have_image(m1.file_url(:thumb))
     page.should have_image(m2.file_url(:thumb))
   end
 
   it "deletes an image", js: true do
     image = FactoryGirl.create(:media, site: @current_site)
-    
+
     visit dashboard_media_index_path
     page.should have_image(image.file_url(:thumb))
 
@@ -40,12 +40,12 @@ describe "In the dashboard, Media" do
     visit url_for([:new, :dashboard, @current_site.blogs.first, :blog_post, only_path: true])
 
     find(".insert-media-button").click
-    
+
     within "#media_#{media.id}" do
       find(".insert-image-button").click
     end
 
     expect(page).to have_image(media.file_url)
   end
-  
+
 end