hyrax 1.0.5 → 1.1.0

data/spec/controllers/hyrax/workflow_actions_controller_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe Hyrax::WorkflowActionsController, type: :controller do
-  let(:user) { FactoryGirl.create(:user) }
+  let(:user) { FactoryBot.create(:user) }
   let(:generic_work) { GenericWork.new(id: '123') }
   let(:form) { instance_double(Hyrax::Forms::WorkflowActionForm) }
   routes { Rails.application.routes }

data/spec/conversions/power_converters/polymorphic_type_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe 'PowerConverter', no_clean: true do
       expect(PowerConverter.convert_to_polymorphic_type(object)).to eq(:symbol)
     end
     it 'will convert an ActiveRecord::Base object' do
-      user = FactoryGirl.build(:user)
+      user = FactoryBot.build(:user)
       expect(PowerConverter.convert_to_polymorphic_type(user)).to eq(user.class)
     end
     it 'will convert an object that responds to #base_class' do

data/spec/factories/admin_sets.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :admin_set do
     sequence(:title) { |n| ["Title #{n}"] }
 

data/spec/factories/api_items.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :post_item, class: Hash do
     skip_create
 

data/spec/factories/collections_factory.rb

@@ -1,7 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :collection do
     transient do
-      user { FactoryGirl.create(:user) }
+      user { FactoryBot.create(:user) }
     end
     sequence(:title) { |n| ["Title #{n}"] }
 

data/spec/factories/content_blocks.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :content_block do |_cb|
   end
 end

data/spec/factories/featured_works.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :featured_work do |_u|
   end
 end

data/spec/factories/file_sets.rb

@@ -1,7 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :file_set do
     transient do
-      user { FactoryGirl.create(:user) }
+      user { FactoryBot.create(:user) }
       content nil
     end
     after(:build) do |fs, evaluator|
@@ -63,7 +63,7 @@ FactoryGirl.define do
         if evaluator.content
           Hydra::Works::UploadFileToFileSet.call(file, evaluator.content)
         end
-        FactoryGirl.create(:generic_work, user: evaluator.user).members << file
+        FactoryBot.create(:generic_work, user: evaluator.user).members << file
       end
     end
   end

data/spec/factories/generic_works.rb

@@ -1,7 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :work, aliases: [:generic_work, :private_generic_work], class: GenericWork do
     transient do
-      user { FactoryGirl.create(:user) }
+      user { FactoryBot.create(:user) }
       # Set to true (or a hash) if you want to create an admin set
       with_admin_set false
     end
@@ -37,45 +37,45 @@ FactoryGirl.define do
 
     factory :work_with_one_file do
       before(:create) do |work, evaluator|
-        work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user, title: ['A Contained FileSet'], label: 'filename.pdf')
+        work.ordered_members << FactoryBot.create(:file_set, user: evaluator.user, title: ['A Contained FileSet'], label: 'filename.pdf')
       end
     end
 
     factory :work_with_files do
-      before(:create) { |work, evaluator| 2.times { work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user) } }
+      before(:create) { |work, evaluator| 2.times { work.ordered_members << FactoryBot.create(:file_set, user: evaluator.user) } }
     end
 
     factory :work_with_ordered_files do
       before(:create) do |work, evaluator|
-        work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user)
-        work.ordered_member_proxies.insert_target_at(0, FactoryGirl.create(:file_set, user: evaluator.user))
+        work.ordered_members << FactoryBot.create(:file_set, user: evaluator.user)
+        work.ordered_member_proxies.insert_target_at(0, FactoryBot.create(:file_set, user: evaluator.user))
       end
     end
 
     factory :work_with_one_child do
       before(:create) do |work, evaluator|
-        work.ordered_members << FactoryGirl.create(:generic_work, user: evaluator.user, title: ['A Contained Work'])
+        work.ordered_members << FactoryBot.create(:generic_work, user: evaluator.user, title: ['A Contained Work'])
       end
     end
 
     factory :work_with_two_children do
       before(:create) do |work, evaluator|
-        work.ordered_members << FactoryGirl.create(:generic_work, user: evaluator.user, title: ['A Contained Work'], id: "BlahBlah1")
-        work.ordered_members << FactoryGirl.create(:generic_work, user: evaluator.user, title: ['Another Contained Work'], id: "BlahBlah2")
+        work.ordered_members << FactoryBot.create(:generic_work, user: evaluator.user, title: ['A Contained Work'], id: "BlahBlah1")
+        work.ordered_members << FactoryBot.create(:generic_work, user: evaluator.user, title: ['Another Contained Work'], id: "BlahBlah2")
       end
     end
 
     factory :work_with_representative_file do
       before(:create) do |work, evaluator|
-        work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user, title: ['A Contained FileSet'])
+        work.ordered_members << FactoryBot.create(:file_set, user: evaluator.user, title: ['A Contained FileSet'])
         work.representative_id = work.members[0].id
       end
     end
 
     factory :work_with_file_and_work do
       before(:create) do |work, evaluator|
-        work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user)
-        work.ordered_members << FactoryGirl.create(:generic_work, user: evaluator.user)
+        work.ordered_members << FactoryBot.create(:file_set, user: evaluator.user)
+        work.ordered_members << FactoryBot.create(:generic_work, user: evaluator.user)
       end
     end
 
@@ -90,7 +90,7 @@ FactoryGirl.define do
       end
       factory :embargoed_work_with_files do
         after(:build) { |work, evaluator| work.apply_embargo(evaluator.embargo_date, evaluator.current_state, evaluator.future_state) }
-        after(:create) { |work, evaluator| 2.times { work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user) } }
+        after(:create) { |work, evaluator| 2.times { work.ordered_members << FactoryBot.create(:file_set, user: evaluator.user) } }
       end
     end
 
@@ -105,7 +105,7 @@ FactoryGirl.define do
       end
       factory :leased_work_with_files do
         after(:build) { |work, evaluator| work.apply_lease(evaluator.lease_date, evaluator.current_state, evaluator.future_state) }
-        after(:create) { |work, evaluator| 2.times { work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user) } }
+        after(:create) { |work, evaluator| 2.times { work.ordered_members << FactoryBot.create(:file_set, user: evaluator.user) } }
       end
     end
   end
@@ -113,6 +113,6 @@ FactoryGirl.define do
   # Doesn't set up any edit_users
   factory :work_without_access, class: GenericWork do
     title ['Test title']
-    depositor { FactoryGirl.create(:user).user_key }
+    depositor { FactoryBot.create(:user).user_key }
   end
 end

data/spec/factories/operations.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :operation, class: Hyrax::Operation do
     operation_type "Test operation"
 

data/spec/factories/permission_template_accesses.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :permission_template_access, class: Hyrax::PermissionTemplateAccess do
     permission_template
 

data/spec/factories/permission_templates.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :permission_template, class: Hyrax::PermissionTemplate do
     # Given that there is a one to one strong relation between permission_template and admin_set,
     # with a unique index on the admin_set_id, I don't want to have duplication in admin_set_id

data/spec/factories/proxy_deposit_requests.rb

@@ -1,6 +1,6 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :proxy_deposit_request do
   end
 end

data/spec/factories/single_use_links.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :single_use_link do
     factory :show_link do
       itemId 'fs-id'

data/spec/factories/sipity_entities.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :sipity_entity, class: Sipity::Entity do
     proxy_for_global_id 'gid://internal/Mock/1'
     workflow { workflow_state.workflow }

data/spec/factories/uploaded_files.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :uploaded_file, class: Hyrax::UploadedFile do
     user
   end

data/spec/factories/users.rb

@@ -1,11 +1,11 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user do
     sequence(:email) { |n| "user#{n}@example.com" }
     password 'password'
 
     transient do
       # Allow for custom groups when a user is instantiated.
-      # @example FactoryGirl.create(:user, groups: 'avacado')
+      # @example FactoryBot.create(:user, groups: 'avacado')
       groups []
     end
 

data/spec/factories/workflow_actions.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :workflow_action, class: Sipity::WorkflowAction do
     workflow
     name 'submit'

data/spec/factories/workflow_states.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :workflow_state, class: Sipity::WorkflowState do
     workflow
     name 'initial'

data/spec/factories/workflows.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :workflow, class: Sipity::Workflow do
     sequence(:name) { |n| "generic_work-#{n}" }
     permission_template

data/spec/features/browse_dashboard_files_spec.rb

@@ -1,8 +1,8 @@
 describe "Browse Dashboard", type: :feature do
-  let(:user) { FactoryGirl.create(:user) }
-  let!(:dissertation) { FactoryGirl.create(:public_work, user: user, title: ["Fake PDF Title"], subject: %w(lorem ipsum dolor sit amet)) }
-  let!(:mp3_work) { FactoryGirl.create(:public_work, user: user, title: ["Test Document MP3"], subject: %w(consectetur adipisicing elit)) }
-  let!(:audio_work) { FactoryGirl.create(:public_work, user: user, title: ["Fake Wav Files"], subject: %w(sed do eiusmod tempor incididunt ut labore)) }
+  let(:user) { FactoryBot.create(:user) }
+  let!(:dissertation) { FactoryBot.create(:public_work, user: user, title: ["Fake PDF Title"], subject: %w(lorem ipsum dolor sit amet)) }
+  let!(:mp3_work) { FactoryBot.create(:public_work, user: user, title: ["Test Document MP3"], subject: %w(consectetur adipisicing elit)) }
+  let!(:audio_work) { FactoryBot.create(:public_work, user: user, title: ["Fake Wav Files"], subject: %w(sed do eiusmod tempor incididunt ut labore)) }
 
   before do
     sign_in user

data/spec/features/notifications_spec.rb

@@ -1,6 +1,6 @@
 describe "Notifications page", type: :feature do
   before do
-    sign_in FactoryGirl.create(:user_with_mail)
+    sign_in FactoryBot.create(:user_with_mail)
     visit "/notifications"
   end
 

data/spec/features/show_admin_set_spec.rb

@@ -0,0 +1,11 @@
+RSpec.feature 'show admin set' do
+  let(:admin_set) { FactoryBot.create(:admin_set) }
+  let(:admin) { FactoryBot.create(:admin) }
+
+  scenario "show admin set" do
+    login_as admin
+    expect(admin_set.description).to be_empty
+    visit("/admin/admin_sets/#{admin_set.id}")
+    expect(page).to have_content admin_set.title.first
+  end
+end

data/spec/helpers/hyrax/collections_helper_spec.rb

@@ -54,7 +54,7 @@ describe Hyrax::CollectionsHelper do
 
   describe "button_for_remove_from_collection" do
     let(:item) { double(id: 'changeme:123') }
-    let(:collection) { FactoryGirl.create(:collection) }
+    let(:collection) { FactoryBot.create(:collection) }
 
     it "generates a form that can remove the item" do
       str = button_for_remove_from_collection collection, item
@@ -91,7 +91,7 @@ describe Hyrax::CollectionsHelper do
   end
 
   describe "button_for_remove_selected_from_collection" do
-    let(:collection) { FactoryGirl.create(:collection) }
+    let(:collection) { FactoryBot.create(:collection) }
 
     it "creates a button to the collections delete path" do
       str = button_for_remove_selected_from_collection collection

data/spec/helpers/hyrax/content_block_helper_spec.rb

@@ -1,5 +1,5 @@
 describe Hyrax::ContentBlockHelper, type: :helper do
-  let(:content_block) { FactoryGirl.create(:content_block, value: "<p>foo bar</p>") }
+  let(:content_block) { FactoryBot.create(:content_block, value: "<p>foo bar</p>") }
 
   subject { helper.editable_content_block(content_block) }
 

data/spec/helpers/hyrax/trophy_helper_spec.rb

@@ -1,6 +1,6 @@
 describe Hyrax::TrophyHelper, type: :helper do
   describe "#display_trophy_link" do
-    let(:user) { FactoryGirl.create(:user) }
+    let(:user) { FactoryBot.create(:user) }
     let(:id) { '9999' }
 
     let(:text_attributes) { '[data-add-text="Highlight Work on Profile"][data-remove-text="Unhighlight Work"]' }

data/spec/lib/hyrax/arkivo/actor_spec.rb

@@ -11,7 +11,7 @@ describe Hyrax::Arkivo::Actor do
   subject { described_class.new(user, item) }
 
   let(:user) { create(:user) }
-  let(:item) { JSON.parse(FactoryGirl.json(:post_item)) }
+  let(:item) { JSON.parse(FactoryBot.json(:post_item)) }
 
   describe 'Tempfile monkey-patches' do
     subject { Tempfile.new('foo') }
@@ -43,7 +43,7 @@ describe Hyrax::Arkivo::Actor do
   end
 
   describe '#update_work_from_item' do
-    let(:item) { JSON.parse(FactoryGirl.json(:put_item)) }
+    let(:item) { JSON.parse(FactoryBot.json(:put_item)) }
     let(:title) { ['ZZZZZ'] }
     let(:description) { ['This is rather lengthy.'] }
     let(:checksum) { 'abc123' }

data/spec/lib/hyrax/arkivo/metadata_munger_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Hyrax::Arkivo::MetadataMunger do
   subject { described_class.new(metadata) }
 
-  let(:metadata) { JSON.parse(FactoryGirl.json(:post_item))['metadata'] }
+  let(:metadata) { JSON.parse(FactoryBot.json(:post_item))['metadata'] }
 
   it 'makes camelCase symbols into underscored strings' do
     expect(metadata).to include('resourceType', 'dateCreated', 'basedNear')

data/spec/lib/hyrax/arkivo/schema_validator_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Hyrax::Arkivo::SchemaValidator do
-  let(:item) { JSON.parse(FactoryGirl.json(:post_item)) }
+  let(:item) { JSON.parse(FactoryBot.json(:post_item)) }
 
   it 'ensures a token is included' do
     expect do

data/spec/lib/hyrax/configuration_spec.rb

@@ -53,6 +53,7 @@ describe Hyrax::Configuration do
   it { is_expected.to respond_to(:translate_uri_to_id) }
   it { is_expected.to respond_to(:upload_path) }
   it { is_expected.to respond_to(:work_requires_files?) }
+  it { is_expected.to respond_to(:extract_full_text?) }
   it { is_expected.to respond_to(:whitelisted_ingest_dirs) }
   it { is_expected.to respond_to(:whitelisted_ingest_dirs=) }
 end

data/spec/models/file_set_spec.rb

@@ -211,7 +211,7 @@ describe FileSet do
     end
 
     context 'when there are related files' do
-      let(:parent_work)   { FactoryGirl.create(:work_with_files) }
+      let(:parent_work)   { FactoryBot.create(:work_with_files) }
       let(:f1)            { parent_work.file_sets.first }
       let(:f2)            { parent_work.file_sets.last }
       subject { f1.reload.related_files }

data/spec/models/generic_work_spec.rb

@@ -22,7 +22,7 @@ describe GenericWork do
   end
 
   describe "to_sipity_entity" do
-    let(:state) { FactoryGirl.create(:workflow_state) }
+    let(:state) { FactoryBot.create(:workflow_state) }
     let(:work) { create(:work) }
     before do
       Sipity::Entity.create!(proxy_for_global_id: work.to_global_id.to_s,

data/spec/models/hyrax/user_usage_stats_spec.rb

@@ -1,5 +1,5 @@
 describe Hyrax::UserUsageStats do
-  subject { FactoryGirl.create(:user) }
+  subject { FactoryBot.create(:user) }
 
   describe 'with cached stats' do
     let!(:stat_1_day_ago) { UserStat.create!(user_id: subject.id, date: 1.day.ago, file_views: 3, file_downloads: 2, work_views: 5) }

data/spec/models/sipity/entity_spec.rb

@@ -17,7 +17,7 @@ module Sipity
     end
 
     describe '#proxy_for' do
-      let(:work) { FactoryGirl.create(:generic_work) }
+      let(:work) { FactoryBot.create(:generic_work) }
       let(:entity) { Sipity::Entity.new(proxy_for_global_id: work.to_global_id) }
 
       it 'will retrieve based on a GlobalID of the object' do

data/spec/models/user_spec.rb

@@ -1,10 +1,10 @@
 describe User, type: :model do
-  let(:user) { FactoryGirl.build(:user) }
-  let(:another_user) { FactoryGirl.build(:user) }
+  let(:user) { FactoryBot.build(:user) }
+  let(:another_user) { FactoryBot.build(:user) }
 
   describe 'verifying factories' do
     describe ':user' do
-      let(:user) { FactoryGirl.build(:user) }
+      let(:user) { FactoryBot.build(:user) }
       it 'will, by default, have no groups' do
         expect(user.groups).to eq([])
         user.save!
@@ -12,7 +12,7 @@ describe User, type: :model do
         expect(user.class.find(user.id).groups).to eq([])
       end
       it 'will allow for override of groups' do
-        user = FactoryGirl.build(:user, groups: 'chicken')
+        user = FactoryBot.build(:user, groups: 'chicken')
         expect(user.groups).to eq(['chicken'])
         user.save!
         # Ensuring that we can refind it and have the correct groups
@@ -20,7 +20,7 @@ describe User, type: :model do
       end
     end
     describe ':admin' do
-      let(:admin_user) { FactoryGirl.create(:admin) }
+      let(:admin_user) { FactoryBot.create(:admin) }
       it 'will have an "admin" group' do
         expect(admin_user.groups).to eq(['admin'])
       end
@@ -201,8 +201,8 @@ describe User, type: :model do
     end
   end
   describe "scope Users" do
-    let!(:basic_user) { FactoryGirl.create(:user) }
-    let!(:guest_user) { FactoryGirl.create(:user, :guest) }
+    let!(:basic_user) { FactoryBot.create(:user) }
+    let!(:guest_user) { FactoryBot.create(:user, :guest) }
     let!(:audit_user) { User.audit_user }
     let!(:batch_user) { User.batch_user }