refinerycms-blog 2.1.0 → 3.0.1

data/spec/features/refinery/blog/admin/comments_spec.rb

@@ -3,8 +3,8 @@ require "spec_helper"
 module Refinery
   module Blog
     module Admin
-      describe Comment do
-        refinery_login_with :refinery_user
+      describe Comment, type: :feature do
+        refinery_login_with_devise :authentication_devise_refinery_superuser
 
         describe "#index" do
           context "when has no new unapproved comments" do
@@ -16,7 +16,7 @@ module Refinery
             it "should list no comments" do
               visit refinery.blog_admin_comments_path
 
-              page.should have_content('There are no new comments')
+              expect(page).to have_content('There are no new comments')
             end
           end
           context "when has new unapproved comments" do
@@ -24,20 +24,20 @@ module Refinery
             before { visit refinery.blog_admin_comments_path }
 
             it "should list comments" do
-              page.should have_content(blog_comment.body)
-              page.should have_content(blog_comment.name)
+              expect(page).to have_content(blog_comment.body)
+              expect(page).to have_content(blog_comment.name)
             end
 
             it "should allow me to approve a comment" do
               click_link "Approve this comment"
 
-              page.should have_content("has been approved")
+              expect(page).to have_content("has been approved")
             end
 
             it "should allow me to reject a comment" do
               click_link "Reject this comment"
 
-              page.should have_content("has been rejected")
+              expect(page).to have_content("has been rejected")
             end
           end
         end
@@ -50,7 +50,7 @@ module Refinery
             end
 
             it "should list no comments" do
-              page.should have_content('There are no approved comments')
+              expect(page).to have_content('There are no approved comments')
             end
           end
           context "when has approved comments" do
@@ -60,14 +60,14 @@ module Refinery
             before { visit refinery.approved_blog_admin_comments_path }
 
             it "should list comments" do
-              page.should have_content(blog_comment.body)
-              page.should have_content(blog_comment.name)
+              expect(page).to have_content(blog_comment.body)
+              expect(page).to have_content(blog_comment.name)
             end
 
             it "should allow me to reject a comment" do
               click_link "Reject this comment"
 
-              page.should have_content("has been rejected")
+              expect(page).to have_content("has been rejected")
             end
           end
         end
@@ -80,7 +80,7 @@ module Refinery
             end
 
             it "should list no comments" do
-              page.should have_content('There are no rejected comments')
+              expect(page).to have_content('There are no rejected comments')
             end
           end
           context "when has rejected comments" do
@@ -90,14 +90,14 @@ module Refinery
             before { visit refinery.rejected_blog_admin_comments_path }
 
             it "should list comments" do
-              page.should have_content(blog_comment.body)
-              page.should have_content(blog_comment.name)
+              expect(page).to have_content(blog_comment.body)
+              expect(page).to have_content(blog_comment.name)
             end
 
             it "should allow me to approve a comment" do
               click_link "Approve this comment"
 
-              page.should have_content("has been approved")
+              expect(page).to have_content("has been approved")
             end
           end
         end
@@ -106,13 +106,13 @@ module Refinery
           let!(:blog_comment) { FactoryGirl.create(:blog_comment) }
           before { visit refinery.blog_admin_comment_path(blog_comment) }
           it "should display the comment" do
-            page.should have_content(blog_comment.body)
-            page.should have_content(blog_comment.name)
+            expect(page).to have_content(blog_comment.body)
+            expect(page).to have_content(blog_comment.name)
           end
           it "should allow me to approve the comment" do
             click_link "Approve this comment"
 
-            page.should have_content("has been approved")
+            expect(page).to have_content("has been approved")
           end
         end
       end

data/spec/features/refinery/blog/admin/menu_spec.rb

@@ -1,13 +1,19 @@
 require 'spec_helper'
 
-describe "Blog menu entry" do
-  refinery_login_with :refinery_user
-  
-  it "is highlighted when managing the blog" do
-    visit refinery.admin_root_path
+module Refinery
+  module Blog
+    module Admin
+      describe Menu, type: :feature do
+        refinery_login_with_devise :authentication_devise_refinery_superuser
 
-    within("#menu") { click_link "Blog" }
+        it "is highlighted when managing the blog" do
+          visit refinery.admin_root_path
 
-    page.should have_css("a.active", :text => "Blog")
+          within("#menu") { click_link "Blog" }
+
+          expect(page).to have_css("a.active", :text => "Blog")
+        end
+      end
+    end
   end
-end
+end

data/spec/features/refinery/blog/admin/posts_spec.rb

@@ -4,8 +4,8 @@ require "spec_helper"
 module Refinery
   module Blog
     module Admin
-      describe Post do
-        refinery_login_with :refinery_user
+      describe Post, type: :feature do
+        refinery_login_with_devise :authentication_devise_refinery_superuser
 
         let!(:blog_category) do
           Globalize.with_locale(:en) { FactoryGirl.create(:blog_category) }
@@ -18,7 +18,7 @@ module Refinery
             before { visit refinery.blog_admin_posts_path }
 
             it "invites to create new post" do
-              page.should have_content("There are no Blog Posts yet. Click \"Create new post\" to add your first blog post.")
+              expect(page).to have_content("There are no Blog Posts yet. Click \"Create new post\" to add your first blog post.")
             end
           end
 
@@ -29,64 +29,63 @@ module Refinery
             end
 
             it "should have Tags" do
-              page.should have_content("Tags")
+              expect(page).to have_content("Tags")
             end
 
-            it "should have category title", :js => true do
-              click_link "toggle_advanced_options"
-              page.should have_content(blog_category.title)
+            it "should have category title" do
+              expect(page).to have_content(blog_category.title)
             end
 
-            describe "create blog post", :js => true do
+            describe "create blog post" do
               before do
+                expect(subject.class.count).to eq(0)
                 fill_in "post_title", :with => "This is my blog post"
-                # this is a dirty hack but textarea that needs to be filled is
-                # hidden and capybara refuses to fill in elements it can't see
-                page.evaluate_script("WYMeditor.INSTANCES[0].html('<p>And I love it</p>')")
-                click_link "toggle_advanced_options"
-                check blog_category.title
+                fill_in "post_body", with: "<p>And I love it</p>"
+
+                expect(page).to have_css '.blog_categories'
+                expect(page).to have_css "#post_category_ids_#{blog_category.id}"
+                expect { check(blog_category.title) }.to change {
+                  !!page.find("#post_category_ids_#{blog_category.id}").checked?
+                }.from(false).to(true)
+
                 click_button "Save"
-              end
 
-              it "should succeed" do
-                page.should have_content("was successfully added.")
+                expect(page).to have_content("was successfully added.")
               end
 
               it "should be the only blog post" do
-                subject.class.count.should eq(1)
+                expect(subject.class.count).to eq(1)
               end
 
               it "should belong to me" do
-                subject.class.first.author.should eq(::Refinery::User.last)
+                expect(subject.class.first.author).to eq(::Refinery::Blog.user_class.last)
               end
 
               it "should save categories" do
-                subject.class.last.categories.count.should eq(1)
-                subject.class.last.categories.first.title.should eq(blog_category.title)
+                expect(subject.class.last.categories.count).to eq(1)
+                expect(subject.class.last.categories.first.title).to eq(blog_category.title)
               end
             end
 
-            describe "create blog post with tags", :js => true do
+            describe "create blog post with tags" do
+              let(:tag_list) { "chicago, bikes, beers, babes" }
               before do
-                @tag_list = "chicago, bikes, beers, babes"
                 fill_in "Title", :with => "This is a tagged blog post"
-                # this is a dirty hack but textarea that needs to be filled is
-                # hidden and capybara refuses to fill in elements it can't see
-                page.evaluate_script("WYMeditor.INSTANCES[0].html('<p>And I also love it</p>')")
-                fill_in "Tags", :with => @tag_list
+                fill_in "post_body", with: "<p>And I also love it</p>"
+                fill_in "Tags", :with => tag_list
                 click_button "Save"
               end
 
               it "should succeed" do
-                page.should have_content("was successfully added.")
+                expect(page).to have_content("was successfully added.")
               end
 
               it "should be the only blog post" do
-                subject.class.count.should eq(1)
+                expect(subject.class.count).to eq(1)
               end
 
               it "should have the specified tags" do
-                subject.class.last.tag_list.sort.should eq(@tag_list.split(', ').sort)
+                expect(subject.class.last.tag_list.sort).to eq(tag_list.split(', ').sort)
               end
             end
           end
@@ -102,26 +101,26 @@ module Refinery
 
             describe "edit blog post" do
               it "should succeed" do
-                page.should have_content(blog_post.title)
+                expect(page).to have_content(blog_post.title)
 
                 click_link("Edit this blog post")
-                current_path.should == refinery.edit_blog_admin_post_path(blog_post)
+                expect(current_path).to eq(refinery.edit_blog_admin_post_path(blog_post))
 
                 fill_in "post_title", :with => "hax0r"
                 click_button "Save"
 
-                page.should_not have_content(blog_post.title)
-                page.should have_content("'hax0r' was successfully updated.")
+                expect(page).not_to have_content(blog_post.title)
+                expect(page).to have_content("'hax0r' was successfully updated.")
               end
             end
 
             describe "deleting blog post" do
               it "should succeed" do
-                page.should have_content(blog_post.title)
+                expect(page).to have_content(blog_post.title)
 
                 click_link "Remove this blog post forever"
 
-                page.should have_content("'#{blog_post.title}' was successfully removed.")
+                expect(page).to have_content("'#{blog_post.title}' was successfully removed.")
               end
             end
 
@@ -129,8 +128,8 @@ module Refinery
               it "redirects to blog post in the frontend" do
                 click_link "View this blog post live"
 
-                current_path.should == refinery.blog_post_path(blog_post)
-                page.should have_content(blog_post.title)
+                expect(current_path).to eq(refinery.blog_post_path(blog_post))
+                expect(page).to have_content(blog_post.title)
               end
             end
           end
@@ -138,7 +137,7 @@ module Refinery
           context "when uncategorized post" do
             it "shows up in the list" do
               visit refinery.uncategorized_blog_admin_posts_path
-              page.should have_content(blog_post.title)
+              expect(page).to have_content(blog_post.title)
             end
           end
 
@@ -148,37 +147,31 @@ module Refinery
               blog_post.save!
 
               visit refinery.uncategorized_blog_admin_posts_path
-              page.should_not have_content(blog_post.title)
+              expect(page).not_to have_content(blog_post.title)
             end
           end
         end
 
         context "with multiple users" do
-          let!(:other_guy) { FactoryGirl.create(:refinery_user, :username => "Other Guy") }
+          let!(:other_guy) { FactoryGirl.create(:authentication_devise_refinery_user, :username => "Other Guy") }
 
-          describe "create blog post with alternate author", :js => true do
+          describe "create blog post with alternate author" do
             before do
               visit refinery.blog_admin_posts_path
               click_link "Create new post"
 
               fill_in "post_title", :with => "This is some other guy's blog post"
-              # this is a dpage_titleirty hack but textarea that needs to be filled is
-              # hidden and capybara refuses to fill in elements it can't see
-              page.evaluate_script("WYMeditor.INSTANCES[0].html('<p>I totally did not write it.</p>')")
-
-              click_link "toggle_advanced_options"
+              fill_in "post_body", with: "<p>I totally did not write it.</p>"
 
+              expect(page).to have_content("Author")
               select other_guy.username, :from => "Author"
 
               click_button "Save"
-            end
-
-            it "should succeed" do
-              page.should have_content("was successfully added.")
+              expect(page).to have_content("was successfully added.")
             end
 
             it "belongs to another user" do
-              subject.class.last.author.should eq(other_guy)
+              expect(subject.class.last.author).to eq(other_guy)
             end
           end
         end
@@ -186,7 +179,7 @@ module Refinery
         context "with translations" do
           before do
             Globalize.locale = :en
-            Refinery::I18n.stub(:frontend_locales).and_return([:en, :ru])
+            allow(Refinery::I18n).to receive(:frontend_locales).and_return([:en, :ru])
             blog_page = FactoryGirl.create(:page, :link_url => "/blog", :title => "Blog")
             Globalize.with_locale(:ru) do
               blog_page.title = 'блог'
@@ -201,29 +194,36 @@ module Refinery
               fill_in "Title", :with => "Post"
               fill_in "post_body", :with => "One post in my blog"
               click_button "Save"
-              @p = Refinery::Blog::Post.find_by_title("Post")
+              @p = Refinery::Blog::Post.by_title("Post")
             end
 
             it "succeeds" do
-              page.should have_content("'Post' was successfully added.")
-              Refinery::Blog::Post.count.should eq(1)
+              expect(page).to have_content("'Post' was successfully added.")
+              expect(Refinery::Blog::Post.count).to eq(1)
             end
 
-            it "shows locale flag for post" do
+            it "shows locale for post" do
 
               within "#post_#{@p.id}" do
-                page.should have_css("img[src='/assets/refinery/icons/flags/en.png']")
+                expect(page).to have_css(".locale .en")
               end
             end
 
             it "shows up in blog page for default locale" do
-              visit refinery.blog_root_path
-              page.should have_selector("#post_#{@p.id}")
+              visit refinery.blog_admin_root_path
+              expect(page).to have_selector("#post_#{@p.id}")
+            end
+
+            it "does show locale for default locale" do
+              within "#post_#{@p.id}" do
+                expect(page).to have_css(".locale .en")
+              end
             end
 
-            it "does not show up in blog page for secondary locale" do
-              visit refinery.blog_root_path(:locale => :ru)
-              page.should_not have_selector("#post_#{@p.id}")
+            it "does not show locale for secondary locale" do
+              within "#post_#{@p.id}" do
+                expect(page).not_to have_css(".locale .ru")
+              end
             end
 
           end
@@ -235,45 +235,46 @@ module Refinery
             before do
               click_link "Create new post"
               within "#switch_locale_picker" do
-                click_link "Ru"
+                click_link "RU"
               end
               fill_in "Title", :with => ru_page_title
               fill_in "post_body", :with => "One post in my blog"
               click_button "Save"
-              @p = Refinery::Blog::Post.find_by_title("Новости")
+              @p = Refinery::Blog::Post.by_title(ru_page_title)
             end
 
             it "succeeds" do
-              page.should have_content("was successfully added.")
-              Refinery::Blog::Post.count.should eq(1)
+              expect(page).to have_content("was successfully added.")
+              expect(Refinery::Blog::Post.count).to eq(1)
             end
 
             it "shows title in secondary locale" do
               within "#post_#{@p.id}" do
-                page.should have_content(ru_page_title)
+                expect(page).to have_content(ru_page_title)
               end
             end
 
-            it "shows locale flag for post" do
+            it "shows locale for post" do
               within "#post_#{@p.id}" do
-                page.should have_css("img[src='/assets/refinery/icons/flags/ru.png']")
+                expect(page).to have_css(".locale .ru")
               end
             end
 
-            it "does not show locale flag for primary locale" do
+            it "does not show locale for primary locale" do
               within "#post_#{@p.id}" do
-                page.should_not have_css("img[src='/assets/refinery/icons/flags/en.png']")
+                expect(page).not_to have_css(".locale .en")
               end
             end
 
-            it "does not show up in blog page for default locale" do
-              visit refinery.blog_root_path
-              page.should_not have_selector("#post_#{@p.id}")
+            it "does show locale for secondary locale" do
+              within "#post_#{@p.id}" do
+                expect(page).to have_css(".locale .ru")
+              end
             end
 
             it "shows up in blog page for secondary locale" do
-              visit refinery.blog_root_path(:locale => :ru)
-              page.should have_selector("#post_#{@p.id}")
+              visit refinery.blog_admin_root_path(:locale => :ru)
+              expect(page).to have_selector("#post_#{@p.id}")
             end
 
           end
@@ -293,10 +294,10 @@ module Refinery
               visit refinery.blog_admin_posts_path
             end
 
-            it "shows both locale flags for post" do
+            it "shows both locales for post" do
               within "#post_#{blog_post.id}" do
-                page.should have_css("img[src='/assets/refinery/icons/flags/en.png']")
-                page.should have_css("img[src='/assets/refinery/icons/flags/ru.png']")
+                expect(page).to have_css(".locale .en")
+                expect(page).to have_css(".locale .ru")
               end
             end
 
@@ -304,31 +305,43 @@ module Refinery
               it "succeeds" do
 
                 within "#post_#{blog_post.id}" do
-                  click_link("En")
+                  click_link("EN")
                 end
-                current_path.should == refinery.edit_blog_admin_post_path(blog_post)
+                expect(current_path).to eq(refinery.edit_blog_admin_post_path(blog_post))
                 fill_in "Title", :with => "New Post Title"
                 click_button "Save"
 
-                page.should_not have_content(blog_post.title)
-                page.should have_content("'New Post Title' was successfully updated.")
+                expect(page).not_to have_content(blog_post.title)
+                expect(page).to have_content("'New Post Title' was successfully updated.")
               end
             end
 
             describe "edit the post in secondary locale" do
               it "succeeds" do
                 within "#post_#{blog_post.id}" do
-                  click_link("Ru")
+                  click_link("RU")
                 end
 
                 fill_in "Title", :with => "Нов"
                 click_button "Save"
 
-                page.should_not have_content(blog_post.title)
-                page.should have_content("'Нов' was successfully updated.")
+                expect(page).not_to have_content(blog_post.title)
+                expect(page).to have_content("'Нов' was successfully updated.")
               end
             end
 
+            describe "delete the post translation in secondary locale" do
+              it "succeeds" do
+                within "#post_#{blog_post.id}" do
+                  click_link("RU")
+                end
+
+                click_link "Remove this translation"
+
+                expect(page).not_to have_content(blog_post.title)
+                expect(page).to have_content("The translation was successfully removed.")
+              end
+            end
           end
         end