require factory_bot

enju_grid.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "pg"
   s.add_development_dependency "rspec-rails", "~> 3.5"
   s.add_development_dependency "simplecov"
-  s.add_development_dependency "factory_girl_rails"
+  s.add_development_dependency "factory_bot_rails"
   s.add_development_dependency "sunspot_solr", "2.2.0"
   s.add_development_dependency "sunspot-rails-tester"
   s.add_development_dependency "coveralls"

spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160814165332) do
+ActiveRecord::Schema.define(version: 20160820004638) do
 
   create_table "accepts", force: :cascade do |t|
     t.integer  "basket_id"
@@ -31,6 +31,7 @@
     t.integer  "agent_import_file_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "most_recent"
   end
 
   add_index "agent_import_file_transitions", ["agent_import_file_id"], name: "index_agent_import_file_transitions_on_agent_import_file_id"
@@ -260,12 +261,16 @@
   add_index "carrier_type_has_checkout_types", ["checkout_type_id"], name: "index_carrier_type_has_checkout_types_on_checkout_type_id"
 
   create_table "carrier_types", force: :cascade do |t|
-    t.string   "name",         null: false
+    t.string   "name",                    null: false
     t.text     "display_name"
     t.text     "note"
     t.integer  "position"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "attachment_file_name"
+    t.string   "attachment_content_type"
+    t.integer  "attachment_file_size"
+    t.datetime "attachment_updated_at"
   end
 
   create_table "checked_items", force: :cascade do |t|
@@ -520,6 +525,7 @@
     t.integer  "import_request_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "most_recent"
   end
 
   add_index "import_request_transitions", ["import_request_id"], name: "index_import_request_transitions_on_import_request_id"
@@ -931,6 +937,8 @@
     t.datetime "picture_updated_at"
     t.text     "picture_meta"
     t.string   "picture_fingerprint"
+    t.integer  "picture_width"
+    t.integer  "picture_height"
   end
 
   add_index "picture_files", ["picture_attachable_id", "picture_attachable_type"], name: "index_picture_files_on_picture_attachable_id_and_type"
@@ -1083,6 +1091,7 @@
     t.integer  "resource_export_file_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "most_recent"
   end
 
   add_index "resource_export_file_transitions", ["resource_export_file_id"], name: "index_resource_export_file_transitions_on_file_id"
@@ -1106,6 +1115,7 @@
     t.integer  "resource_import_file_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "most_recent"
   end
 
   add_index "resource_import_file_transitions", ["resource_import_file_id"], name: "index_resource_import_file_transitions_on_file_id"

spec/factories/agent.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :agent do |f|
     f.sequence(:full_name){|n| "full_name_#{n}"}
     f.agent_type_id{AgentType.find_by_name('Person').id}
@@ -7,7 +7,7 @@
   end
 end
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :invalid_agent, :class => Agent do |f|
   end
 end

spec/factories/agent_relationship.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :agent_relationship do |f|
-    f.parent_id{FactoryGirl.create(:agent).id}
-    f.child_id{FactoryGirl.create(:agent).id}
+    f.parent_id{FactoryBot.create(:agent).id}
+    f.child_id{FactoryBot.create(:agent).id}
   end
 end

spec/factories/agent_relationship_type.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :agent_relationship_type do |f|
     f.sequence(:name){|n| "agent_relationship_type_#{n}"}
   end

spec/factories/agent_type.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :agent_type do |f|
     f.sequence(:name){|n| "agent_type_#{n}"}
   end

spec/factories/basket.rb

@@ -1,5 +1,5 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :basket do |f|
-    f.user_id{FactoryGirl.create(:user).id}
+    f.user_id{FactoryBot.create(:user).id}
   end
 end

spec/factories/carrier_type.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :carrier_type do |f|
     f.sequence(:name){|n| "carrier_type_#{n}"}
   end

spec/factories/content_type.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :content_type do |f|
     f.sequence(:name){|n| "content_type_#{n}"}
   end

spec/factories/country.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :country do |f|
     f.sequence(:name){|n| "country_#{n}"}
     f.sequence(:alpha_2){|n| "alpha_2_#{n}"}

spec/factories/create.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :create do |f|
-    f.work_id{FactoryGirl.create(:manifestation).id}
-    f.agent_id{FactoryGirl.create(:agent).id}
+    f.work_id{FactoryBot.create(:manifestation).id}
+    f.agent_id{FactoryBot.create(:agent).id}
   end
 end

spec/factories/create_types.rb

@@ -1,6 +1,6 @@
 # Read about factories at http://github.com/thoughtbot/factory_girl
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :create_type do
     name "MyString"
     display_name "MyText"

spec/factories/donate.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :donate do |f|
-    f.item_id{FactoryGirl.create(:item).id}
-    f.agent_id{FactoryGirl.create(:agent).id}
+    f.item_id{FactoryBot.create(:item).id}
+    f.agent_id{FactoryBot.create(:agent).id}
   end
 end

spec/factories/exemplify.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :exemplify do |f|
-    f.manifestation_id{FactoryGirl.create(:manifestation).id}
-    f.item_id{FactoryGirl.create(:item).id}
+    f.manifestation_id{FactoryBot.create(:manifestation).id}
+    f.item_id{FactoryBot.create(:item).id}
   end
 end

spec/factories/extent.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :extent do |f|
     f.sequence(:name){|n| "extent_#{n}"}
   end

spec/factories/form_of_work.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :form_of_work do |f|
     f.sequence(:name){|n| "form_of_work_#{n}"}
   end

spec/factories/frequency.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :frequency do |f|
     f.sequence(:name){|n| "frequency_#{n}"}
   end

spec/factories/import_request.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :import_request do |f|
     f.sequence(:isbn){|n| "isbn_#{n}"}
   end

spec/factories/item.rb

@@ -1,7 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :item do |f|
     f.sequence(:item_identifier){|n| "item_#{n}"}
     f.circulation_status_id{CirculationStatus.find(1).id}
-    f.manifestation_id{FactoryGirl.create(:manifestation).id}
+    f.manifestation_id{FactoryBot.create(:manifestation).id}
   end
 end

spec/factories/language.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :language do |f|
     f.sequence(:name){|n| "language_#{n}"}
     f.sequence(:iso_639_1){|n| "639_1_#{n}"}

spec/factories/library.rb

@@ -1,12 +1,12 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :library do |f|
     f.sequence(:name){|n| "library#{n}"}
     f.sequence(:short_display_name){|n| "library_#{n}"}
     f.library_group_id{LibraryGroup.first.id}
   end
 end
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :invalid_library, :class => Library do |f|
     f.library_group_id{LibraryGroup.first.id}
   end

spec/factories/license.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :license do |f|
     f.sequence(:name){|n| "license_#{n}"}
   end

spec/factories/manifestation.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :manifestation do |f|
     f.sequence(:original_title){|n| "manifestation_title_#{n}"}
     f.carrier_type_id{CarrierType.find(1).id}

spec/factories/manifestation_relationship.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :manifestation_relationship do |f|
-    f.parent_id{FactoryGirl.create(:manifestation).id}
-    f.child_id{FactoryGirl.create(:manifestation).id}
+    f.parent_id{FactoryBot.create(:manifestation).id}
+    f.child_id{FactoryBot.create(:manifestation).id}
   end
 end

spec/factories/manifestation_relationship_type.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :manifestation_relationship_type do |f|
     f.sequence(:name){|n| "manifestation_relationship_type_#{n}"}
   end

spec/factories/medium_of_performance.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :medium_of_performance do |f|
     f.sequence(:name){|n| "medium_of_performance_#{n}"}
   end

spec/factories/own.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :own do |f|
-    f.item_id{FactoryGirl.create(:item).id}
-    f.agent_id{FactoryGirl.create(:agent).id}
+    f.item_id{FactoryBot.create(:item).id}
+    f.agent_id{FactoryBot.create(:agent).id}
   end
 end

spec/factories/produce.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :produce do |f|
-    f.manifestation_id{FactoryGirl.create(:manifestation).id}
-    f.agent_id{FactoryGirl.create(:agent).id}
+    f.manifestation_id{FactoryBot.create(:manifestation).id}
+    f.agent_id{FactoryBot.create(:agent).id}
   end
 end

spec/factories/produce_types.rb

@@ -1,6 +1,6 @@
 # Read about factories at http://github.com/thoughtbot/factory_girl
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :produce_type do
     name "MyString"
     display_name "MyText"

spec/factories/profile.rb

@@ -1,10 +1,10 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :profile, :class => Profile do |f|
     f.user_group_id {UserGroup.first.id}
     f.required_role_id {Role.where(name: 'User').first.id}
     f.sequence(:user_number){|n| "user_number_#{n}"}
     f.library_id 2
     f.locale "ja"
-    f.user_id {FactoryGirl.create(:user).id}
+    f.user_id {FactoryBot.create(:user).id}
   end
 end

spec/factories/realize.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :realize do |f|
-    f.expression_id{FactoryGirl.create(:manifestation).id}
-    f.agent_id{FactoryGirl.create(:agent).id}
+    f.expression_id{FactoryBot.create(:manifestation).id}
+    f.agent_id{FactoryBot.create(:agent).id}
   end
 end

spec/factories/realize_types.rb

@@ -1,6 +1,6 @@
 # Read about factories at http://github.com/thoughtbot/factory_girl
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :realize_type do
     name "MyString"
     display_name "MyText"

spec/factories/series_has_manifestation.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :series_has_manifestation do |f|
-    f.manifestation_id{FactoryGirl.create(:manifestation).id}
-    f.series_statement_id{FactoryGirl.create(:series_statement).id}
+    f.manifestation_id{FactoryBot.create(:manifestation).id}
+    f.series_statement_id{FactoryBot.create(:series_statement).id}
   end
 end

spec/factories/series_statement.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :series_statement do |f|
     f.sequence(:original_title){|n| "series_statement_#{n}"}
   end

spec/factories/series_statement_relationship.rb

@@ -1,8 +1,8 @@
 # Read about factories at https://github.com/thoughtbot/factory_girl
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :series_statement_relationship do |f|
-    f.parent_id{FactoryGirl.create(:series_statement).id}
-    f.child_id{FactoryGirl.create(:series_statement).id}
+    f.parent_id{FactoryBot.create(:series_statement).id}
+    f.child_id{FactoryBot.create(:series_statement).id}
   end
 end

spec/factories/user.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :admin, :class => User do |f|
     f.sequence(:username){|n| "admin_#{n}"}
     f.sequence(:email){|n| "admin_#{n}@example.jp"}

spec/rails_helper.rb

@@ -11,7 +11,7 @@
 require 'spec_helper'
 require 'rspec/rails'
 # Add additional requires below this line. Rails is not loaded until this point!
-require 'factory_girl'
+require 'factory_bot'
 require 'sunspot-rails-tester'
 require 'pundit/rspec'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
@@ -72,6 +72,6 @@
   end
 end
 
-FactoryGirl.definition_file_paths << "#{::Rails.root}/../../spec/factories"
-FactoryGirl.find_definitions
+FactoryBot.definition_file_paths << "#{::Rails.root}/../../spec/factories"
+FactoryBot.find_definitions
 

spec/views/manifestations/index.html.erb_spec.rb

@@ -6,7 +6,7 @@
   before(:each) do
     @manifestations = assign(:manifestations,
       Kaminari.paginate_array( [
-        FactoryGirl.create(:manifestation),
+        FactoryBot.create(:manifestation),
       ], total_count: 1).page(1)
     )
     @count = { query_result: 1 }

spec/views/manifestations/show.html.erb_spec.rb

@@ -4,7 +4,7 @@
   fixtures :all
 
   before(:each) do
-    @manifestation = assign(:manifestation, FactoryGirl.create(:manifestation))
+    @manifestation = assign(:manifestation, FactoryBot.create(:manifestation))
     @library_group = LibraryGroup.first
   end