storytime 2.1.6 → 2.1.7

data/spec/factories/user_factories.rb

@@ -1,7 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user do
     sequence(:email) { |i| "user#{i}@example.com" }
-    password "password"
+    password { "password" }
     sequence(:storytime_name) { |i| "user name #{i}" }
 
     factory :writer do

data/spec/factories/widget_factories.rb

@@ -1,5 +1,5 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :widget do
-    name "Widget Name"
+    name { "Widget Name" }
   end
 end

data/spec/features/blogs_spec.rb

@@ -2,20 +2,20 @@ require 'spec_helper'
 
 describe "Blogs", type: :feature do
   before do
-    setup_site(FactoryGirl.create(:admin))
+    setup_site(FactoryBot.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)
-    static_page = FactoryGirl.create(:page, site: @current_site)
+    3.times{ FactoryBot.create(:post, blog: @current_site.blogs.first, site: @current_site) }
+    other_blog_post = FactoryBot.create(:post, site: @current_site)
+    static_page = FactoryBot.create(:page, site: @current_site)
     visit url_for([@current_site.blogs.first, only_path: true])
 
     within ".post-list" do
       @current_site.blogs.first.posts.each do |p|
-        page.should have_content(p.title)
-        page.should have_content(p.excerpt)
-        page.should_not have_content(p.content)
+        expect(page).to have_content(p.title)
+        expect(page).to have_content(p.excerpt)
+        expect(page).to_not have_content(p.content)
       end
 
       expect(page).not_to have_content(static_page.title)

data/spec/features/comments_spec.rb

@@ -7,22 +7,22 @@ describe "Comments", type: :feature do
   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) }
-    other_post_comment = FactoryGirl.create(:comment, site: @current_site)
+    post = FactoryBot.create(:post, site: @current_site, blog: @current_site.blogs.first)
+    3.times{ FactoryBot.create(:comment, post: post, site: @current_site) }
+    other_post_comment = FactoryBot.create(:comment, site: @current_site)
 
     visit url_for([post, only_path: true])
 
     post.comments.each do |c|
-      page.should have_content(c.content)
-      page.should have_content(c.user.storytime_name)
+      expect(page).to have_content(c.content)
+      expect(page).to have_content(c.user.storytime_name)
     end
 
-    page.should_not have_content(other_post_comment.content)
+    expect(page).to_not have_content(other_post_comment.content)
   end
 
   it "creates a comment" do
-    post = FactoryGirl.create(:post, site: @current_site, blog: @current_site.blogs.first)
+    post = FactoryBot.create(:post, site: @current_site, blog: @current_site.blogs.first)
     comment_count = post.comments.count
 
     visit url_for([post, only_path: true])
@@ -38,9 +38,9 @@ describe "Comments", type: :feature do
   end
 
   it "deletes a comment", js: true do
-    post = FactoryGirl.create(:post, site: @current_site, blog: @current_site.blogs.first)
-    other_persons_comment = FactoryGirl.create(:comment, post: post, site: @current_site)
-    comment_to_delete = FactoryGirl.create(:comment, post: post, user: current_user, site: @current_site)
+    post = FactoryBot.create(:post, site: @current_site, blog: @current_site.blogs.first)
+    other_persons_comment = FactoryBot.create(:comment, post: post, site: @current_site)
+    comment_to_delete = FactoryBot.create(:comment, post: post, user: current_user, site: @current_site)
 
     visit url_for([post, only_path: true])
 
@@ -51,7 +51,7 @@ describe "Comments", type: :feature do
 
     expect(page).to_not have_content(comment_to_delete.content)
 
-    expect{ comment_to_delete.reload }.to raise_error
+    expect{ comment_to_delete.reload }.to raise_error(ActiveRecord::RecordNotFound)
   end
 
 end

data/spec/features/dashboard/media_spec.rb

@@ -8,34 +8,40 @@ describe "In the dashboard, Media", type: :feature do
   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')
+    # Use find + set instead of attach_file so Cuprite targets the
+    # current file input after jQuery fileupload replaces the original.
+    input = find("input[type='file'][name='media[file]']", visible: :all)
+    input.set(File.expand_path("./spec/support/images/success-kid.jpg"))
+
+    within("#media_gallery") do
+      expect(page).to have_css("img", wait: 10)
+      expect(find("img")['src']).to have_content('success-kid.jpg')
+    end
   end
 
   it "shows a gallery of the user's images" do
-    m1 = FactoryGirl.create(:media, site: @current_site)
-    m2 = FactoryGirl.create(:media, site: @current_site)
+    m1 = FactoryBot.create(:media, site: @current_site)
+    m2 = FactoryBot.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))
+    expect(page).to have_image(m1.file_url(:thumb))
+    expect(page).to have_image(m2.file_url(:thumb))
   end
 
   it "deletes an image", js: true do
-    image = FactoryGirl.create(:media, site: @current_site)
+    image = FactoryBot.create(:media, site: @current_site)
 
     visit dashboard_media_index_path
-    page.should have_image(image.file_url(:thumb))
+    expect(page).to have_image(image.file_url(:thumb))
 
     click_link "delete_media_#{image.id}"
 
-    page.should_not have_image(image)
+    expect(page).to_not have_image(image)
   end
 
   it "inserts media into post", js: true do
-    media = FactoryGirl.create(:media, site: @current_site)
+    media = FactoryBot.create(:media, site: @current_site)
 
     visit url_for([:new, :dashboard, @current_site.blogs.first, :blog_post, only_path: true])
 

data/spec/features/dashboard/memberships_spec.rb

@@ -5,8 +5,8 @@ describe "In the dashboard, Users", type: :feature do
     before{ login_admin }
 
     it "provides links to all the sites where the user has a membership", js: true do
-      other_site = FactoryGirl.create(:site)
-      membership = FactoryGirl.create(:membership, user: @current_user, site: other_site)
+      other_site = FactoryBot.create(:site)
+      membership = FactoryBot.create(:membership, user: @current_user, site: other_site)
 
       visit storytime.dashboard_path
 
@@ -17,7 +17,7 @@ describe "In the dashboard, Users", type: :feature do
     end
 
     it "lists users for a site", js: true do
-      FactoryGirl.create_list(:user, 3)
+      FactoryBot.create_list(:user, 3)
 
       Storytime.user_class.all.each do |user|
         user.storytime_memberships.create(site: @current_site, storytime_role: Storytime::Role.find_by(name: "writer"))
@@ -33,7 +33,7 @@ describe "In the dashboard, Users", type: :feature do
     end
 
     it "deletes a user from the site", js: true do
-      user = FactoryGirl.create(:user)
+      user = FactoryBot.create(:user)
       membership = user.storytime_memberships.create(site: @current_site, storytime_role: Storytime::Role.find_by(name: "writer"))
 
       user_count = Storytime.user_class.count
@@ -54,26 +54,23 @@ describe "In the dashboard, Users", type: :feature do
       expect(Storytime::Membership.count).to eq(membership_count-1)
     end
 
-    it "edits own profile", js: true do
-      u = User.last
 
+    it "edits own profile", js: true do
       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(page).to have_content("Your changes were saved successfully")
 
-        expect(storytime_name_field).to eq(u.storytime_name)
-        expect(storytime_email_field).to eq("new_email@example.com")
-      end
+      current_user.reload
+      expect(current_user.email).to eq("new_email@example.com")
     end
 
     it "edits another user's profile", js: true do
-      FactoryGirl.create :membership, site: @current_site
+      FactoryBot.create :membership, site: @current_site
       u = User.last
 
       visit storytime.dashboard_path
@@ -85,13 +82,10 @@ describe "In the dashboard, Users", type: :feature do
       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(page).to have_content("Your changes were saved successfully")
 
-        expect(storytime_name_field).to eq(u.storytime_name)
-        expect(storytime_email_field).to eq("change_email@example.com")
-      end
+      u.reload
+      expect(u.email).to eq("change_email@example.com")
     end
 
     it "creates a user", js: true do

data/spec/features/dashboard/navigations_spec.rb

@@ -21,7 +21,7 @@ describe "In the dashboard, Navigations", type: :feature do
 
   it "updates a navigation list" do
     Storytime::Site.current_id = current_site.id
-    nav = FactoryGirl.create(:navigation, site_id: current_site.id)
+    nav = FactoryBot.create(:navigation, site_id: current_site.id)
     visit edit_dashboard_navigation_path(nav)
 
     fill_in "navigation_name", with: "New Name"

data/spec/features/dashboard/pages_spec.rb

@@ -7,11 +7,11 @@ describe "In the dashboard, Pages", type: :feature do
 
   describe "index" do
     before do
-      3.times{ FactoryGirl.create(:page, site: current_site) }
-      3.times{ FactoryGirl.create(:page, published_at: nil, site: current_site) }
+      3.times{ FactoryBot.create(:page, site: current_site) }
+      3.times{ FactoryBot.create(:page, published_at: nil, site: current_site) }
     end
 
-    let!(:other_site_page){ FactoryGirl.create(:page) }
+    let!(:other_site_page){ FactoryBot.create(:page) }
 
     it "lists all pages" do
       visit dashboard_pages_path
@@ -65,7 +65,7 @@ describe "In the dashboard, Pages", type: :feature do
 
     pg = Storytime::Page.last
     expect(pg.title).to eq("The Page")
-    expect(pg.draft_content).to eq("The content of my page")
+    expect(pg.draft_content).to include("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")
@@ -74,7 +74,7 @@ describe "In the dashboard, Pages", type: :feature do
   end
 
   it "updates a page", js: true do
-    pg = FactoryGirl.create(:page, site: current_site, published_at: nil)
+    pg = FactoryBot.create(:page, site: current_site, published_at: nil)
     original_creator = pg.user
     page_count = Storytime::Page.count
 
@@ -90,14 +90,14 @@ describe "In the dashboard, Pages", type: :feature do
 
     pg = Storytime::Page.last
     expect(pg.title).to eq("The Story")
-    expect(pg.draft_content).to eq("It was a dark and stormy night...")
+    expect(pg.draft_content).to include("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
   end
 
   it "deletes a page", js: true do
-    storytime_page = FactoryGirl.create(:page, site: current_site)
+    storytime_page = FactoryBot.create(:page, site: current_site)
     page_count = Storytime::Page.count
 
     visit edit_dashboard_page_path(storytime_page)
@@ -106,7 +106,7 @@ describe "In the dashboard, Pages", type: :feature do
     click_link "Delete"
 
     expect(page).to_not have_content(storytime_page.title)
-    expect { storytime_page.reload }.to raise_error
+    expect { storytime_page.reload }.to raise_error(ActiveRecord::RecordNotFound)
     expect(Storytime::Page.count).to eq(page_count - 1)
   end
 

data/spec/features/dashboard/posts_spec.rb

@@ -7,9 +7,9 @@ describe "In the dashboard, Posts", type: :feature do
 
   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)
+    FactoryBot.create(:post, blog: blog, site: @current_site, published_at: nil)
+    2.times{ FactoryBot.create(:post, blog: blog, site: @current_site, published_at: 1.hours.ago) }
+    static_page = FactoryBot.create(:page)
 
     visit url_for([storytime, :dashboard, blog, :blog_page_post_index, only_path: true])
 
@@ -24,10 +24,10 @@ describe "In the dashboard, Posts", type: :feature do
 
   it "lists draft posts" do
     blog = @current_site.blogs.first
-    3.times{ FactoryGirl.create(:post, blog: blog, site: @current_site, published_at: nil) }
-    3.times{ FactoryGirl.create(:post, blog: blog, site: @current_site, published_at: 2.hours.ago) }
-    FactoryGirl.create(:post)
-    static_page = FactoryGirl.create(:page)
+    3.times{ FactoryBot.create(:post, blog: blog, site: @current_site, published_at: nil) }
+    3.times{ FactoryBot.create(:post, blog: blog, site: @current_site, published_at: 2.hours.ago) }
+    FactoryBot.create(:post)
+    static_page = FactoryBot.create(:page)
 
     visit url_for([storytime, :dashboard, blog, :blog_page_post_index, draft: true, only_path: true])
 
@@ -43,9 +43,9 @@ describe "In the dashboard, Posts", type: :feature do
 
   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)
+    FactoryBot.create(:post, blog: blog, site: @current_site, published_at: nil)
+    2.times{ FactoryBot.create(:post, blog: blog, site: @current_site, published_at: 3.hours.ago) }
+    static_page = FactoryBot.create(:page)
 
     visit url_for([storytime, :dashboard, blog, :blog_page_post_index, published: true, only_path: true])
 
@@ -61,7 +61,7 @@ describe "In the dashboard, Posts", type: :feature do
 
   it "creates a post", js: true do
     post_count = Storytime::BlogPost.count
-    media = FactoryGirl.create(:media)
+    media = FactoryBot.create(:media)
     Rails.logger.warn "==> STARTING CREATE POST"
     visit url_for([:new, :dashboard, @current_site.blogs.first, :blog_post, only_path: true])
 
@@ -80,7 +80,7 @@ describe "In the dashboard, Posts", type: :feature do
 
     post = Storytime::BlogPost.last
     expect(post.title).to eq("The Story")
-    expect(post.draft_content).to eq("It was a dark and stormy night...")
+    expect(post.draft_content).to include("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)
@@ -103,7 +103,7 @@ describe "In the dashboard, Posts", type: :feature do
 
     post = Storytime::BlogPost.last
     expect(post.title).to eq("Snow Crash")
-    expect(post.draft_content).to eq("It was a dark and stormy night...")
+    expect(post.draft_content).to include("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
@@ -111,7 +111,7 @@ describe "In the dashboard, Posts", type: :feature do
 
   it "autosaves a post when editing", js: true do
     blog = @current_site.blogs.first
-    post = FactoryGirl.create(:post, blog: blog, site: @current_site, published_at: nil,
+    post = FactoryBot.create(:post, blog: blog, site: @current_site, published_at: nil,
                               title: "A Scandal in Bohemia",
                               draft_content: "To Sherlock Holmes she was always the woman.")
 
@@ -134,13 +134,13 @@ describe "In the dashboard, Posts", type: :feature do
 
     post.reload
     expect(post.autosave).not_to be_nil
-    expect(post.autosave.content).to eq("Some content to autosave")
+    expect(post.autosave.content).to include("Some content to autosave")
     expect(Storytime::BlogPost.count).to eq(post_count)
   end
 
   it "updates a post", js: true do
     blog = @current_site.blogs.first
-    post = FactoryGirl.create(:post, blog: blog, site: @current_site, published_at: nil)
+    post = FactoryBot.create(:post, blog: blog, site: @current_site, published_at: nil)
     original_creator = post.user
     post_count = Storytime::BlogPost.count
     # page.driver.debug
@@ -157,14 +157,14 @@ describe "In the dashboard, Posts", type: :feature 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("It was a dark and stormy night...")
+    expect(post.draft_content).to include("It was a dark and stormy night...")
     expect(post.user).to eq(original_creator)
     expect(post).to_not be_published
   end
 
   it "deletes a post", js: true do
     blog = @current_site.blogs.first
-    3.times{ FactoryGirl.create(:post, blog: blog, site: @current_site) }
+    3.times{ FactoryBot.create(:post, blog: blog, site: @current_site) }
     expect(Storytime::BlogPost.count).to eq(3)
 
     post = Storytime::BlogPost.first
@@ -178,7 +178,7 @@ describe "In the dashboard, Posts", type: :feature do
 
   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) }
+    3.times{ FactoryBot.create(:post, blog: blog, site: @current_site, published_at: nil) }
     expect(Storytime::BlogPost.count).to eq(3)
 
     post = Storytime::BlogPost.first

data/spec/features/dashboard/sites_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "In the dashboard, Sites", type: :feature do
 
   it "creates a site" do
-    login FactoryGirl.create(:user), true
+    login FactoryBot.create(:user), true
     expect(Storytime::Site.count).to eq(0)
 
     visit new_dashboard_site_path

data/spec/features/dashboard/snippets_spec.rb

@@ -6,7 +6,7 @@ describe "In the dashboard, Snippets", type: :feature do
   end
 
   it "lists snippets", js: true do
-    3.times{ FactoryGirl.create(:snippet, site: @current_site) }
+    3.times{ FactoryBot.create(:snippet, site: @current_site) }
     visit storytime.dashboard_url
     find("#snippets-link").trigger('click')
 
@@ -37,7 +37,7 @@ describe "In the dashboard, Snippets", type: :feature do
   # end
 
   it "updates a snippet", js: true do
-    snippet = FactoryGirl.create(:snippet, site: @current_site, content: "Test")
+    snippet = FactoryBot.create(:snippet, site: @current_site, content: "Test")
 
     visit storytime.dashboard_url
     find("#snippets-link").trigger('click')
@@ -54,7 +54,7 @@ describe "In the dashboard, Snippets", type: :feature do
   end
 
   it "deletes a snippet", js: true do
-    snippet = FactoryGirl.create :snippet, site: @current_site
+    snippet = FactoryBot.create :snippet, site: @current_site
 
     visit storytime.dashboard_url
     find("#snippets-link").trigger('click')

data/spec/features/dashboard/subscription_spec.rb

@@ -6,7 +6,7 @@ describe "In the dashboard, Subscriptions", type: :feature do
   end
 
   it "lists subscriptions", js: true do
-    3.times{ FactoryGirl.create(:subscription, site: @current_site) }
+    3.times{ FactoryBot.create(:subscription, site: @current_site) }
     visit storytime.dashboard_path
     click_link "utility-menu-toggle"
     click_link "subscriptions-link"
@@ -34,7 +34,7 @@ describe "In the dashboard, Subscriptions", type: :feature do
   end
 
   it "updates a subscription", js: true do
-    subscription = FactoryGirl.create(:subscription, site: @current_site)
+    subscription = FactoryBot.create(:subscription, site: @current_site)
 
     expect(Storytime::Subscription.count).to eq(1)
     expect(subscription.subscribed?).to eq(true)

data/spec/features/pages_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 describe "Pages", type: :feature do
   before do
-    setup_site(FactoryGirl.create(:admin))
+    setup_site(FactoryBot.create(:admin))
   end
 
   it "shows a page" do
-    pg = FactoryGirl.create(:page, site: @current_site)
+    pg = FactoryBot.create(:page, site: @current_site)
     visit url_for([pg, only_path: true])
-    page.should have_content(pg.content)
+    expect(page).to have_content(pg.content)
   end
 
 end

data/spec/features/posts_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe "Posts", type: :feature do
   before do
-    setup_site(FactoryGirl.create(:admin))
+    setup_site(FactoryBot.create(:admin))
   end
 
   it "shows a post" do
-    post = FactoryGirl.create(:post, blog: @current_site.blogs.first, site: @current_site)
+    post = FactoryBot.create(:post, blog: @current_site.blogs.first, site: @current_site)
     visit url_for([post, only_path: true])
 
     expect(page).to have_content(post.title)

data/spec/features/subscription_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "Subscriptions", type: :feature do
   before do
-    setup_site(FactoryGirl.create(:admin))
+    setup_site(FactoryBot.create(:admin))
   end
 
   it "allows users to subscribe to a site" do
@@ -25,10 +25,10 @@ describe "Subscriptions", type: :feature do
   end
 
   it "only allows users to unsubscribe with a proper token" do
-    subscription_1 = FactoryGirl.create(:subscription, site: @current_site)
+    subscription_1 = FactoryBot.create(:subscription, site: @current_site)
     token_1 = subscription_1.token
 
-    subscription_2 = FactoryGirl.create(:subscription, site: @current_site)
+    subscription_2 = FactoryBot.create(:subscription, site: @current_site)
     token_2 = subscription_2.token
 
     visit url_for([:unsubscribe_mailing_list, {:email => subscription_1.email, :t => token_2}])

data/spec/importers/wordpress_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Storytime::Importers::Wordpress do
   let(:file){ File.open("./spec/support/files/wordpress_export.xml") }
-  let(:user){ FactoryGirl.create(:user) }
+  let(:user){ FactoryBot.create(:user) }
   let(:importer){ Storytime::Importers::Wordpress.new file, user }
 
   describe "#import!" do

data/spec/lib/mysql_fulltext_search_adapter_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe "Storytime::MysqlFulltextSearchAdapter" do
   before(:each) do
-    @blog_posts = FactoryGirl.create_list(:post, 3)
-    @pages = FactoryGirl.create_list(:page, 3)
+    @blog_posts = FactoryBot.create_list(:post, 3)
+    @pages = FactoryBot.create_list(:page, 3)
 
     Storytime.search_adapter = Storytime::MysqlFulltextSearchAdapter
   end
@@ -19,7 +19,7 @@ describe "Storytime::MysqlFulltextSearchAdapter" do
     it "searches only the given model" do
       expect(Storytime::Post.count).to eq(6)
 
-      page = FactoryGirl.create(:page, content: "Everything bad comes from the mind, because the mind asks too many questions.")
+      page = FactoryBot.create(:page, content: "Everything bad comes from the mind, because the mind asks too many questions.")
       search_string = "bad mind"
 
       expect(Storytime::Post.count).to eq(7)

data/spec/lib/mysql_search_adapter_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe "Storytime::MysqlSearchAdapter" do
   before(:each) do
-    @blog_posts = FactoryGirl.create_list(:post, 3)
-    @pages = FactoryGirl.create_list(:page, 3)
+    @blog_posts = FactoryBot.create_list(:post, 3)
+    @pages = FactoryBot.create_list(:page, 3)
 
     Storytime.search_adapter = Storytime::MysqlSearchAdapter
   end
@@ -19,7 +19,7 @@ describe "Storytime::MysqlSearchAdapter" do
     it "searches only the given model" do
       expect(Storytime::Post.count).to eq(6)
 
-      page = FactoryGirl.create(:page, content: "Everything bad comes from the mind, because the mind asks too many questions.")
+      page = FactoryBot.create(:page, content: "Everything bad comes from the mind, because the mind asks too many questions.")
       search_string = "bad mind"
 
       expect(Storytime::Post.count).to eq(7)

data/spec/lib/postgres_search_adapter_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe "Storytime::PostgresSearchAdapter" do
   before(:each) do
-    @blog_posts = FactoryGirl.create_list(:post, 3)
-    @pages = FactoryGirl.create_list(:page, 3)
+    @blog_posts = FactoryBot.create_list(:post, 3)
+    @pages = FactoryBot.create_list(:page, 3)
 
     Storytime.search_adapter = Storytime::PostgresSearchAdapter
   end
@@ -19,7 +19,7 @@ describe "Storytime::PostgresSearchAdapter" do
     it "searches only the given model" do
       expect(Storytime::Post.count).to eq(6)
 
-      page = FactoryGirl.create(:page, content: "Everything bad comes from the mind, because the mind asks too many questions.")
+      page = FactoryBot.create(:page, content: "Everything bad comes from the mind, because the mind asks too many questions.")
       search_string = "bad mind"
 
       expect(Storytime::Post.count).to eq(7)

data/spec/lib/sqlite3_search_adapter_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe "Storytime::Sqlite3SearchAdapter" do
   before(:each) do
-    @blog_posts = FactoryGirl.create_list(:post, 3)
-    @pages = FactoryGirl.create_list(:page, 3)
+    @blog_posts = FactoryBot.create_list(:post, 3)
+    @pages = FactoryBot.create_list(:page, 3)
 
     Storytime.search_adapter = Storytime::Sqlite3SearchAdapter
   end
@@ -19,7 +19,7 @@ describe "Storytime::Sqlite3SearchAdapter" do
     it "searches only the given model" do
       expect(Storytime::Post.count).to eq(6)
 
-      page = FactoryGirl.create(:page, content: "Everything bad comes from the mind, because the mind asks too many questions.")
+      page = FactoryBot.create(:page, content: "Everything bad comes from the mind, because the mind asks too many questions.")
       search_string = "bad mind"
 
       expect(Storytime::Post.count).to eq(7)