refinerycms-blog 3.0.2 → 4.0.0

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

@@ -4,7 +4,7 @@ module Refinery
   module Blog
     module Admin
       describe Menu, type: :feature do
-        refinery_login_with_devise :authentication_devise_refinery_superuser
+        refinery_login
 
         it "is highlighted when managing the blog" do
           visit refinery.admin_root_path
@@ -16,4 +16,4 @@ module Refinery
       end
     end
   end
-end
+end

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

@@ -1,14 +1,27 @@
 # encoding: utf-8
 require "spec_helper"
 
+shared_context "with_user_class" do
+  # This context changes the user class and updates the author association on Post.
+  before :each do
+    @old_user_class = Refinery::Blog.user_class
+    allow(Refinery::Blog).to receive(:user_class).and_return(Refinery::Blog::TestUser)
+    Refinery::Blog::Post.reflections['author'].instance_variable_set(:@class_name, Refinery::Blog.user_class.to_s)
+  end
+
+  after :each do
+    Refinery::Blog::Post.reflections['author'].instance_variable_set(:@class_name, @old_user_class.to_s)
+  end
+end
+
 module Refinery
   module Blog
     module Admin
       describe Post, type: :feature do
-        refinery_login_with_devise :authentication_devise_refinery_superuser
+        refinery_login
 
         let!(:blog_category) do
-          Globalize.with_locale(:en) { FactoryGirl.create(:blog_category) }
+          Globalize.with_locale(:en) { FactoryBot.create(:blog_category) }
         end
 
         context "when no blog posts" do
@@ -39,8 +52,9 @@ module Refinery
             describe "create blog post" do
               before do
                 expect(subject.class.count).to eq(0)
-                fill_in "post_title", :with => "This is my blog post"
+                fill_in "post_title", with: "This is my blog post"
                 fill_in "post_body", with: "<p>And I love it</p>"
+                fill_in "post_user_id", with: "John Doe"
 
                 expect(page).to have_css '.blog_categories'
                 expect(page).to have_css "#post_category_ids_#{blog_category.id}"
@@ -57,10 +71,6 @@ module Refinery
                 expect(subject.class.count).to eq(1)
               end
 
-              it "should belong to me" do
-                expect(subject.class.first.author).to eq(::Refinery::Blog.user_class.last)
-              end
-
               it "should save categories" do
                 expect(subject.class.last.categories.count).to eq(1)
                 expect(subject.class.last.categories.first.title).to eq(blog_category.title)
@@ -70,9 +80,10 @@ module Refinery
             describe "create blog post with tags" do
               let(:tag_list) { "chicago, bikes, beers, babes" }
               before do
-                fill_in "Title", :with => "This is a tagged blog post"
+                fill_in "Title", with: "This is a tagged blog post"
                 fill_in "post_body", with: "<p>And I also love it</p>"
-                fill_in "Tags", :with => tag_list
+                fill_in "post_user_id", with: "John Doe"
+                fill_in "Tags", with: tag_list
                 click_button "Save"
               end
 
@@ -93,7 +104,7 @@ module Refinery
 
         context "when has blog posts" do
           let!(:blog_post) do
-            Globalize.with_locale(:en) { FactoryGirl.create(:blog_post) }
+            Globalize.with_locale(:en) { FactoryBot.create(:blog_post) }
           end
 
           describe "blog post listing" do
@@ -153,7 +164,9 @@ module Refinery
         end
 
         context "with multiple users" do
-          let!(:other_guy) { FactoryGirl.create(:authentication_devise_refinery_user, :username => "Other Guy") }
+          include_context "with_user_class"
+
+          let!(:other_guy) { FactoryBot.create(:blog_test_user, :username => "Other Guy") }
 
           describe "create blog post with alternate author" do
             before do
@@ -164,7 +177,7 @@ module Refinery
               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"
+              select other_guy.username, from: "Author"
 
               click_button "Save"
               expect(page).to have_content("was successfully added.")
@@ -180,7 +193,7 @@ module Refinery
           before do
             Globalize.locale = :en
             allow(Refinery::I18n).to receive(:frontend_locales).and_return([:en, :ru])
-            blog_page = FactoryGirl.create(:page, :link_url => "/blog", :title => "Blog")
+            blog_page = FactoryBot.create(:page, :link_url => "/blog", :title => "Blog")
             Globalize.with_locale(:ru) do
               blog_page.title = 'блог'
               blog_page.save
@@ -191,8 +204,9 @@ module Refinery
           describe "add a blog post with title for default locale" do
             before do
               click_link "Create new post"
-              fill_in "Title", :with => "Post"
-              fill_in "post_body", :with => "One post in my blog"
+              fill_in "Title", with: "Post"
+              fill_in "post_body", with: "One post in my blog"
+              fill_in "post_user_id", with: "John Doe"
               click_button "Save"
               @p = Refinery::Blog::Post.by_title("Post")
             end
@@ -237,8 +251,9 @@ module Refinery
               within "#switch_locale_picker" do
                 click_link "RU"
               end
-              fill_in "Title", :with => ru_page_title
-              fill_in "post_body", :with => "One post in my blog"
+              fill_in "Title", with: ru_page_title
+              fill_in "post_body", with: "One post in my blog"
+              fill_in "post_user_id", with: "John Doe"
               click_button "Save"
               @p = Refinery::Blog::Post.by_title(ru_page_title)
             end
@@ -282,7 +297,7 @@ module Refinery
           context "with a blog post in both locales" do
 
             let!(:blog_post) do
-              _blog_post = Globalize.with_locale(:en) { FactoryGirl.create(:blog_post, :title => 'First Post') }
+              _blog_post = Globalize.with_locale(:en) { FactoryBot.create(:blog_post, :title => 'First Post') }
               Globalize.with_locale(:ru) do
                 _blog_post.title = 'Домашняя страница'
                 _blog_post.save
@@ -325,7 +340,6 @@ module Refinery
                 fill_in "Title", :with => "Нов"
                 click_button "Save"
 
-                expect(page).not_to have_content(blog_post.title)
                 expect(page).to have_content("'Нов' was successfully updated.")
               end
             end
@@ -338,7 +352,7 @@ module Refinery
 
                 click_link "Remove this translation"
 
-                expect(page).not_to have_content(blog_post.title)
+                expect(page).not_to have_content('RU')
                 expect(page).to have_content("The translation was successfully removed.")
               end
             end

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

@@ -3,15 +3,14 @@ require "spec_helper"
 module Refinery
   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")
+            FactoryBot.create(:blog_post, :title => "Refinery CMS blog post")
           end
           @category = Globalize.with_locale(:en) do
-            FactoryGirl.create(:blog_category, :title => "Video Games")
+            FactoryBot.create(:blog_category, :title => "Video Games")
           end
           post.categories << @category
           post.save!

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

@@ -3,11 +3,9 @@ require "spec_helper"
 module Refinery
   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") }
+          Globalize.with_locale(:en) { FactoryBot.create(:blog_post, :title => "Refinery CMS blog post") }
         end
 
         it "should display blog post" do
@@ -19,8 +17,8 @@ module Refinery
         describe "visit blog" do
 
           before do
-            FactoryGirl.create(:page, :link_url => "/")
-            FactoryGirl.create(:page, :link_url => "/blog", :title => "Blog")
+            FactoryBot.create(:page, :link_url => "/")
+            FactoryBot.create(:page, :link_url => "/blog", :title => "Blog")
           end
 
           it "shows blog link in menu" do
@@ -44,7 +42,7 @@ module Refinery
         context "when has tagged blog posts" do
           let!(:tag_name) { "chicago" }
           let!(:post) {
-            FactoryGirl.create(:blog_post,
+            FactoryBot.create(:blog_post,
               :title => "I Love my city",
               :tag_list => tag_name
             )
@@ -62,7 +60,7 @@ module Refinery
 
       describe "#show" do
         context "when has no comments" do
-          let!(:blog_post) { FactoryGirl.create(:blog_post) }
+          let!(:blog_post) { FactoryBot.create(:blog_post) }
 
           it "should display the blog post" do
             visit refinery.blog_post_path(blog_post)
@@ -71,7 +69,7 @@ module Refinery
           end
         end
         context "when has approved comments" do
-          let!(:approved_comment) { FactoryGirl.create(:approved_comment) }
+          let!(:approved_comment) { FactoryBot.create(:approved_comment) }
 
           it "should display the comments" do
             visit refinery.blog_post_path(approved_comment.post)
@@ -81,7 +79,7 @@ module Refinery
           end
         end
         context "when has rejected comments" do
-          let!(:rejected_comment) { FactoryGirl.create(:rejected_comment) }
+          let!(:rejected_comment) { FactoryBot.create(:rejected_comment) }
 
           it "should not display the comments" do
             visit refinery.blog_post_path(rejected_comment.post)
@@ -90,7 +88,7 @@ module Refinery
           end
         end
         context "when has new comments" do
-          let!(:blog_comment) { FactoryGirl.create(:blog_comment) }
+          let!(:blog_comment) { FactoryBot.create(:blog_comment) }
 
           it "should not display the comments" do
             visit refinery.blog_post_path(blog_comment.post)
@@ -100,7 +98,7 @@ module Refinery
         end
 
         context "when posting comments" do
-          let!(:blog_post) { FactoryGirl.create(:blog_post) }
+          let!(:blog_post) { FactoryBot.create(:blog_post) }
           let(:name) { "pete" }
           let(:email) { "pete@mcawesome.com" }
           let(:body) { "Witty comment." }
@@ -124,8 +122,8 @@ module Refinery
         end
 
         context "post popular" do
-          let!(:blog_post) { FactoryGirl.create(:blog_post) }
-          let!(:blog_post2) { FactoryGirl.create(:blog_post) }
+          let!(:blog_post) { FactoryBot.create(:blog_post) }
+          let!(:blog_post2) { FactoryBot.create(:blog_post) }
 
           before do
             visit refinery.blog_post_path(blog_post)
@@ -133,8 +131,11 @@ module Refinery
 
           it "should increment access count" do
             expect(blog_post.reload.access_count).to eq(1)
+            last_updated = blog_post.reload.updated_at
+
             visit refinery.blog_post_path(blog_post)
             expect(blog_post.reload.access_count).to eq(2)
+            expect(blog_post.reload.updated_at).to eq(last_updated)
           end
 
           it "should be most popular" do
@@ -143,8 +144,8 @@ module Refinery
         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) }
+          let!(:blog_post) { FactoryBot.create(:blog_post, :published_at => Time.now - 5.minutes) }
+          let!(:blog_post2) { FactoryBot.create(:blog_post, :published_at => Time.now - 2.minutes) }
 
           it "should be the most recent" do
             expect(Refinery::Blog::Post.recent(2).first.id).to eq(blog_post2.id)
@@ -154,7 +155,7 @@ module Refinery
       end
 
       describe "#show draft preview" do
-        let!(:blog_post) { FactoryGirl.create(:blog_post_draft) }
+        let!(:blog_post) { FactoryBot.create(:blog_post_draft) }
 
         context "when logged in as admin" do
           it "should display the draft notification" do
@@ -164,20 +165,6 @@ module Refinery
           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
-
-          it "should not display the blog post" do
-            visit refinery.blog_post_path(blog_post)
-
-            expect(page).to have_content("The page you requested was not found.")
-          end
-        end
       end
     end
   end

data/spec/models/refinery/blog/category_spec.rb

@@ -3,16 +3,15 @@ require 'spec_helper'
 module Refinery
   module Blog
     describe Category, type: :model do
-      let(:category) { FactoryGirl.create(:blog_category) }
-      let(:author) { FactoryGirl.create(:authentication_devise_refinery_user) }
+      let(:category) { FactoryBot.create(:blog_category) }
 
       describe "validations" do
         it "requires title" do
-          expect(FactoryGirl.build(:blog_category, :title => "")).not_to be_valid
+          expect(FactoryBot.build(:blog_category, :title => "")).not_to be_valid
         end
 
         it "won't allow duplicate titles" do
-          expect(FactoryGirl.build(:blog_category, :title => category.title)).not_to be_valid
+          expect(FactoryBot.build(:blog_category, :title => category.title)).not_to be_valid
         end
       end
 
@@ -22,15 +21,15 @@ module Refinery
         end
 
         it "returns posts by published_at date in descending order" do
-          first_post = category.posts.create!({ :title => "Breaking News: Joe Sak is hot stuff you guys!!",
-                                                :body => "True story.",
-                                                :published_at => Time.now.yesterday,
-                                                :author => author })
+          first_post = category.posts.create!({ title: "Breaking News: Joe Sak is hot stuff you guys!!",
+                                                body: "True story.",
+                                                published_at: Time.now.yesterday,
+                                                username: "John Doe" })
 
-          latest_post = category.posts.create!({ :title => "parndt is p. okay",
-                                                 :body => "For a Kiwi.",
-                                                 :published_at => Time.now,
-                                                 :author => author })
+          latest_post = category.posts.create!({ title: "parndt is p. okay",
+                                                 body: "For a Kiwi.",
+                                                 published_at: Time.now,
+                                                 username: "John Doe" })
 
           expect(category.posts.newest_first.first).to eq(latest_post)
         end
@@ -40,7 +39,7 @@ module Refinery
       describe "#post_count" do
         it "returns post count in category" do
           2.times do
-            category.posts << FactoryGirl.create(:blog_post)
+            category.posts << FactoryBot.create(:blog_post)
           end
           expect(category.post_count).to eq(2)
         end

data/spec/models/refinery/blog/comment_spec.rb

@@ -4,7 +4,7 @@ module Refinery
   module Blog
     describe Comment, type: :model do
       context "wiring up" do
-        let(:comment) { FactoryGirl.create(:blog_comment) }
+        let(:comment) { FactoryBot.create(:blog_comment) }
 
         it "saves" do
           expect(comment).not_to be_nil

data/spec/models/refinery/blog/post_spec.rb

@@ -3,19 +3,19 @@ require 'spec_helper'
 module Refinery
   module Blog
     describe Post, type: :model do
-      let(:post) { FactoryGirl.create(:blog_post) }
+      let(:post) { FactoryBot.create(:blog_post) }
 
       describe "validations" do
         it "requires title" do
-          expect(FactoryGirl.build(:blog_post, :title => "")).not_to be_valid
+          expect(FactoryBot.build(:blog_post, :title => "")).not_to be_valid
         end
 
         it "won't allow duplicate titles" do
-          expect(FactoryGirl.build(:blog_post, :title => post.title)).not_to be_valid
+          expect(FactoryBot.build(:blog_post, :title => post.title)).not_to be_valid
         end
 
         it "requires body" do
-          expect(FactoryGirl.build(:blog_post, :body => nil)).not_to be_valid
+          expect(FactoryBot.build(:blog_post, :body => nil)).not_to be_valid
         end
       end
 
@@ -26,7 +26,7 @@ module Refinery
         end
 
         it "destroys associated comments" do
-          FactoryGirl.create(:blog_comment, :blog_post_id => post.id)
+          FactoryBot.create(:blog_comment, :blog_post_id => post.id)
           post.destroy
           expect(Blog::Comment.where(:blog_post_id => post.id)).to be_empty
         end
@@ -50,6 +50,13 @@ module Refinery
       end
 
       describe "authors" do
+        before do
+          allow(Refinery::Blog).to receive(:user_class).and_return("Refinery::Authentication::Devise::User")
+        end
+
+        let(:author) { mock_model(::Refinery::Blog.user_class, id: 1) }
+        let(:blog_post) { FactoryBot.create(:blog_post, author: author) }
+
         it "are authored" do
           expect(described_class.instance_methods.map(&:to_sym)).to include(:author)
         end
@@ -57,11 +64,11 @@ module Refinery
 
       describe "by_month" do
         before do
-          @post1 = FactoryGirl.create(:blog_post, :published_at => Date.new(2011, 3, 11))
-          @post2 = FactoryGirl.create(:blog_post, :published_at => Date.new(2011, 3, 12))
+          @post1 = FactoryBot.create(:blog_post, :published_at => Date.new(2011, 3, 11))
+          @post2 = FactoryBot.create(:blog_post, :published_at => Date.new(2011, 3, 12))
 
           #2 months before
-          FactoryGirl.create(:blog_post, :published_at => Date.new(2011, 1, 10))
+          FactoryBot.create(:blog_post, :published_at => Date.new(2011, 1, 10))
         end
 
         it "returns all posts from specified month" do
@@ -74,9 +81,9 @@ module Refinery
 
       describe ".published_dates_older_than" do
         before do
-          @post1 = FactoryGirl.create(:blog_post, :published_at => Time.utc(2012, 05, 01, 15, 20))
-          @post2 = FactoryGirl.create(:blog_post, :published_at => Time.utc(2012, 05, 01, 15, 30))
-          FactoryGirl.create(:blog_post, :published_at => Time.now)
+          @post1 = FactoryBot.create(:blog_post, :published_at => Time.utc(2012, 05, 01, 15, 20))
+          @post2 = FactoryBot.create(:blog_post, :published_at => Time.utc(2012, 05, 01, 15, 30))
+          FactoryBot.create(:blog_post, :published_at => Time.now)
         end
 
         it "returns all published dates older than the argument" do
@@ -88,10 +95,10 @@ module Refinery
 
       describe "live" do
         before do
-          @post1 = FactoryGirl.create(:blog_post, :published_at => Time.now.advance(:minutes => -2))
-          @post2 = FactoryGirl.create(:blog_post, :published_at => Time.now.advance(:minutes => -1))
-          FactoryGirl.create(:blog_post, :draft => true)
-          FactoryGirl.create(:blog_post, :published_at => Time.now + 1.minute)
+          @post1 = FactoryBot.create(:blog_post, :published_at => Time.now.advance(:minutes => -2))
+          @post2 = FactoryBot.create(:blog_post, :published_at => Time.now.advance(:minutes => -1))
+          FactoryBot.create(:blog_post, :draft => true)
+          FactoryBot.create(:blog_post, :published_at => Time.now + 1.minute)
         end
 
         it "returns all posts which aren't in draft and pub date isn't in future" do
@@ -104,10 +111,10 @@ module Refinery
 
       describe "uncategorized" do
         before do
-          @uncategorized_post = FactoryGirl.create(:blog_post)
-          @categorized_post = FactoryGirl.create(:blog_post)
+          @uncategorized_post = FactoryBot.create(:blog_post)
+          @categorized_post = FactoryBot.create(:blog_post)
 
-          @categorized_post.categories << FactoryGirl.create(:blog_category)
+          @categorized_post.categories << FactoryBot.create(:blog_category)
         end
 
         it "returns uncategorized posts if they exist" do
@@ -118,22 +125,22 @@ module Refinery
 
       describe "#live?" do
         it "returns true if post is not in draft and it's published" do
-          expect(FactoryGirl.build(:blog_post)).to be_live
+          expect(FactoryBot.build(:blog_post)).to be_live
         end
 
         it "returns false if post is in draft" do
-          expect(FactoryGirl.build(:blog_post, :draft => true)).not_to be_live
+          expect(FactoryBot.build(:blog_post, :draft => true)).not_to be_live
         end
 
         it "returns false if post pub date is in future" do
-          expect(FactoryGirl.build(:blog_post, :published_at => Time.now.advance(:minutes => 1))).not_to be_live
+          expect(FactoryBot.build(:blog_post, :published_at => Time.now.advance(:minutes => 1))).not_to be_live
         end
       end
 
       describe "#next" do
         before do
-          FactoryGirl.create(:blog_post, :published_at => Time.now.advance(:days => -1))
-          @post = FactoryGirl.create(:blog_post)
+          FactoryBot.create(:blog_post, :published_at => Time.now.advance(:days => -1))
+          @post = FactoryBot.create(:blog_post)
         end
 
         it "returns next article when called on current article" do
@@ -143,8 +150,8 @@ module Refinery
 
       describe "#prev" do
         before do
-          FactoryGirl.create(:blog_post)
-          @post = FactoryGirl.create(:blog_post, :published_at => Time.now.advance(:days => -1))
+          FactoryBot.create(:blog_post)
+          @post = FactoryBot.create(:blog_post, :published_at => Time.now.advance(:days => -1))
         end
 
         it "returns previous article when called on current article" do
@@ -176,7 +183,7 @@ module Refinery
 
       describe "custom teasers" do
         it "should allow a custom teaser" do
-          expect(FactoryGirl.create(:blog_post, :custom_teaser => 'This is some custom content')).to be_valid
+          expect(FactoryBot.create(:blog_post, :custom_teaser => 'This is some custom content')).to be_valid
         end
       end
 
@@ -204,7 +211,7 @@ module Refinery
 
       describe "source url" do
         it "should allow a source url and title" do
-          p = FactoryGirl.create(:blog_post, :source_url => 'google.com', :source_url_title => 'author')
+          p = FactoryBot.create(:blog_post, :source_url => 'google.com', :source_url_title => 'author')
           expect(p).to be_valid
           expect(p.source_url).to include('google')
           expect(p.source_url_title).to include('author')
@@ -219,7 +226,7 @@ module Refinery
           it "should have canonical url" do
             expect_any_instance_of(UrlValidator).to receive(:resolve_redirects_verify_url).
                                       and_return('http://www.google.com')
-            p = FactoryGirl.create(:blog_post, :source_url => 'google.com', :source_url_title => 'google')
+            p = FactoryBot.create(:blog_post, :source_url => 'google.com', :source_url_title => 'google')
             expect(p.source_url).to include('www')
           end
         end
@@ -228,7 +235,7 @@ module Refinery
             Refinery::Blog.validate_source_url = false
           end
           it "should have original url" do
-            p = FactoryGirl.create(:blog_post, :source_url => 'google.com', :source_url_title => 'google')
+            p = FactoryBot.create(:blog_post, :source_url => 'google.com', :source_url_title => 'google')
             expect(p.source_url).not_to include('www')
           end
         end
@@ -237,7 +244,7 @@ module Refinery
       describe "#should_generate_new_friendly_id?" do
         context "when custom_url changes" do
           it "regenerates slug upon save" do
-            post = FactoryGirl.create(:blog_post, :custom_url => "Test Url")
+            post = FactoryBot.create(:blog_post, :custom_url => "Test Url")
 
             post.custom_url = "Test Url 2"
             post.save!
@@ -248,7 +255,7 @@ module Refinery
 
         context "when title changes" do
           it "regenerates slug upon save" do
-            post = FactoryGirl.create(:blog_post, :title => "Test Title")
+            post = FactoryBot.create(:blog_post, :title => "Test Title")
 
             post.title = "Test Title 2"
             post.save!