storytime 2.0.0 → 2.1.0

data/spec/features/dashboard/memberships_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "In the dashboard, Users" do
+describe "In the dashboard, Users", type: :feature do
   context "as Admin" do
     before{ login_admin }
 
@@ -11,7 +11,7 @@ describe "In the dashboard, Users" do
       visit storytime.dashboard_path
 
       click_link @current_site.title
-      
+
       expect(page).to have_link(@current_site.title, href: "")
       expect(page).to have_link(other_site.title, href: storytime.dashboard_url(host: other_site.custom_domain, port: Capybara.current_session.server.port))
     end
@@ -47,12 +47,70 @@ describe "In the dashboard, Users" do
 
       find("#membership_#{membership.id}").hover
       click_link("delete_membership_#{membership.id}")
-      
+
       expect(page).to_not have_content(user.storytime_name)
 
       expect(Storytime.user_class.count).to eq(user_count)
       expect(Storytime::Membership.count).to eq(membership_count-1)
     end
 
+    it "edits own profile", js: true do
+      u = User.last
+
+      visit storytime.dashboard_path
+      click_link "utility-menu-toggle"
+      click_link "profile-link"
+      fill_in "membership_user_attributes_email", with: "new_email@example.com"
+      click_button "Save"
+
+      within "#storytime-modal" do
+        storytime_name_field = find_field("membership_user_attributes_storytime_name").value
+        storytime_email_field = find_field("membership_user_attributes_email").value
+
+        expect(storytime_name_field).to eq(u.storytime_name)
+        expect(storytime_email_field).to eq("new_email@example.com")
+      end
+    end
+
+    it "edits another user's profile", js: true do
+      FactoryGirl.create :membership, site: @current_site
+      u = User.last
+
+      visit storytime.dashboard_path
+      click_link "utility-menu-toggle"
+      click_link "users-link"
+
+      click_link u.storytime_name
+
+      fill_in "membership_user_attributes_email", with: "change_email@example.com"
+      click_button "Save"
+
+      within "#storytime-modal" do
+        storytime_name_field = find_field("membership_user_attributes_storytime_name").value
+        storytime_email_field = find_field("membership_user_attributes_email").value
+
+        expect(storytime_name_field).to eq(u.storytime_name)
+        expect(storytime_email_field).to eq("change_email@example.com")
+      end
+    end
+
+    it "creates a user", js: true do
+      visit storytime.dashboard_path
+      click_link "utility-menu-toggle"
+      click_link "users-link"
+
+      click_link "new-user-link"
+
+      fill_in "user_storytime_name", with: "New Storytime Username"
+      fill_in "user_email", with: "new_user@example.com"
+      select "Editor", from: "Storytime role"
+      fill_in "user_password", with: "password"
+      fill_in "user_password_confirmation", with: "password"
+      click_button "Save"
+
+      within "#storytime-modal" do
+        expect(page).to have_content "New Storytime Username"
+      end
+    end
   end
-end
+end

data/spec/features/dashboard/navigations_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe "In the dashboard, Navigations", type: :feature do
+
+  before{ login_admin }
+
+  it "renders the navigations index" do
+    visit dashboard_navigations_path
+    expect(page).to have_content I18n.t('storytime.dashboard.navigations.index.header')
+  end
+
+  it "creates a new navigation list" do
+    visit new_dashboard_navigation_path
+
+    expect{
+      fill_in "navigation_name", with: "Main Navigation"
+      fill_in "navigation_handle", with: "main"
+      find("input[name='commit']").click()
+    }.to change(Storytime::Navigation, :count).by(1)
+  end
+
+  it "updates a navigation list" do
+    Storytime::Site.current_id = current_site.id
+    nav = FactoryGirl.create(:navigation, site_id: current_site.id)
+    visit edit_dashboard_navigation_path(nav)
+
+    fill_in "navigation_name", with: "New Name"
+    find("input[name='commit']").click()
+
+    nav.reload
+    expect(nav.name).to eq "New Name"
+  end
+end

data/spec/features/dashboard/pages_spec.rb

@@ -1,21 +1,31 @@
 require 'spec_helper'
 
-describe "In the dashboard, Pages" do
-  before do 
+describe "In the dashboard, Pages", type: :feature do
+  before do
     login_admin
   end
 
   describe "index" do
-    before do 
+    before do
       3.times{ FactoryGirl.create(:page, site: current_site) }
       3.times{ FactoryGirl.create(:page, published_at: nil, site: current_site) }
     end
 
     let!(:other_site_page){ FactoryGirl.create(:page) }
 
-    it "lists draft pages" do
+    it "lists all pages" do
       visit dashboard_pages_path
-      
+
+      current_site.pages.each do |p|
+        expect(page).to have_link_to_post(p)
+      end
+
+      expect(page).not_to have_link_to_post(other_site_page)
+    end
+
+    it "lists draft pages" do
+      visit dashboard_pages_path(draft: true)
+
       current_site.pages.each do |p|
         expect(page).to have_link_to_post(p) if p.published_at.nil?
         expect(page).not_to have_link_to_post(p) if p.published_at.present?
@@ -27,7 +37,7 @@ describe "In the dashboard, Pages" do
 
     it "lists published pages" do
       visit dashboard_pages_path(published: true)
-      
+
       # need the type designation so Blogs, which are Page subclasses, don't show up in the query
       current_site.pages.where(type: "Storytime::Page").each do |p|
         expect(page).not_to have_link_to_post(p) if p.published_at.nil?
@@ -38,7 +48,7 @@ describe "In the dashboard, Pages" do
       expect(page).not_to have_link_to_post(other_site_page)
     end
   end
-  
+
   it "creates a page", js: true do
     page_count = Storytime::Page.count
 
@@ -46,16 +56,16 @@ describe "In the dashboard, Pages" do
 
     find('#post-title-input').set("The Page")
     find('#medium-editor-post').set("The content of my page")
-    
+
     click_link "Save / Publish"
     click_button "Save Draft"
-    
+
     expect(page).to have_content(I18n.t('flash.posts.create.success'))
     expect(Storytime::Page.count).to eq(page_count + 1)
 
     pg = Storytime::Page.last
     expect(pg.title).to eq("The Page")
-    expect(pg.draft_content).to eq("<p>The content of my page</p>")
+    expect(pg.draft_content).to eq("The content of my page")
     expect(pg.user).to eq(current_user)
     expect(pg.site).to eq(current_site)
     expect(pg.type).to eq("Storytime::Page")
@@ -67,20 +77,20 @@ describe "In the dashboard, Pages" do
     pg = FactoryGirl.create(:page, site: current_site, published_at: nil)
     original_creator = pg.user
     page_count = Storytime::Page.count
-    
+
     visit edit_dashboard_page_path(pg)
     find('#post-title-input').set("The Story")
     find('#medium-editor-post').set("It was a dark and stormy night...")
-    
+
     click_link "advanced-settings-panel-toggle"
     click_button "Save Draft"
-    
+
     expect(page).to have_content(I18n.t('flash.posts.update.success'))
     expect(Storytime::Page.count).to eq(page_count)
 
     pg = Storytime::Page.last
     expect(pg.title).to eq("The Story")
-    expect(pg.draft_content).to eq("<p>It was a dark and stormy night...</p>")
+    expect(pg.draft_content).to eq("It was a dark and stormy night...")
     expect(pg.user).to eq(original_creator)
     expect(pg.type).to eq("Storytime::Page")
     expect(pg).to_not be_published
@@ -91,7 +101,7 @@ describe "In the dashboard, Pages" do
     page_count = Storytime::Page.count
 
     visit edit_dashboard_page_path(storytime_page)
-    
+
     click_button "post-utilities"
     click_link "Delete"
 
@@ -99,5 +109,5 @@ describe "In the dashboard, Pages" do
     expect { storytime_page.reload }.to raise_error
     expect(Storytime::Page.count).to eq(page_count - 1)
   end
-  
+
 end

data/spec/features/dashboard/posts_spec.rb

@@ -1,10 +1,27 @@
 require 'spec_helper'
 
-describe "In the dashboard, Posts" do
+describe "In the dashboard, Posts", type: :feature do
   before do
     login_admin
   end
 
+  it "lists all posts" do
+    blog = @current_site.blogs.first
+    FactoryGirl.create(:post, blog: blog, site: @current_site, published_at: nil)
+    2.times{ FactoryGirl.create(:post, blog: blog, site: @current_site, published_at: 1.hours.ago) }
+    static_page = FactoryGirl.create(:page)
+
+    visit url_for([storytime, :dashboard, blog, :blog_page_post_index, only_path: true])
+
+    within "#main" do
+      blog.posts.each do |p|
+        expect(page).to have_content(p.title)
+      end
+
+      expect(page).not_to have_content(static_page.title)
+    end
+  end
+
   it "lists draft posts" do
     blog = @current_site.blogs.first
     3.times{ FactoryGirl.create(:post, blog: blog, site: @current_site, published_at: nil) }
@@ -12,8 +29,8 @@ describe "In the dashboard, Posts" do
     FactoryGirl.create(:post)
     static_page = FactoryGirl.create(:page)
 
-    visit url_for([storytime, :dashboard, blog, :blog_page_post_index, only_path: true])
-    
+    visit url_for([storytime, :dashboard, blog, :blog_page_post_index, draft: true, only_path: true])
+
     within "#main" do
       blog.posts.each do |p|
         expect(page).to have_content(p.title) if p.published_at.nil?
@@ -23,7 +40,25 @@ describe "In the dashboard, Posts" do
       expect(page).not_to have_content(static_page.title)
     end
   end
-  
+
+  it "lists published posts" do
+    blog = @current_site.blogs.first
+    FactoryGirl.create(:post, blog: blog, site: @current_site, published_at: nil)
+    2.times{ FactoryGirl.create(:post, blog: blog, site: @current_site, published_at: 3.hours.ago) }
+    static_page = FactoryGirl.create(:page)
+
+    visit url_for([storytime, :dashboard, blog, :blog_page_post_index, published: true, only_path: true])
+
+    within "#main" do
+      blog.posts.each do |p|
+        expect(page).to_not have_content(p.title) if p.published_at.nil?
+        expect(page).to have_content(p.title) if p.published_at.present?
+      end
+
+      expect(page).not_to have_content(static_page.title)
+    end
+  end
+
   it "creates a post", js: true do
     post_count = Storytime::BlogPost.count
     media = FactoryGirl.create(:media)
@@ -32,20 +67,20 @@ describe "In the dashboard, Posts" do
 
     find('#post-title-input').set("The Story")
     find('#medium-editor-post').set("It was a dark and stormy night...")
-    
+
     click_link "Save / Publish"
 
     fill_in "blog_post_excerpt", with: "It was a dark and stormy night..."
     find("#featured_media_id", visible: false).set media.id
-    
+
     click_button "save-draft-submit"
-    
+
     expect(page).to have_content(I18n.t('flash.posts.create.success'))
     expect(Storytime::BlogPost.count).to eq(post_count + 1)
 
     post = Storytime::BlogPost.last
     expect(post.title).to eq("The Story")
-    expect(post.draft_content).to eq("<p>It was a dark and stormy night...</p>")
+    expect(post.draft_content).to eq("It was a dark and stormy night...")
     expect(post.user).to eq(current_user)
     expect(post.type).to eq("Storytime::BlogPost")
     expect(post.featured_media).to eq(media)
@@ -60,15 +95,15 @@ describe "In the dashboard, Posts" do
     find('#post-title-input').set("Snow Crash")
     find('#medium-editor-post').set("It was a dark and stormy night...")
     find('#blog_post_excerpt', visible: false).set("It was a dark and stormy night...")
-    
+
     click_button "Preview"
-    
+
     expect(page).to have_content(I18n.t('flash.posts.create.success'))
     expect(Storytime::BlogPost.count).to eq(post_count + 1)
 
     post = Storytime::BlogPost.last
     expect(post.title).to eq("Snow Crash")
-    expect(post.draft_content).to eq("<p>It was a dark and stormy night...</p>")
+    expect(post.draft_content).to eq("It was a dark and stormy night...")
     expect(post.user).to eq(current_user)
     expect(post.type).to eq("Storytime::BlogPost")
     expect(post).to_not be_published
@@ -88,7 +123,7 @@ describe "In the dashboard, Posts" do
     visit url_for([:edit, :dashboard, post, only_path: true])
 
     find('#medium-editor-post').set("Some content to autosave")
-    
+
     page.execute_script "Storytime.instance.editor.editor.autosavePostForm()"
 
     expect(page).to have_content("Draft saved at")
@@ -99,7 +134,7 @@ describe "In the dashboard, Posts" do
 
     post.reload
     expect(post.autosave).not_to be_nil
-    expect(post.autosave.content).to eq("<p>Some content to autosave</p>")
+    expect(post.autosave.content).to eq("Some content to autosave")
     expect(Storytime::BlogPost.count).to eq(post_count)
   end
 
@@ -122,7 +157,7 @@ describe "In the dashboard, Posts" do
     post = post.reload
     post.draft_content = nil # clear the cached copy of draft_content so it reloads
     expect(post.title).to eq("The Story")
-    expect(post.draft_content).to eq("<p>It was a dark and stormy night...</p>")
+    expect(post.draft_content).to eq("It was a dark and stormy night...")
     expect(post.user).to eq(original_creator)
     expect(post).to_not be_published
   end
@@ -134,10 +169,25 @@ describe "In the dashboard, Posts" do
 
     post = Storytime::BlogPost.first
     visit url_for([:edit, :dashboard, post, only_path: true])
-    
+
     expect{
       click_button "post-utilities"
       click_link "Delete"
     }.to change(Storytime::BlogPost, :count).by(-1)
   end
+
+  it "deletes a post from the index view", js: true do
+    blog = @current_site.blogs.first
+    3.times{ FactoryGirl.create(:post, blog: blog, site: @current_site, published_at: nil) }
+    expect(Storytime::BlogPost.count).to eq(3)
+
+    post = Storytime::BlogPost.first
+    visit url_for([storytime, :dashboard, blog, :blog_page_post_index, only_path: true])
+
+    expect{
+      find("#blogpost_#{post.id}").hover
+      click_link "delete_blogpost_#{post.id}"
+      expect(page).to_not have_selector "#blogpost_#{post.id}"
+    }.to change(Storytime::BlogPost, :count).by(-1)
+  end
 end

data/spec/features/dashboard/sites_spec.rb

@@ -1,24 +1,24 @@
 require 'spec_helper'
 
-describe "In the dashboard, Sites" do
+describe "In the dashboard, Sites", type: :feature do
 
   it "creates a site" do
     login FactoryGirl.create(:user), true
     expect(Storytime::Site.count).to eq(0)
-    
+
     visit new_dashboard_site_path
 
     fill_in "site_title", with: "The Site"
     fill_in "site_custom_domain", with: "example.lvh.me"
     fill_in "site_subscription_email_from", with: "test@example.com"
-    
+
     click_button "Save"
 
     # since creating a site redirects you to a new domain, you are not logged in
     fill_in "user_email", with: current_user.email
     fill_in "user_password", with: current_user.password
     click_on "Log in"
-    
+
     expect(page).to have_content("Pages")
     expect(Storytime::Site.count).to eq(1)
 
@@ -39,7 +39,7 @@ describe "In the dashboard, Sites" do
       click_link "site-settings-link"
       fill_in "site_title", with: "The Site's New Name"
       click_button "Save"
-      
+
       expect(page).to have_content("Your changes were saved successfully")
       site.reload
       expect(site.title).to eq "The Site's New Name"

data/spec/features/dashboard/snippets_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe "In the dashboard, Snippets" do
-  before do 
+describe "In the dashboard, Snippets", type: :feature do
+  before do
     login_admin
   end
 
@@ -9,7 +9,7 @@ describe "In the dashboard, Snippets" do
     3.times{ FactoryGirl.create(:snippet, site: @current_site) }
     visit storytime.dashboard_url
     find("#snippets-link").trigger('click')
-    
+
     within "#storytime-modal" do
       Storytime::Snippet.all.each do |s|
         expect(page).to have_link(s.name, href: url_for([:edit, :dashboard, s, only_path: true]))
@@ -17,7 +17,7 @@ describe "In the dashboard, Snippets" do
       end
     end
   end
-  
+
   it "creates a snippet", js: true do
     visit storytime.dashboard_url
     find("#snippets-link").trigger('click')
@@ -59,7 +59,7 @@ describe "In the dashboard, Snippets" do
 
     find("#snippet_#{snippet.id}").hover()
     click_link "delete_snippet_#{snippet.id}"
-    
+
     within "#storytime-modal" do
       expect(page).to_not have_content snippet.name
     end

data/spec/features/dashboard/subscription_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "In the dashboard, Subscriptions" do
+describe "In the dashboard, Subscriptions", type: :feature do
   before do
     login_admin
   end
@@ -27,7 +27,7 @@ describe "In the dashboard, Subscriptions" do
 
     fill_in "subscription_email", with: "some_random_email@example.com"
     click_button "Save"
-      
+
     within "#storytime-modal" do
       expect(page).to have_content "some_random_email@example.com"
     end
@@ -42,7 +42,7 @@ describe "In the dashboard, Subscriptions" do
     visit storytime.dashboard_path
     click_link "utility-menu-toggle"
     click_link "subscriptions-link"
-    
+
     within "#storytime-modal" do
       click_link "edit-subscription-#{subscription.id}"
     end
@@ -53,8 +53,8 @@ describe "In the dashboard, Subscriptions" do
       click_button "Save"
     end
 
-    within "#storytime-modal" do 
+    within "#storytime-modal" do
       expect(page).to have_content "johndoe@example.com"
     end
   end
-end
+end

data/spec/features/pages_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Pages" do
+describe "Pages", type: :feature do
   before do
     setup_site(FactoryGirl.create(:admin))
   end
@@ -10,5 +10,5 @@ describe "Pages" do
     visit url_for([pg, only_path: true])
     page.should have_content(pg.content)
   end
-  
-end
+
+end

data/spec/features/posts_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Posts" do
+describe "Posts", type: :feature do
   before do
     setup_site(FactoryGirl.create(:admin))
   end

data/spec/features/subscription_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Subscriptions" do
+describe "Subscriptions", type: :feature do
   before do
     setup_site(FactoryGirl.create(:admin))
   end
@@ -46,4 +46,4 @@ describe "Subscriptions" do
     expect(subscription_1.subscribed?).to eq(false)
     expect(subscription_2.subscribed?).to eq(true)
   end
-end
+end

data/spec/lib/storytime_helpers_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+require 'pry'
+
+include Storytime::StorytimeHelpers
+
+describe "Storytime::StorytimeHelpers", :type => :helper do
+  describe "storytime_snippet" do
+    before(:each) do
+      @site = FactoryGirl.create(:site)
+      expect_any_instance_of(Storytime::StorytimeHelpers).to receive(:current_storytime_site).at_least(:once).and_return(@site)
+      expect_any_instance_of(ApplicationHelper).to receive(:logged_in_storytime_user?).at_least(:once).and_return(false)
+    end
+
+    describe "when no snippet is found" do
+      it "creates snippet from I18n translation with same name" do
+        existing_translation = storytime_snippet("layout.title")
+
+        expect(storytime_snippet("layout.title")).to include("Storytime")
+      end
+
+      it "creates snippet with 'Lorem ipsum' placeholder text" do
+        missing_translation_div = storytime_snippet("nothing.here")
+
+        expect(missing_translation_div).to include("Lorem ipsum dolor sit amet, consectetur adipiscing elit...")
+      end
+    end
+
+    describe "when snippet is found" do
+      it "returns snippet partial" do
+        snippet = FactoryGirl.create(:snippet, site: @site)
+        snippet_div = storytime_snippet(snippet.name)
+
+        expect(snippet_div).to include(snippet.content)
+      end
+    end
+  end
+end

data/spec/models/navigation_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Storytime::Navigation do
+  describe "#handle" do
+    it "parameterizes the title to set the handle" do
+      nav = FactoryGirl.create(:navigation, handle: nil)
+      expect(nav.handle).to eq nav.name.parameterize
+    end
+
+    it "parameterizes the handle" do
+      nav = FactoryGirl.create(:navigation, handle: "my Handle")
+      expect(nav.handle).to eq "my-handle"
+    end
+
+    it "does not change the handle if the title changes" do
+      nav = FactoryGirl.create(:navigation, handle: "my Handle")
+      nav.update(name: "New Name")
+      expect(nav.handle).to eq "my-handle"
+    end
+  end
+end

data/spec/requests/routings_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe "Root path" do
+describe "Root path", type: :request do
   it "routes to blog_homepage#show when site homepage is a blog" do
     site = FactoryGirl.create(:site)
     user = FactoryGirl.create(:admin)
@@ -22,21 +22,21 @@ describe "Root path" do
     site.save
 
     get "/"
-    
+
     expect(request.params[:controller]).to eq("storytime/homepage")
     expect(request.params[:action]).to eq("show")
     expect(response.body).to match(home_page.title)
   end
 end
 
-describe "Post path" do
+describe "Post path", type: :request do
   it "uses /posts/post-slug when site#post_slug_style is default" do
     site = FactoryGirl.create(:site, post_slug_style: :default, custom_domain: "www.example.com")
     post = FactoryGirl.create(:post, site: site)
     expect(storytime.post_path(post)).to  eq("/posts/#{post.slug}")
 
     get url_for([post, only_path: true])
-    
+
     expect(request.params[:controller]).to eq("storytime/posts")
     expect(request.params[:action]).to eq("show")
     expect(request.params[:id]).to eq(post.slug)
@@ -46,11 +46,11 @@ describe "Post path" do
     site = FactoryGirl.create(:site, post_slug_style: :day_and_name, custom_domain: "www.example.com")
     post = FactoryGirl.create(:post, site: site)
     date = post.created_at.to_date
-    
+
     expect(url_for([post, only_path: true])).to  eq("/#{date.year}/#{date.strftime('%m')}/#{date.strftime('%d')}/#{post.slug}")
 
     get url_for([post, only_path: true])
-    
+
     expect(request.params[:controller]).to eq("storytime/posts")
     expect(request.params[:action]).to eq("show")
     expect(request.params[:id]).to eq(post.slug)
@@ -63,7 +63,7 @@ describe "Post path" do
     expect(url_for([post, only_path: true])).to  eq("/#{date.year}/#{date.strftime('%m')}/#{post.slug}")
 
     get url_for([post, only_path: true])
-    
+
     expect(request.params[:controller]).to eq("storytime/posts")
     expect(request.params[:action]).to eq("show")
     expect(request.params[:id]).to eq(post.slug)
@@ -75,7 +75,7 @@ describe "Post path" do
     expect(url_for([post, only_path: true])).to eq("/posts/#{post.id}")
 
     get url_for([post, only_path: true])
-    
+
     expect(request.params[:controller]).to eq("storytime/posts")
     expect(request.params[:action]).to eq("show")
     expect(request.params[:id]).to eq(post.id.to_s)