refinerycms-blog 2.1.0 → 3.0.1

data/spec/features/refinery/blog/categories_spec.rb

@@ -1,28 +1,30 @@
 require "spec_helper"
 
 module Refinery
-  describe "BlogCategories" do
-    refinery_login_with :refinery_user
+  module Blog
+    describe Category, type: :feature do
+      refinery_login_with_devise :authentication_devise_refinery_user
 
-    context "has one category and post" do
-      before do
-        post = Globalize.with_locale(:en) do
-          FactoryGirl.create(:blog_post, :title => "Refinery CMS blog post")
+      context "has one category and post" do
+        before do
+          post = Globalize.with_locale(:en) do
+            FactoryGirl.create(:blog_post, :title => "Refinery CMS blog post")
+          end
+          @category = Globalize.with_locale(:en) do
+            FactoryGirl.create(:blog_category, :title => "Video Games")
+          end
+          post.categories << @category
+          post.save!
         end
-        @category = Globalize.with_locale(:en) do
-          FactoryGirl.create(:blog_category, :title => "Video Games")
-        end
-        post.categories << @category
-        post.save!
-      end
 
-      describe "show categories blog posts" do
-        it "should displays categories blog posts" do
-          visit refinery.blog_category_path(@category)
-          page.should have_content("Refinery CMS blog post")
-          page.should have_content("Video Games")
+        describe "show categories blog posts" do
+          it "should displays categories blog posts" do
+            visit refinery.blog_category_path(@category)
+            expect(page).to have_content("Refinery CMS blog post")
+            expect(page).to have_content("Video Games")
+          end
         end
       end
     end
   end
-end
+end

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

@@ -1,178 +1,182 @@
 require "spec_helper"
 
 module Refinery
-  describe "Blog::Posts" do
-    refinery_login_with :refinery_user
+  module Blog
+    describe Post, type: :feature do
+      refinery_login_with_devise :authentication_devise_refinery_user
 
-    context "when has blog posts" do
-      let!(:blog_post) do
-        Globalize.with_locale(:en) { FactoryGirl.create(:blog_post, :title => "Refinery CMS blog post") }
-      end
+      context "when has blog posts" do
+        let!(:blog_post) do
+          Globalize.with_locale(:en) { FactoryGirl.create(:blog_post, :title => "Refinery CMS blog post") }
+        end
 
-      it "should display blog post" do
-        visit refinery.blog_post_path(blog_post)
+        it "should display blog post" do
+          visit refinery.blog_post_path(blog_post)
 
-        page.should have_content(blog_post.title)
-      end
+          expect(page).to have_content(blog_post.title)
+        end
 
-      describe "visit blog" do
+        describe "visit blog" do
 
-        before do
-          FactoryGirl.create(:page, :link_url => "/")
-          FactoryGirl.create(:page, :link_url => "/blog", :title => "Blog")
-        end
+          before do
+            FactoryGirl.create(:page, :link_url => "/")
+            FactoryGirl.create(:page, :link_url => "/blog", :title => "Blog")
+          end
 
-        it "shows blog link in menu" do
-          visit "/"
-          within "#menu" do
-            page.should have_content("Blog")
-            page.should have_selector("a[href='/blog']")
+          it "shows blog link in menu" do
+            visit "/"
+            within "#menu" do
+              expect(page).to have_content("Blog")
+              expect(page).to have_selector("a[href='/blog']")
+            end
+          end
+
+          it "shows blog posts" do
+            visit refinery.blog_root_path
+            expect(page).to have_content blog_post.title
           end
-        end
 
-        it "shows blog posts" do
-          visit refinery.blog_root_path
-          page.should have_content blog_post.title
         end
 
       end
 
-    end
-
-    describe "list tagged posts" do
-      context "when has tagged blog posts" do
-        before do
-          @tag_name = "chicago"
-          @post = FactoryGirl.create(:blog_post,
-                                          :title => "I Love my city",
-                                          :tag_list => @tag_name)
-          @tag = ::Refinery::Blog::Post.tag_counts_on(:tags).first
-        end
-        it "should have one tagged post" do
-          visit refinery.blog_tagged_posts_path(@tag.id, @tag_name.parameterize)
-
-          page.should have_content(@tag_name)
-          page.should have_content(@post.title)
+      describe "list tagged posts" do
+        context "when has tagged blog posts" do
+          let!(:tag_name) { "chicago" }
+          let!(:post) {
+            FactoryGirl.create(:blog_post,
+              :title => "I Love my city",
+              :tag_list => tag_name
+            )
+          }
+          let!(:tag) { ::Refinery::Blog::Post.tag_counts_on(:tags).first }
+
+          it "should have one tagged post" do
+            visit refinery.blog_tagged_posts_path(tag.id, tag_name.parameterize)
+
+            expect(page).to have_content(tag_name)
+            expect(page).to have_content(post.title)
+          end
         end
       end
-    end
 
-    describe "#show" do
-      context "when has no comments" do
-        let(:blog_post) { FactoryGirl.create(:blog_post) }
+      describe "#show" do
+        context "when has no comments" do
+          let!(:blog_post) { FactoryGirl.create(:blog_post) }
 
-        it "should display the blog post" do
-          visit refinery.blog_post_path(blog_post)
-          page.should have_content(blog_post.title)
-          page.should have_content(blog_post.body)
+          it "should display the blog post" do
+            visit refinery.blog_post_path(blog_post)
+            expect(page).to have_content(blog_post.title)
+            expect(page).to have_content(blog_post.body)
+          end
         end
-      end
-      context "when has approved comments" do
-        let(:approved_comment) { FactoryGirl.create(:approved_comment) }
+        context "when has approved comments" do
+          let!(:approved_comment) { FactoryGirl.create(:approved_comment) }
 
-        it "should display the comments" do
-          visit refinery.blog_post_path(approved_comment.post)
+          it "should display the comments" do
+            visit refinery.blog_post_path(approved_comment.post)
 
-          page.should have_content(approved_comment.body)
-          page.should have_content("Posted by #{approved_comment.name}")
+            expect(page).to have_content(approved_comment.body)
+            expect(page).to have_content("Posted by #{approved_comment.name}")
+          end
         end
-      end
-      context "when has rejected comments" do
-        let(:rejected_comment) { FactoryGirl.create(:rejected_comment) }
+        context "when has rejected comments" do
+          let!(:rejected_comment) { FactoryGirl.create(:rejected_comment) }
 
-        it "should not display the comments" do
-          visit refinery.blog_post_path(rejected_comment.post)
+          it "should not display the comments" do
+            visit refinery.blog_post_path(rejected_comment.post)
 
-          page.should_not have_content(rejected_comment.body)
+            expect(page).not_to have_content(rejected_comment.body)
+          end
         end
-      end
-      context "when has new comments" do
-        let(:blog_comment) { FactoryGirl.create(:blog_comment) }
+        context "when has new comments" do
+          let!(:blog_comment) { FactoryGirl.create(:blog_comment) }
 
-        it "should not display the comments" do
-          visit refinery.blog_post_path(blog_comment.post)
+          it "should not display the comments" do
+            visit refinery.blog_post_path(blog_comment.post)
 
-          page.should_not have_content(blog_comment.body)
+            expect(page).not_to have_content(blog_comment.body)
+          end
         end
-      end
 
-      context "when posting comments" do
-        let(:blog_post) { FactoryGirl.create(:blog_post) }
-        let(:name) { "pete" }
-        let(:email) { "pete@mcawesome.com" }
-        let(:body) { "Witty comment." }
+        context "when posting comments" do
+          let!(:blog_post) { FactoryGirl.create(:blog_post) }
+          let(:name) { "pete" }
+          let(:email) { "pete@mcawesome.com" }
+          let(:body) { "Witty comment." }
 
-        before do
-          visit refinery.blog_post_path(blog_post)
+          before do
+            visit refinery.blog_post_path(blog_post)
 
-          fill_in "Name", :with => name
-          fill_in "Email", :with => email
-          fill_in "Message", :with => body
-          click_button "Send comment"
-        end
+            fill_in "Name", :with => name
+            fill_in "Email", :with => email
+            fill_in "Message", :with => body
+            click_button "Send comment"
+          end
 
-        it "creates the comment" do
-          comment = blog_post.reload.comments.last
+          it "creates the comment" do
+            comment = blog_post.reload.comments.last
 
-          comment.name.should eq(name)
-          comment.email.should eq(email)
-          comment.body.should eq(body)
+            expect(comment.name).to eq(name)
+            expect(comment.email).to eq(email)
+            expect(comment.body).to eq(body)
+          end
         end
-      end
 
-      context "post popular" do
-        let(:blog_post) { FactoryGirl.create(:blog_post) }
-        let(:blog_post2) { FactoryGirl.create(:blog_post) }
+        context "post popular" do
+          let!(:blog_post) { FactoryGirl.create(:blog_post) }
+          let!(:blog_post2) { FactoryGirl.create(:blog_post) }
 
-        before do
-          visit refinery.blog_post_path(blog_post)
-        end
+          before do
+            visit refinery.blog_post_path(blog_post)
+          end
 
-        it "should increment access count" do
-          blog_post.reload.access_count.should eq(1)
-          visit refinery.blog_post_path(blog_post)
-          blog_post.reload.access_count.should eq(2)
-        end
+          it "should increment access count" do
+            expect(blog_post.reload.access_count).to eq(1)
+            visit refinery.blog_post_path(blog_post)
+            expect(blog_post.reload.access_count).to eq(2)
+          end
 
-        it "should be most popular" do
-          Refinery::Blog::Post.popular(2).first.should eq(blog_post)
+          it "should be most popular" do
+            expect(Refinery::Blog::Post.popular(2).first).to eq(blog_post)
+          end
         end
-      end
 
-      context "post recent" do
-        let!(:blog_post) { FactoryGirl.create(:blog_post, :published_at => Time.now - 5.minutes) }
-        let!(:blog_post2) { FactoryGirl.create(:blog_post, :published_at => Time.now - 2.minutes) }
+        context "post recent" do
+          let!(:blog_post) { FactoryGirl.create(:blog_post, :published_at => Time.now - 5.minutes) }
+          let!(:blog_post2) { FactoryGirl.create(:blog_post, :published_at => Time.now - 2.minutes) }
 
-        it "should be the most recent" do
-          Refinery::Blog::Post.recent(2).first.id.should eq(blog_post2.id)
+          it "should be the most recent" do
+            expect(Refinery::Blog::Post.recent(2).first.id).to eq(blog_post2.id)
+          end
         end
-      end
 
-    end
+      end
 
-    describe "#show draft preview" do
-      let(:blog_post) { FactoryGirl.create(:blog_post_draft) }
+      describe "#show draft preview" do
+        let!(:blog_post) { FactoryGirl.create(:blog_post_draft) }
 
-      context "when logged in as admin" do
-        it "should display the draft notification" do
-          visit refinery.blog_post_path(blog_post)
+        context "when logged in as admin" do
+          it "should display the draft notification" do
+            visit refinery.blog_post_path(blog_post)
 
-          page.should have_content('This page is NOT live for public viewing.')
+            expect(page).to have_content('This page is NOT live for public viewing.')
+          end
         end
-      end
 
-      context "when not logged in as an admin" do
-        before do
-          # TODO: remove Refinery::Pages::Engine.load_seed dependency.
-          # It's here to temporary fix the issue with 404 after visiting logout path.
-          Refinery::Pages::Engine.load_seed
-          visit refinery.logout_path
-        end
+        context "when not logged in as an admin" do
+          before do
+            # TODO: remove Refinery::Pages::Engine.load_seed dependency.
+            # It's here to temporary fix the issue with 404 after visiting logout path.
+            Refinery::Pages::Engine.load_seed
+            visit refinery.logout_path
+          end
 
-        it "should not display the blog post" do
-          visit refinery.blog_post_path(blog_post)
+          it "should not display the blog post" do
+            visit refinery.blog_post_path(blog_post)
 
-          page.should have_content("The page you requested was not found.")
+            expect(page).to have_content("The page you requested was not found.")
+          end
         end
       end
     end

data/spec/helpers/refinery/blog/posts_helper_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 module Refinery
   module Blog
-    describe PostsHelper do
-      describe "#blog_archive_widget" do
+    describe PostsHelper, :type => :helper do
+      describe "#blog_archive_widget", type: :helper do
         let(:html) { helper.blog_archive_widget(dates) }
         let(:links) { Capybara.string(html).find("#blog_archive_widget ul") }
 
@@ -11,7 +11,7 @@ module Refinery
           let(:dates) { [] }
 
           it "does not display anything" do
-            html.should be_blank
+            expect(html).to be_blank
           end
         end
 
@@ -29,18 +29,18 @@ module Refinery
             month = Date::MONTHNAMES[recent_post.month]
             year = recent_post.year
 
-            links.should have_link("#{month} #{year} (3)")
+            expect(links).to have_link("#{month} #{year} (3)")
           end
 
           it "has a link for the year of dates older than one year" do
             year = old_post.year
 
-            links.should have_link("#{year} (3)")
+            expect(links).to have_link("#{year} (3)")
           end
 
           it "sorts recent links before old links" do
-            links.find("li:first").should have_content(recent_post.year.to_s)
-            links.find("li:last").should have_content(old_post.year.to_s)
+            expect(links.find("li:first")).to have_content(recent_post.year.to_s)
+            expect(links.find("li:last")).to have_content(old_post.year.to_s)
           end
         end
 
@@ -50,8 +50,8 @@ module Refinery
           it "sorts by the more recent date" do
             first, second = dates.map {|p| Date::MONTHNAMES[p.month] }
 
-            links.find("li:first").should have_content(second)
-            links.find("li:last").should have_content(first)
+            expect(links.find("li:first")).to have_content(second)
+            expect(links.find("li:last")).to have_content(first)
           end
         end
 
@@ -61,8 +61,8 @@ module Refinery
           it "sorts by the more recent date" do
             first, second = dates.map {|p| p.year.to_s }
 
-            links.find("li:first").should have_content(second)
-            links.find("li:last").should have_content(first)
+            expect(links.find("li:first")).to have_content(second)
+            expect(links.find("li:last")).to have_content(first)
           end
         end
       end
@@ -71,11 +71,11 @@ module Refinery
         let(:email) { "test@test.com" }
 
         it "returns gravatar url" do
-          helper.avatar_url(email).should eq("http://gravatar.com/avatar/b642b4217b34b1e8d3bd915fc65c4452?s=60.jpg")
+          expect(helper.avatar_url(email)).to eq("http://gravatar.com/avatar/b642b4217b34b1e8d3bd915fc65c4452?s=60.jpg")
         end
 
         it "accepts options hash to change default size" do
-          helper.avatar_url(email, :size => 55).should eq("http://gravatar.com/avatar/b642b4217b34b1e8d3bd915fc65c4452?s=55.jpg")
+          expect(helper.avatar_url(email, :size => 55)).to eq("http://gravatar.com/avatar/b642b4217b34b1e8d3bd915fc65c4452?s=55.jpg")
         end
       end
     end

data/spec/lib/refinery/blog/engine_spec.rb

@@ -3,22 +3,12 @@ require 'spec_helper'
 module Refinery
   module Blog
     describe Engine do
-      describe "plugin activity" do
-        let(:activity) do
-          Refinery::Plugins.registered.find_by_name("refinerycms_blog").activity.first
-        end
-
-        it "sets the correct path for activity entries" do
-          activity.url.should eq("refinery.edit_blog_admin_post_path")
-        end
-      end
-
       describe ".load_seed" do
         it "is idempotent" do
           Engine.load_seed
           Engine.load_seed
 
-          Refinery::Page.where(:link_url => '/blog').count.should eq(1)
+          expect(Refinery::Page.where(:link_url => '/blog').count).to eq(1)
         end
       end
     end