enju_library 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ae9ca51c49e65acd73fac1069041e08a8cd7c2f
-  data.tar.gz: e180d307035c93385bdf2edf80d272f20ec941de
+  metadata.gz: 4ec47a509dd7bd209791197d6c822b0b84c44b67
+  data.tar.gz: 32cdd9f4bde06623a6798d9dceba72c338d58f1d
 SHA512:
-  metadata.gz: 785ab5761b6abe068e8725b235fc30b6b345732aa357cc45278b1d0da1a96e945252179026efed1d85f63a4dfdb23758b034d605d59910461277f48b51d8d796
-  data.tar.gz: cf0e5d3be2f73265bdbeda656767583987030467a5be2f9d7dc91f9877d7c63f609b24bfd213478a113de93cc37d0f3128df3560e23361651638763264511970
+  metadata.gz: 2ade2ec7c7902f4d8351550652ff10ca1f6d594478b1c14b90fec4e2eae66fa68ded7686a6c251ef27f179401e9c0d72d112e99aa0300f757551e055403ea02f
+  data.tar.gz: 6d90d19cb810d5a1eb9f0d94b850854cf66f5837998b95d264664510ff19b16629fe71a15db6ec1a4ae67847cfcc9990d301e4b331a9d1b34f5487d2ead4aabc

data/app/controllers/library_groups_controller.rb

@@ -19,6 +19,19 @@ class LibraryGroupsController < ApplicationController
     respond_to do |format|
       format.html # show.html.erb
       format.json { render json: @library_group }
+      format.download {
+        if @library_group.header_logo.exists?
+          if ENV['ENJU_STORAGE'] == 's3'
+            file = Faraday.get(@library_group.header_logo.expiring_url(3600, :medium)).body.force_encoding('UTF-8')
+            send_data file, filename: File.basename(@library_group.header_logo_file_name), type: @library_group.header_logo_content_type, disposition: :inline
+          else
+            file = @library_group.header_logo.path(:medium)
+            if File.exist?(file) && File.file?(file)
+              send_file file, filename: File.basename(@library_group.header_logo_file_name), type: @library_group.header_logo_content_type, disposition: :inline
+            end
+          end
+        end
+      }
     end
   end
 
@@ -32,6 +45,10 @@ class LibraryGroupsController < ApplicationController
   def update
     respond_to do |format|
       if @library_group.update_attributes(library_group_params)
+        if @library_group.delete_header_logo == '1'
+          @library_group.header_logo.destroy
+        end
+
         format.html { redirect_to @library_group, notice: t('controller.successfully_updated', model: t('activerecord.models.library_group')) }
         format.json { head :no_content }
       else
@@ -45,7 +62,11 @@ class LibraryGroupsController < ApplicationController
   private
   def set_library_group
     @library_group = LibraryGroup.find(params[:id])
-    authorize @library_group
+    if request.format == :download
+      authorize @library_group, :show_logo?
+    else
+      authorize @library_group
+    end
   end
 
   def check_policy
@@ -58,6 +79,7 @@ class LibraryGroupsController < ApplicationController
       :login_banner, :note, :country_id, :admin_networks, :url,
       :max_number_of_results, :footer_banner, :email,
       :book_jacket_source, :screenshot_generator, :erms_url,
+      :header_logo, :delete_header_logo,
       :allow_bookmark_external_url, # EnjuBookmark
       {
         :colors_attributes =>  [:id, :property, :code]

data/app/models/library.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 class Library < ActiveRecord::Base
   include MasterModel
   default_scope { order('libraries.position') }
@@ -32,8 +31,6 @@ class Library < ActiveRecord::Base
   after_save :clear_all_cache
   after_destroy :clear_all_cache
 
-  paginates_per 10
-
   def self.all_cache
     if Rails.env == 'production'
       Rails.cache.fetch('library_all'){ Library.all }

data/app/models/library_group.rb

@@ -21,6 +21,24 @@ class LibraryGroup < ActiveRecord::Base
   translates :login_banner, :footer_banner
   globalize_accessors
 
+  if ENV['ENJU_STORAGE'] == 's3'
+    has_attached_file :header_logo, storage: :s3, styles: { medium: 'x80'},
+      s3_credentials: {
+        access_key: ENV['AWS_ACCESS_KEY_ID'],
+        secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
+        bucket: ENV['S3_BUCKET_NAME'],
+        s3_host_name: ENV['S3_HOST_NAME'],
+        s3_region: ENV["S3_REGION"]
+      },
+      s3_permissions: :private
+  else
+    has_attached_file :header_logo, styles: { medium: 'x80'},
+      path: ":rails_root/private/system/:class/:attachment/:id_partition/:style/:filename"
+  end
+
+  validates_attachment_content_type :header_logo, content_type: /\Aimage\/.*\Z/
+  attr_accessor :delete_header_logo
+
   def self.site_config
     LibraryGroup.order(:created_at).first
   end
@@ -67,7 +85,7 @@ end
 #  display_name                  :text
 #  short_name                    :string           not null
 #  my_networks                   :text
-#  login_banner                  :text
+#  old_login_banner              :text
 #  note                          :text
 #  country_id                    :integer
 #  position                      :integer
@@ -84,4 +102,10 @@ end
 #  screenshot_generator          :string
 #  pub_year_facet_range_interval :integer          default(10)
 #  user_id                       :integer
+#  csv_charset_conversion        :boolean          default(FALSE), not null
+#  header_logo_file_name         :string
+#  header_logo_content_type      :string
+#  header_logo_file_size         :integer
+#  header_logo_updated_at        :datetime
+#  header_logo_meta              :text
 #

data/app/policies/library_group_policy.rb

@@ -7,6 +7,10 @@ class LibraryGroupPolicy < ApplicationPolicy
     true if user.try(:has_role?, 'Librarian')
   end
 
+  def show_logo?
+    true
+  end
+
   def create?
     true if user.try(:has_role?, 'Administrator')
   end

data/app/views/library_groups/_form.html.erb

@@ -11,6 +11,14 @@
     <%= f.text_area :display_name, class: 'resource_textarea' -%>
   </div>
 
+  <div class="field">
+    <%= f.label :header_logo -%><br />
+    <%= f.file_field :header_logo -%>
+    <br />
+    <%= f.check_box :delete_header_logo -%>
+    <%= t('page.destroy') %>
+  </div>
+
   <div class="field">
     <%= f.label :email -%><br />
     <%= f.fields_for :user do |user_form| %>

data/app/views/library_groups/show.html.erb

@@ -13,6 +13,12 @@
   <%= @library_group.display_name.localize -%>
 </p>
 
+<p>
+  <strong><%= t('activerecord.attributes.library_group.header_logo') -%>:</strong>
+  <br />
+  <%= image_tag(library_group_path(@library_group, format: :download), size: @library_group.header_logo.image_size(:medium)) if @library_group.header_logo.exists? -%>
+</p>
+
 <p>
   <strong><%= t('activerecord.attributes.library_group.email') -%>:</strong>
   <%= @library_group.user.email -%>

data/config/locales/translation_en.yml

@@ -58,6 +58,7 @@ en:
         color: Color
         max_number_of_results: Max number of results
         book_jacket_source: Book jacket source
+        header_logo: Header logo
       bookstore:
         name: Name
         zip_code: Zip code

data/config/locales/translation_ja.yml

@@ -58,6 +58,7 @@ ja:
         color: 色
         max_number_of_results: 検索結果の最大件数
         book_jacket_source: 書影の取得元
+        header_logo: ヘッダーのロゴ
       bookstore:
         name: 名前
         zip_code: 郵便番号

data/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb

@@ -0,0 +1,5 @@
+class RenameLoginBannerToOldLoginBanner < ActiveRecord::Migration
+  def change
+    rename_column :library_groups, :login_banner, :old_login_banner
+  end
+end

data/db/migrate/20171126135238_add_foreign_key_to_library_group_id_on_library.rb

@@ -0,0 +1,5 @@
+class AddForeignKeyToLibraryGroupIdOnLibrary < ActiveRecord::Migration
+  def change
+    add_foreign_key :libraries, :library_groups, null: false
+  end
+end

data/db/migrate/20180102162311_add_header_logo_meta_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddHeaderLogoMetaToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_column :library_groups, :header_logo_meta, :text
+  end
+end

data/lib/enju_library/engine.rb

@@ -1,6 +1,7 @@
 require 'enju_seed'
 require 'paper_trail'
 require 'paperclip'
+require 'paperclip-meta'
 require 'statesman'
 require 'geocoder'
 require 'ipaddr'

data/lib/enju_library/version.rb

@@ -1,3 +1,3 @@
 module EnjuLibrary
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/generators/enju_library/setup/templates/db/fixtures/library_group/translations.yml

@@ -1,16 +1,12 @@
 library_group_00001_translations_ja:
   locale: ja
-  footer_banner: "<div style=\"padding: 10px; float: left; vertical-align: center\">\r\n
-  [Next-L Enju Leaf __VERSION__](https://github.com/next-l/enju_leaf), オープンソース統合図書館システム | [このシステムについて](/page/about) | [不具合を報告する](https://github.com/next-l/enju_leaf/issues) | [マニュアル](https://next-l.github.io/manual/1.2/)<br/>\r\n\
-    Developed by [Kosuke Tanabe](https://github.com/nabeta) and [Project Next-L](http://www.next-l.jp).\r\n
-    </div>\r\n
-    "
+  login_banner: オープンソース図書館システム Next-L Enju です。このメッセージは管理者としてログインした後に変更することができます。
+  footer_banner: "[Next-L Enju Leaf __VERSION__](https://github.com/next-l/enju_leaf), オープンソース統合図書館システム | [このシステムについて](/page/about) | [不具合を報告する](https://github.com/next-l/enju_leaf/issues) | [マニュアル](https://next-l.github.io/manual/1.2/)<br/>\r\n\
+    Developed by [Kosuke Tanabe](https://github.com/nabeta) and [Project Next-L](http://www.next-l.jp)."
   library_group_id: 1
 library_group_00001_translations_en:
   locale: en
-  footer_banner: "<div style=\"padding: 10px; float: left; vertical-align: center\">\r\n
-  [Next-L Enju Leaf __VERSION__](https://github.com/next-l/enju_leaf), an open source integrated library system | [About this system](/page/about) | [Report bugs](https://github.com/next-l/enju_leaf/issues) | [Manual](https://next-l.github.io/manual/1.2/)<br/>\r\n\
-    Developed by [Kosuke Tanabe](https://github.com/nabeta) and [Project Next-L](http://www.next-l.jp).\r\n
-    </div>\r\n
-    "
+  login_banner: Next-L Enju, an open-source integrated library system. You can edit this message after logging in as Administrator.
+  footer_banner: "[Next-L Enju Leaf __VERSION__](https://github.com/next-l/enju_leaf), an open source integrated library system | [About this system](/page/about) | [Report bugs](https://github.com/next-l/enju_leaf/issues) | [Manual](https://next-l.github.io/manual/1.2/)<br/>\r\n\
+    Developed by [Kosuke Tanabe](https://github.com/nabeta) and [Project Next-L](http://www.next-l.jp)."
   library_group_id: 1

data/lib/generators/enju_library/setup/templates/db/fixtures/library_groups.yml

@@ -7,7 +7,6 @@ library_group_00001:
   note: 
   my_networks: "0.0.0.0/0\r\n\
     ::/0"
-  login_banner: Next-L Enju, an open-source integrated library system. You can edit this message after logging in as Administrator.
   admin_networks: "0.0.0.0/0\r\n\
     ::/0"
   settings: "{\"max_number_of_results\":500, \"family_name_first\":true, \"skip_mobile_agents\":\"ipad\"}"

data/lib/generators/enju_library/update/update_generator.rb

@@ -0,0 +1,9 @@
+class EnjuLibrary::UpdateGenerator < Rails::Generators::Base
+  source_root File.expand_path('../templates', __FILE__)
+  desc "Create files for updating Next-L Enju"
+
+  def copy_statesman_migration_files
+    generate('statesman:add_constraints_to_most_recent', 'UserImportFile', 'UserImportFileTransition')
+    generate('statesman:add_constraints_to_most_recent', 'UserExportFile', 'UserExportFileTransition')
+  end
+end

data/spec/controllers/accepts_controller_spec.rb

@@ -62,7 +62,7 @@ describe AcceptsController do
       login_fixture_admin
 
       it 'assigns the requested accept as @accept' do
-        accept = FactoryGirl.create(:accept)
+        accept = FactoryBot.create(:accept)
         get :show, id: accept.id
         assigns(:accept).should eq(accept)
       end
@@ -72,7 +72,7 @@ describe AcceptsController do
       login_fixture_librarian
 
       it 'assigns the requested accept as @accept' do
-        accept = FactoryGirl.create(:accept)
+        accept = FactoryBot.create(:accept)
         get :show, id: accept.id
         assigns(:accept).should eq(accept)
       end
@@ -82,7 +82,7 @@ describe AcceptsController do
       login_fixture_user
 
       it 'assigns the requested accept as @accept' do
-        accept = FactoryGirl.create(:accept)
+        accept = FactoryBot.create(:accept)
         get :show, id: accept.id
         assigns(:accept).should eq(accept)
         response.should be_forbidden
@@ -91,7 +91,7 @@ describe AcceptsController do
 
     describe 'When not logged in' do
       it 'assigns the requested accept as @accept' do
-        accept = FactoryGirl.create(:accept)
+        accept = FactoryBot.create(:accept)
         get :show, id: accept.id
         assigns(:accept).should eq(accept)
         response.should redirect_to new_user_session_url
@@ -238,7 +238,7 @@ describe AcceptsController do
 
   describe 'DELETE destroy' do
     before(:each) do
-      @accept = FactoryGirl.create(:accept)
+      @accept = FactoryBot.create(:accept)
     end
 
     describe 'When logged in as Administrator' do

data/spec/controllers/baskets_controller_spec.rb

@@ -325,7 +325,7 @@ describe BasketsController do
 
   describe 'DELETE destroy' do
     before(:each) do
-      @basket = FactoryGirl.create(:basket)
+      @basket = FactoryBot.create(:basket)
     end
 
     describe 'When logged in as Administrator' do

data/spec/controllers/bookstores_controller_spec.rb

@@ -6,12 +6,12 @@ describe BookstoresController do
   disconnect_sunspot
 
   def valid_attributes
-    FactoryGirl.attributes_for(:bookstore)
+    FactoryBot.attributes_for(:bookstore)
   end
 
   describe 'GET index' do
     before(:each) do
-      FactoryGirl.create(:bookstore)
+      FactoryBot.create(:bookstore)
     end
 
     describe 'When logged in as Administrator' do
@@ -53,7 +53,7 @@ describe BookstoresController do
 
   describe 'GET show' do
     before(:each) do
-      @bookstore = FactoryGirl.create(:bookstore)
+      @bookstore = FactoryBot.create(:bookstore)
     end
 
     describe 'When logged in as Administrator' do
@@ -133,7 +133,7 @@ describe BookstoresController do
 
   describe 'GET edit' do
     before(:each) do
-      @bookstore = FactoryGirl.create(:bookstore)
+      @bookstore = FactoryBot.create(:bookstore)
     end
 
     describe 'When logged in as Administrator' do
@@ -290,7 +290,7 @@ describe BookstoresController do
 
   describe 'PUT update' do
     before(:each) do
-      @bookstore = FactoryGirl.create(:bookstore)
+      @bookstore = FactoryBot.create(:bookstore)
       @attrs = valid_attributes
       @invalid_attrs = { name: '' }
     end
@@ -391,7 +391,7 @@ describe BookstoresController do
 
   describe 'DELETE destroy' do
     before(:each) do
-      @bookstore = FactoryGirl.create(:bookstore)
+      @bookstore = FactoryBot.create(:bookstore)
     end
 
     describe 'When logged in as Administrator' do

data/spec/controllers/budget_types_controller_spec.rb

@@ -26,7 +26,7 @@ describe BudgetTypesController do
   # BudgetType. As you add validations to BudgetType, be sure to
   # update the return value of this method accordingly.
   def valid_attributes
-    FactoryGirl.attributes_for(:budget_type)
+    FactoryBot.attributes_for(:budget_type)
   end
 
   describe 'GET index' do

data/spec/controllers/libraries_controller_spec.rb

@@ -128,7 +128,7 @@ describe LibrariesController do
       login_fixture_admin
 
       it 'assigns the requested library as @library' do
-        library = FactoryGirl.create(:library)
+        library = FactoryBot.create(:library)
         get :edit, id: library.id
         assigns(:library).should eq(library)
       end
@@ -138,7 +138,7 @@ describe LibrariesController do
       login_fixture_librarian
 
       it 'assigns the requested library as @library' do
-        library = FactoryGirl.create(:library)
+        library = FactoryBot.create(:library)
         get :edit, id: library.id
         response.should be_forbidden
       end
@@ -148,7 +148,7 @@ describe LibrariesController do
       login_fixture_user
 
       it 'assigns the requested library as @library' do
-        library = FactoryGirl.create(:library)
+        library = FactoryBot.create(:library)
         get :edit, id: library.id
         response.should be_forbidden
       end
@@ -156,7 +156,7 @@ describe LibrariesController do
 
     describe 'When not logged in' do
       it 'should not assign the requested library as @library' do
-        library = FactoryGirl.create(:library)
+        library = FactoryBot.create(:library)
         get :edit, id: library.id
         response.should redirect_to(new_user_session_url)
       end
@@ -165,7 +165,7 @@ describe LibrariesController do
 
   describe 'POST create' do
     before(:each) do
-      @attrs = FactoryGirl.attributes_for(:library)
+      @attrs = FactoryBot.attributes_for(:library)
       @invalid_attrs = { name: '' }
     end
 
@@ -453,7 +453,7 @@ describe LibrariesController do
 
     describe 'Library' do
       before(:each) do
-        @library = FactoryGirl.create(:library)
+        @library = FactoryBot.create(:library)
         @library.shelves.first.destroy
       end
 

data/spec/controllers/request_status_types_controller_spec.rb

@@ -6,12 +6,12 @@ describe RequestStatusTypesController do
   disconnect_sunspot
 
   def valid_attributes
-    FactoryGirl.attributes_for(:request_status_type)
+    FactoryBot.attributes_for(:request_status_type)
   end
 
   describe 'GET index' do
     before(:each) do
-      FactoryGirl.create(:request_status_type)
+      FactoryBot.create(:request_status_type)
     end
 
     describe 'When logged in as Administrator' do
@@ -53,7 +53,7 @@ describe RequestStatusTypesController do
 
   describe 'GET show' do
     before(:each) do
-      @request_status_type = FactoryGirl.create(:request_status_type)
+      @request_status_type = FactoryBot.create(:request_status_type)
     end
 
     describe 'When logged in as Administrator' do
@@ -133,7 +133,7 @@ describe RequestStatusTypesController do
 
   describe 'GET edit' do
     before(:each) do
-      @request_status_type = FactoryGirl.create(:request_status_type)
+      @request_status_type = FactoryBot.create(:request_status_type)
     end
 
     describe 'When logged in as Administrator' do
@@ -290,7 +290,7 @@ describe RequestStatusTypesController do
 
   describe 'PUT update' do
     before(:each) do
-      @request_status_type = FactoryGirl.create(:request_status_type)
+      @request_status_type = FactoryBot.create(:request_status_type)
       @attrs = valid_attributes
       @invalid_attrs = { name: '' }
     end
@@ -391,7 +391,7 @@ describe RequestStatusTypesController do
 
   describe 'DELETE destroy' do
     before(:each) do
-      @request_status_type = FactoryGirl.create(:request_status_type)
+      @request_status_type = FactoryBot.create(:request_status_type)
     end
 
     describe 'When logged in as Administrator' do

data/spec/controllers/request_types_controller_spec.rb

@@ -6,12 +6,12 @@ describe RequestTypesController do
   disconnect_sunspot
 
   def valid_attributes
-    FactoryGirl.attributes_for(:request_status_type)
+    FactoryBot.attributes_for(:request_status_type)
   end
 
   describe 'GET index' do
     before(:each) do
-      FactoryGirl.create(:request_type)
+      FactoryBot.create(:request_type)
     end
 
     describe 'When logged in as Administrator' do
@@ -53,7 +53,7 @@ describe RequestTypesController do
 
   describe 'GET show' do
     before(:each) do
-      @request_type = FactoryGirl.create(:request_type)
+      @request_type = FactoryBot.create(:request_type)
     end
 
     describe 'When logged in as Administrator' do
@@ -133,7 +133,7 @@ describe RequestTypesController do
 
   describe 'GET edit' do
     before(:each) do
-      @request_type = FactoryGirl.create(:request_type)
+      @request_type = FactoryBot.create(:request_type)
     end
 
     describe 'When logged in as Administrator' do
@@ -290,7 +290,7 @@ describe RequestTypesController do
 
   describe 'PUT update' do
     before(:each) do
-      @request_type = FactoryGirl.create(:request_type)
+      @request_type = FactoryBot.create(:request_type)
       @attrs = valid_attributes
       @invalid_attrs = { name: '' }
     end
@@ -391,7 +391,7 @@ describe RequestTypesController do
 
   describe 'DELETE destroy' do
     before(:each) do
-      @request_type = FactoryGirl.create(:request_type)
+      @request_type = FactoryBot.create(:request_type)
     end
 
     describe 'When logged in as Administrator' do

data/spec/controllers/search_engines_controller_spec.rb

@@ -6,12 +6,12 @@ describe SearchEnginesController do
   disconnect_sunspot
 
   def valid_attributes
-    FactoryGirl.attributes_for(:search_engine)
+    FactoryBot.attributes_for(:search_engine)
   end
 
   describe 'GET index' do
     before(:each) do
-      FactoryGirl.create(:search_engine)
+      FactoryBot.create(:search_engine)
     end
 
     describe 'When logged in as Administrator' do
@@ -56,7 +56,7 @@ describe SearchEnginesController do
       login_fixture_admin
 
       it 'assigns the requested search_engine as @search_engine' do
-        search_engine = FactoryGirl.create(:search_engine)
+        search_engine = FactoryBot.create(:search_engine)
         get :show, id: search_engine.id
         assigns(:search_engine).should eq(search_engine)
       end
@@ -66,7 +66,7 @@ describe SearchEnginesController do
       login_fixture_librarian
 
       it 'assigns the requested search_engine as @search_engine' do
-        search_engine = FactoryGirl.create(:search_engine)
+        search_engine = FactoryBot.create(:search_engine)
         get :show, id: search_engine.id
         assigns(:search_engine).should eq(search_engine)
       end
@@ -76,7 +76,7 @@ describe SearchEnginesController do
       login_fixture_user
 
       it 'assigns the requested search_engine as @search_engine' do
-        search_engine = FactoryGirl.create(:search_engine)
+        search_engine = FactoryBot.create(:search_engine)
         get :show, id: search_engine.id
         assigns(:search_engine).should eq(search_engine)
       end
@@ -84,7 +84,7 @@ describe SearchEnginesController do
 
     describe 'When not logged in' do
       it 'assigns the requested search_engine as @search_engine' do
-        search_engine = FactoryGirl.create(:search_engine)
+        search_engine = FactoryBot.create(:search_engine)
         get :show, id: search_engine.id
         assigns(:search_engine).should eq(search_engine)
       end
@@ -136,7 +136,7 @@ describe SearchEnginesController do
       login_fixture_admin
 
       it 'assigns the requested search_engine as @search_engine' do
-        search_engine = FactoryGirl.create(:search_engine)
+        search_engine = FactoryBot.create(:search_engine)
         get :edit, id: search_engine.id
         assigns(:search_engine).should eq(search_engine)
       end
@@ -146,7 +146,7 @@ describe SearchEnginesController do
       login_fixture_librarian
 
       it 'assigns the requested search_engine as @search_engine' do
-        search_engine = FactoryGirl.create(:search_engine)
+        search_engine = FactoryBot.create(:search_engine)
         get :edit, id: search_engine.id
         response.should be_forbidden
       end
@@ -156,7 +156,7 @@ describe SearchEnginesController do
       login_fixture_user
 
       it 'assigns the requested search_engine as @search_engine' do
-        search_engine = FactoryGirl.create(:search_engine)
+        search_engine = FactoryBot.create(:search_engine)
         get :edit, id: search_engine.id
         response.should be_forbidden
       end
@@ -164,7 +164,7 @@ describe SearchEnginesController do
 
     describe 'When not logged in' do
       it 'should not assign the requested search_engine as @search_engine' do
-        search_engine = FactoryGirl.create(:search_engine)
+        search_engine = FactoryBot.create(:search_engine)
         get :edit, id: search_engine.id
         response.should redirect_to(new_user_session_url)
       end
@@ -290,7 +290,7 @@ describe SearchEnginesController do
 
   describe 'PUT update' do
     before(:each) do
-      @search_engine = FactoryGirl.create(:search_engine)
+      @search_engine = FactoryBot.create(:search_engine)
       @attrs = valid_attributes
       @invalid_attrs = { name: '' }
     end
@@ -391,7 +391,7 @@ describe SearchEnginesController do
 
   describe 'DELETE destroy' do
     before(:each) do
-      @search_engine = FactoryGirl.create(:search_engine)
+      @search_engine = FactoryBot.create(:search_engine)
     end
 
     describe 'When logged in as Administrator' do