From 6d0bcde08ff03fcf277b385068221068a4287afa Mon Sep 17 00:00:00 2001 From: Kosuke Tanabe Date: Sun, 24 Dec 2017 22:18:36 +0900 Subject: [PATCH] require factory_bot --- enju_grid.gemspec | 2 +- spec/dummy/db/schema.rb | 14 ++++++++++++-- spec/factories/agent.rb | 4 ++-- spec/factories/agent_relationship.rb | 6 +++--- spec/factories/agent_relationship_type.rb | 2 +- spec/factories/agent_type.rb | 2 +- spec/factories/basket.rb | 4 ++-- spec/factories/carrier_type.rb | 2 +- spec/factories/content_type.rb | 2 +- spec/factories/country.rb | 2 +- spec/factories/create.rb | 6 +++--- spec/factories/create_types.rb | 2 +- spec/factories/donate.rb | 6 +++--- spec/factories/exemplify.rb | 6 +++--- spec/factories/extent.rb | 2 +- spec/factories/form_of_work.rb | 2 +- spec/factories/frequency.rb | 2 +- spec/factories/import_request.rb | 2 +- spec/factories/item.rb | 4 ++-- spec/factories/language.rb | 2 +- spec/factories/library.rb | 4 ++-- spec/factories/license.rb | 2 +- spec/factories/manifestation.rb | 2 +- spec/factories/manifestation_relationship.rb | 6 +++--- spec/factories/manifestation_relationship_type.rb | 2 +- spec/factories/medium_of_performance.rb | 2 +- spec/factories/own.rb | 6 +++--- spec/factories/produce.rb | 6 +++--- spec/factories/produce_types.rb | 2 +- spec/factories/profile.rb | 4 ++-- spec/factories/realize.rb | 6 +++--- spec/factories/realize_types.rb | 2 +- spec/factories/series_has_manifestation.rb | 6 +++--- spec/factories/series_statement.rb | 2 +- spec/factories/series_statement_relationship.rb | 6 +++--- spec/factories/user.rb | 2 +- spec/rails_helper.rb | 6 +++--- spec/views/manifestations/index.html.erb_spec.rb | 2 +- spec/views/manifestations/show.html.erb_spec.rb | 2 +- 39 files changed, 77 insertions(+), 67 deletions(-) diff --git a/enju_grid.gemspec b/enju_grid.gemspec index 1c1b033..8d9f038 100644 --- a/enju_grid.gemspec +++ b/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" diff --git a/spec/dummy/db/schema.rb b/spec/dummy/db/schema.rb index f0b8126..5efaae0 100644 --- a/spec/dummy/db/schema.rb +++ b/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" diff --git a/spec/factories/agent.rb b/spec/factories/agent.rb index 9b2760d..a31a7d5 100644 --- a/spec/factories/agent.rb +++ b/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 diff --git a/spec/factories/agent_relationship.rb b/spec/factories/agent_relationship.rb index 8f15464..1fb423b 100644 --- a/spec/factories/agent_relationship.rb +++ b/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 diff --git a/spec/factories/agent_relationship_type.rb b/spec/factories/agent_relationship_type.rb index 8751df5..12d9d74 100644 --- a/spec/factories/agent_relationship_type.rb +++ b/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 diff --git a/spec/factories/agent_type.rb b/spec/factories/agent_type.rb index 42c7a7a..9f79225 100644 --- a/spec/factories/agent_type.rb +++ b/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 diff --git a/spec/factories/basket.rb b/spec/factories/basket.rb index cef0c58..1a2ee72 100644 --- a/spec/factories/basket.rb +++ b/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 diff --git a/spec/factories/carrier_type.rb b/spec/factories/carrier_type.rb index 78c8c14..bce8a8a 100644 --- a/spec/factories/carrier_type.rb +++ b/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 diff --git a/spec/factories/content_type.rb b/spec/factories/content_type.rb index 29fb499..0fdedfd 100644 --- a/spec/factories/content_type.rb +++ b/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 diff --git a/spec/factories/country.rb b/spec/factories/country.rb index 5136a1a..ba50d18 100644 --- a/spec/factories/country.rb +++ b/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}"} diff --git a/spec/factories/create.rb b/spec/factories/create.rb index e8866e9..4682133 100644 --- a/spec/factories/create.rb +++ b/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 diff --git a/spec/factories/create_types.rb b/spec/factories/create_types.rb index cda2663..2dc1d2b 100644 --- a/spec/factories/create_types.rb +++ b/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" diff --git a/spec/factories/donate.rb b/spec/factories/donate.rb index dead92a..56ac9db 100644 --- a/spec/factories/donate.rb +++ b/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 diff --git a/spec/factories/exemplify.rb b/spec/factories/exemplify.rb index 7b43deb..9363801 100644 --- a/spec/factories/exemplify.rb +++ b/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 diff --git a/spec/factories/extent.rb b/spec/factories/extent.rb index 150ae15..5afac4e 100644 --- a/spec/factories/extent.rb +++ b/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 diff --git a/spec/factories/form_of_work.rb b/spec/factories/form_of_work.rb index 0088011..428f1c2 100644 --- a/spec/factories/form_of_work.rb +++ b/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 diff --git a/spec/factories/frequency.rb b/spec/factories/frequency.rb index 3ec1758..c598822 100644 --- a/spec/factories/frequency.rb +++ b/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 diff --git a/spec/factories/import_request.rb b/spec/factories/import_request.rb index 0088601..0a202f3 100644 --- a/spec/factories/import_request.rb +++ b/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 diff --git a/spec/factories/item.rb b/spec/factories/item.rb index f6d745b..2c589d2 100644 --- a/spec/factories/item.rb +++ b/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 diff --git a/spec/factories/language.rb b/spec/factories/language.rb index c00d030..6dd4265 100644 --- a/spec/factories/language.rb +++ b/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}"} diff --git a/spec/factories/library.rb b/spec/factories/library.rb index 4c757cf..4898dcb 100644 --- a/spec/factories/library.rb +++ b/spec/factories/library.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :library do |f| f.sequence(:name){|n| "library#{n}"} f.sequence(:short_display_name){|n| "library_#{n}"} @@ -6,7 +6,7 @@ end end -FactoryGirl.define do +FactoryBot.define do factory :invalid_library, :class => Library do |f| f.library_group_id{LibraryGroup.first.id} end diff --git a/spec/factories/license.rb b/spec/factories/license.rb index e085039..b39f4f4 100644 --- a/spec/factories/license.rb +++ b/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 diff --git a/spec/factories/manifestation.rb b/spec/factories/manifestation.rb index ca487c1..06f29f9 100644 --- a/spec/factories/manifestation.rb +++ b/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} diff --git a/spec/factories/manifestation_relationship.rb b/spec/factories/manifestation_relationship.rb index 0b3fb56..efd24e8 100644 --- a/spec/factories/manifestation_relationship.rb +++ b/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 diff --git a/spec/factories/manifestation_relationship_type.rb b/spec/factories/manifestation_relationship_type.rb index 40738cd..dbadadb 100644 --- a/spec/factories/manifestation_relationship_type.rb +++ b/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 diff --git a/spec/factories/medium_of_performance.rb b/spec/factories/medium_of_performance.rb index 8d53bd8..b7329fa 100644 --- a/spec/factories/medium_of_performance.rb +++ b/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 diff --git a/spec/factories/own.rb b/spec/factories/own.rb index 66e78bb..e7cdcfb 100644 --- a/spec/factories/own.rb +++ b/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 diff --git a/spec/factories/produce.rb b/spec/factories/produce.rb index ce12df5..86cb637 100644 --- a/spec/factories/produce.rb +++ b/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 diff --git a/spec/factories/produce_types.rb b/spec/factories/produce_types.rb index cd82a7d..0bc3893 100644 --- a/spec/factories/produce_types.rb +++ b/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" diff --git a/spec/factories/profile.rb b/spec/factories/profile.rb index 5c8fe67..3a388aa 100644 --- a/spec/factories/profile.rb +++ b/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 diff --git a/spec/factories/realize.rb b/spec/factories/realize.rb index 3db2787..362ab65 100644 --- a/spec/factories/realize.rb +++ b/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 diff --git a/spec/factories/realize_types.rb b/spec/factories/realize_types.rb index 83ff187..7abc99c 100644 --- a/spec/factories/realize_types.rb +++ b/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" diff --git a/spec/factories/series_has_manifestation.rb b/spec/factories/series_has_manifestation.rb index 5d12b6b..9affad5 100644 --- a/spec/factories/series_has_manifestation.rb +++ b/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 diff --git a/spec/factories/series_statement.rb b/spec/factories/series_statement.rb index 34e28b3..51e02e1 100644 --- a/spec/factories/series_statement.rb +++ b/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 diff --git a/spec/factories/series_statement_relationship.rb b/spec/factories/series_statement_relationship.rb index a4ffe1c..f43b410 100644 --- a/spec/factories/series_statement_relationship.rb +++ b/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 diff --git a/spec/factories/user.rb b/spec/factories/user.rb index eb2e6c9..1e22001 100644 --- a/spec/factories/user.rb +++ b/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"} diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index abb98de..d1eb472 100644 --- a/spec/rails_helper.rb +++ b/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 diff --git a/spec/views/manifestations/index.html.erb_spec.rb b/spec/views/manifestations/index.html.erb_spec.rb index b4c9123..4972c9f 100644 --- a/spec/views/manifestations/index.html.erb_spec.rb +++ b/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 } diff --git a/spec/views/manifestations/show.html.erb_spec.rb b/spec/views/manifestations/show.html.erb_spec.rb index 57666a3..dd9159d 100644 --- a/spec/views/manifestations/show.html.erb_spec.rb +++ b/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