hyrax 2.0.0.rc1 → 2.0.0.rc2

data/spec/helpers/hyrax/collections_helper_spec.rb

@@ -55,7 +55,7 @@ RSpec.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
@@ -92,7 +92,7 @@ RSpec.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 @@
 RSpec.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>") }
 
   describe '#displayable_content_block' do
     let(:options) { {} }

data/spec/helpers/hyrax/trophy_helper_spec.rb

@@ -1,6 +1,6 @@
 RSpec.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/jobs/create_derivatives_job_spec.rb

@@ -83,11 +83,10 @@ RSpec.describe CreateDerivativesJob do
         .with(/test\.pdf/, outputs: [{ label: :thumbnail,
                                        format: 'jpg',
                                        size: '338x493',
-                                       url: String }])
+                                       url: String,
+                                       layer: 0 }])
       expect(Hydra::Derivatives::FullTextExtract).to receive(:create)
-        .with(/test\.pdf/, outputs: [{ url: RDF::URI,
-                                       container: "extracted_text" }])
-
+        .with(/test\.pdf/, outputs: [{ url: RDF::URI, container: "extracted_text" }])
       described_class.perform_now(file_set, file.id)
     end
   end

data/spec/jobs/ingest_local_file_job_spec.rb

@@ -4,16 +4,13 @@ RSpec.describe IngestLocalFileJob do
   let(:file_set) { FileSet.new }
   let(:actor) { double }
 
-  let(:mock_upload_directory) { 'spec/mock_upload_directory' }
-
   before do
-    Dir.mkdir mock_upload_directory unless File.exist? mock_upload_directory
-    FileUtils.copy(File.expand_path('../../fixtures/world.png', __FILE__), mock_upload_directory)
     allow(Hyrax::Actors::FileSetActor).to receive(:new).with(file_set, user).and_return(actor)
   end
 
   it 'has attached a file' do
+    expect(FileUtils).not_to receive(:rm)
     expect(actor).to receive(:create_content).and_return(true)
-    described_class.perform_now(file_set, File.join(mock_upload_directory, 'world.png'), user)
+    described_class.perform_now(file_set, File.join(fixture_path, 'world.png'), user)
   end
 end

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

@@ -9,7 +9,7 @@ RSpec.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)) }
   let(:work_actor) { instance_double(Hyrax::Actors::TransactionalRequest) }
   let(:file_actor) { double }
 
@@ -41,7 +41,7 @@ RSpec.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

@@ -1,7 +1,7 @@
 RSpec.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,5 +1,5 @@
 RSpec.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

@@ -43,6 +43,8 @@ RSpec.describe Hyrax::Configuration do
   it { is_expected.to respond_to(:google_analytics_id?) }
   it { is_expected.to respond_to(:google_analytics_id) }
   it { is_expected.to respond_to(:libreoffice_path) }
+  it { is_expected.to respond_to(:license_service_class) }
+  it { is_expected.to respond_to(:license_service_class=) }
   it { is_expected.to respond_to(:max_days_between_fixity_checks=) }
   it { is_expected.to respond_to(:max_days_between_fixity_checks) }
   it { is_expected.to respond_to(:max_notifications_for_dashboard) }
@@ -52,6 +54,8 @@ RSpec.describe Hyrax::Configuration do
   it { is_expected.to respond_to(:persistent_hostpath) }
   it { is_expected.to respond_to(:realtime_notifications?) }
   it { is_expected.to respond_to(:realtime_notifications=) }
+  it { is_expected.to respond_to(:rights_statement_service_class) }
+  it { is_expected.to respond_to(:rights_statement_service_class=) }
   it { is_expected.to respond_to(:redis_namespace) }
   it { is_expected.to respond_to(:subject_prefix) }
   it { is_expected.to respond_to(:translate_id_to_uri) }

data/spec/models/file_set_spec.rb

@@ -213,7 +213,7 @@ RSpec.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 }
 

data/spec/models/generic_work_spec.rb

@@ -24,7 +24,7 @@ RSpec.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

data/spec/models/hyrax/user_usage_stats_spec.rb

@@ -1,5 +1,5 @@
 RSpec.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

@@ -16,7 +16,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 @@
 RSpec.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([])
@@ -13,7 +13,7 @@ RSpec.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
@@ -21,7 +21,7 @@ RSpec.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'])
@@ -236,8 +236,8 @@ RSpec.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 }
 

data/spec/presenters/hyrax/admin/users_presenter_spec.rb

@@ -1,7 +1,7 @@
 RSpec.describe Hyrax::Admin::UsersPresenter do
   let(:instance) { described_class.new }
-  let!(:user) { FactoryGirl.create(:user) }
-  let!(:admin_user) { FactoryGirl.create(:user, groups: 'admin') }
+  let!(:user) { FactoryBot.create(:user) }
+  let!(:admin_user) { FactoryBot.create(:user, groups: 'admin') }
   let!(:audit_user) { User.audit_user }
   let!(:batch_user) { User.batch_user }
 

data/spec/renderers/hyrax/renderers/rights_statement_attribute_renderer_spec.rb

@@ -0,0 +1,20 @@
+RSpec.describe Hyrax::Renderers::RightsStatementAttributeRenderer do
+  let(:field) { :rights_statement }
+  let(:renderer) { described_class.new(field, ['http://rightsstatements.org/vocab/InC/1.0/']) }
+
+  describe "#attribute_to_html" do
+    subject { Nokogiri::HTML(renderer.render) }
+
+    let(:expected) { Nokogiri::HTML(tr_content) }
+
+    let(:tr_content) do
+      "<tr><th>Rights statement</th>\n" \
+       "<td><ul class='tabular'>" \
+       "<li class=\"attribute rights_statement\"><a href=\"http://rightsstatements.org/vocab/InC/1.0/\" target=\"_blank\">In Copyright</a></li>" \
+       "</ul></td></tr>"
+    end
+
+    it { expect(renderer).not_to be_microdata(field) }
+    it { expect(subject).to be_equivalent_to(expected) }
+  end
+end

data/spec/search_builders/hyrax/stats/work_status_search_builder_spec.rb

@@ -11,22 +11,22 @@ RSpec.describe Hyrax::Stats::WorkStatusSearchBuilder do
   describe "#query" do
     subject { instance.query }
 
-    let(:stub_relation) do
-      instance_double(Hyrax::WorkRelation,
-                      search_model_clause: "(model clauses)")
-    end
-
-    before do
-      # Prevent the stub relation from returning different filters depending on
-      # how many models have been generated
-      allow(instance).to receive(:work_relation).and_return(stub_relation)
-    end
-
     it "sets required parameters" do
       expect(subject['facet.field']).to eq ["suppressed_bsi"]
-      expect(subject['fq']).to eq "(model clauses)"
       expect(subject['facet.missing']).to eq true
       expect(subject['rows']).to eq 0
     end
   end
+
+  describe "#only_works?" do
+    subject { instance.send(:only_works?) }
+
+    it { is_expected.to be true }
+  end
+
+  describe "::default_processor_chain" do
+    subject { described_class.default_processor_chain }
+
+    it { is_expected.to include(:filter_models) }
+  end
 end

data/spec/services/hyrax/default_middleware_stack_spec.rb

@@ -13,7 +13,6 @@ RSpec.describe Hyrax::DefaultMiddlewareStack do
         Hyrax::Actors::CreateWithFilesActor,
         Hyrax::Actors::CollectionsMembershipActor,
         Hyrax::Actors::AddToWorkActor,
-        Hyrax::Actors::AssignRepresentativeActor,
         Hyrax::Actors::AttachMembersActor,
         Hyrax::Actors::ApplyOrderActor,
         Hyrax::Actors::InterpretVisibilityActor,

data/spec/services/hyrax/embargo_service_spec.rb

@@ -5,19 +5,19 @@ RSpec.describe Hyrax::EmbargoService do
   let(:past_date) { 2.days.ago }
 
   let!(:work_with_expired_embargo1) do
-    FactoryGirl.build(:generic_work, embargo_release_date: past_date.to_s).tap do |work|
+    FactoryBot.build(:generic_work, embargo_release_date: past_date.to_s).tap do |work|
       work.save(validate: false)
     end
   end
 
   let!(:work_with_expired_embargo2) do
-    FactoryGirl.build(:generic_work, embargo_release_date: past_date.to_s).tap do |work|
+    FactoryBot.build(:generic_work, embargo_release_date: past_date.to_s).tap do |work|
       work.save(validate: false)
     end
   end
 
-  let!(:work_with_embargo_in_effect) { FactoryGirl.create(:generic_work, embargo_release_date: future_date.to_s) }
-  let!(:work_without_embargo) { FactoryGirl.create(:generic_work) }
+  let!(:work_with_embargo_in_effect) { FactoryBot.create(:generic_work, embargo_release_date: future_date.to_s) }
+  let!(:work_without_embargo) { FactoryBot.create(:generic_work) }
 
   describe '#assets_with_expired_embargoes' do
     it 'returns an array of assets with expired embargoes' do

data/spec/services/hyrax/workflow/notification_service_spec.rb

@@ -23,11 +23,6 @@ RSpec.describe Hyrax::Workflow::NotificationService do
   let(:action) { Sipity::WorkflowAction.new(notifiable_contexts: [notifiable_context]) }
   let(:entity) { Sipity::Entity.new }
   let(:user) { User.new }
-
-  let(:workflow) { Sipity::Workflow.new }
-  let(:workflow_state) { Sipity::WorkflowState.new }
-  let(:permission_template) { Hyrax::PermissionTemplate.new }
-
   let(:instance) do
     described_class.new(entity: entity,
                         action: action,
@@ -35,34 +30,6 @@ RSpec.describe Hyrax::Workflow::NotificationService do
                         user: user)
   end
 
-  describe '#recipients' do
-    context 'when an entity requires review' do
-      let(:creator) { [instance_double(User)] }
-      let(:managers) { [instance_double(User), instance_double(User)] }
-      let(:notification) { Sipity::Notification.new(name: 'pending review notification') }
-
-      before do
-        allow(instance).to receive(:send_notification) # mock it so it does nothing
-        allow(entity).to receive(:workflow_state).and_return(workflow_state)
-        allow(workflow_state).to receive(:name).and_return('pending_review')
-        allow(entity).to receive(:workflow).and_return(workflow)
-        # Mock the permission_template queries
-        allow(workflow).to receive(:permission_template).and_return(permission_template)
-        allow(permission_template).to receive(:agent_ids_for)
-          .with(access: 'manage', agent_type: 'user')
-          .and_return(managers)
-        allow(permission_template).to receive(:agent_ids_for)
-          .with(access: 'deposit', agent_type: 'user')
-          .and_return(creator)
-      end
-
-      it 'identifies the managers and depositor for notifications' do
-        recipients = instance.recipients(notification)
-        expect(recipients).to eq(to: managers, cc: creator)
-      end
-    end
-  end
-
   describe "#call" do
     subject { instance.call }
 
@@ -81,8 +48,6 @@ RSpec.describe Hyrax::Workflow::NotificationService do
       let(:creator_rel) { double(ActiveRecord::Relation, to_ary: creator) }
 
       before do
-        allow(entity).to receive(:workflow_state).and_return(workflow_state)
-        allow(workflow_state).to receive(:name).and_return('not_pending_review')
         allow(Hyrax::Workflow::PermissionQuery).to receive(:scope_users_for_entity_and_roles)
           .with(entity: entity,
                 roles: advising)

data/spec/services/hyrax/workflow/permission_generator_spec.rb

@@ -1,7 +1,7 @@
 module Hyrax
   module Workflow
     RSpec.describe PermissionGenerator do
-      let(:user) { FactoryGirl.create(:user) }
+      let(:user) { FactoryBot.create(:user) }
       let(:role) { Sipity::Role.create!(name: 'creating_user') }
       let(:workflow) { create(:workflow, name: 'workflow') }
       let(:workflow_state) { workflow.initial_workflow_state }

data/spec/services/hyrax/workflow/status_list_service_spec.rb

@@ -41,6 +41,18 @@ RSpec.describe Hyrax::Workflow::StatusListService do
         expect(results.first.to_s).to eq 'Hey dood!'
         expect(results.first.workflow_state).to eq 'initial'
       end
+
+      describe '#search_solr' do
+        let(:mock_response) { { 'response' => { 'docs' => [{}, {}, {}] } } }
+
+        it 'queries Solr via HTTP POST method' do
+          allow(ActiveFedora::SolrService).to receive(:post).and_return(mock_response)
+          allow(ActiveFedora::SolrService).to receive(:get)
+          service.send(:search_solr)
+          expect(ActiveFedora::SolrService).to have_received(:post)
+          expect(ActiveFedora::SolrService).not_to have_received(:get)
+        end
+      end
     end
 
     context "when user doesn't have roles" do

data/spec/spec_helper.rb

@@ -21,7 +21,7 @@ if coverage_needed?
   SimpleCov.command_name 'spec'
 end
 
-require 'factory_girl'
+require 'factory_bot'
 require 'engine_cart'
 EngineCart.load_application!
 
@@ -89,7 +89,7 @@ end
 
 class JsonStrategy
   def initialize
-    @strategy = FactoryGirl.strategy_by_name(:create).new
+    @strategy = FactoryBot.strategy_by_name(:create).new
   end
 
   delegate :association, to: :@strategy
@@ -99,9 +99,9 @@ class JsonStrategy
   end
 end
 
-FactoryGirl.register_strategy(:json, JsonStrategy)
-FactoryGirl.definition_file_paths = [File.expand_path("../factories", __FILE__)]
-FactoryGirl.find_definitions
+FactoryBot.register_strategy(:json, JsonStrategy)
+FactoryBot.definition_file_paths = [File.expand_path("../factories", __FILE__)]
+FactoryBot.find_definitions
 
 module EngineRoutes
   def self.included(base)
@@ -195,7 +195,7 @@ RSpec.configure do |config|
 
   config.include Capybara::RSpecMatchers, type: :input
   config.include InputSupport, type: :input
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
 
   config.infer_spec_type_from_file_location!
 

data/spec/support/features/session_helpers.rb

@@ -3,7 +3,7 @@ module Features
   module SessionHelpers
     def sign_in(who = :user)
       logout
-      user = who.is_a?(User) ? who : FactoryGirl.build(:user).tap(&:save!)
+      user = who.is_a?(User) ? who : FactoryBot.build(:user).tap(&:save!)
       visit new_user_session_path
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password