hyrax 2.0.0.beta4 → 2.0.0.beta5

data/spec/helpers/hyrax/content_block_helper_spec.rb

@@ -10,6 +10,12 @@ RSpec.describe Hyrax::ContentBlockHelper, type: :helper do
       expect(helper).to respond_to(:displayable_content_block)
     end
 
+    context 'when a block is nil' do
+      let(:content_block) { nil }
+
+      it { is_expected.to be_nil }
+    end
+
     context 'when a block has a nil value' do
       let(:content_block) { double(value: nil) }
 

data/spec/helpers/hyrax_helper_spec.rb

@@ -283,19 +283,6 @@ RSpec.describe HyraxHelper, type: :helper do
     end
   end
 
-  describe '#browser_supports_directory_upload?' do
-    subject { helper.browser_supports_directory_upload? }
-
-    context 'with Chrome' do
-      before { controller.request.env['HTTP_USER_AGENT'] = 'Chrome' }
-      it { is_expected.to be true }
-    end
-    context 'with a non-chrome browser' do
-      before { controller.request.env['HTTP_USER_AGENT'] = 'Firefox' }
-      it { is_expected.to be false }
-    end
-  end
-
   describe '#zotero_label' do
     subject { helper }
 

data/spec/indexers/hyrax/generic_work_indexer_spec.rb

@@ -89,7 +89,10 @@ RSpec.describe GenericWorkIndexer do
         .and_return(['approve', 'reject'])
     end
     it "indexed the roles and state" do
-      expect(solr_document.fetch('actionable_workflow_roles_ssim')).to eq ["#{sipity_entity.workflow.name}-approve", "#{sipity_entity.workflow.name}-reject"]
+      expect(solr_document.fetch('actionable_workflow_roles_ssim')).to eq [
+        "#{sipity_entity.workflow.permission_template.admin_set_id}-#{sipity_entity.workflow.name}-approve",
+        "#{sipity_entity.workflow.permission_template.admin_set_id}-#{sipity_entity.workflow.name}-reject"
+      ]
       expect(solr_document.fetch('workflow_state_name_ssim')).to eq "initial"
     end
   end

data/spec/javascripts/autocomplete_spec.js.coffee

@@ -15,6 +15,45 @@ describe "auto complete", ->
     #undefine the jasmine clock so time goes back to normal
     jasmine.clock().uninstall()
 
+  describe "title", ->
+    beforeEach ->
+      # setup two inputs for us to attach auto complete to
+      setFixtures  '<form data-behavior="work-form">
+                    <input class="generic_work_title"  value="" id="generic_work_title" type="text">
+                    <input class="generic_work_title"  value="" type="text">
+                    </form>'
+
+      # run all Blacklight.onload functions
+      Blacklight.activate()
+
+    describe "first input", ->
+      # field doesn't trigger auto complete
+      it "does not auto complete on typing", ->
+        # send a key stroke to the target input to activate the auto complete
+        target = $($("input.generic_work_title")[0])
+        target.val('fre')
+        target.trigger(@typeEvent)
+
+        # move time along so that events have a chance to happen
+        jasmine.clock().tick(800)
+
+        # verify that the ajax call was made
+        expect(@spy_on_json).not.toHaveBeenCalled()
+
+    describe "second input", ->
+      # field doesn't trigger auto complete
+      it "does not auto complete on typing", ->
+        # send a key stroke to the target input to activate the auto complete
+        target = $($("input.generic_work_title")[1])
+        target.val('fre')
+        target.trigger(@typeEvent)
+
+        # move time along so that events have a chance to happen
+        jasmine.clock().tick(800)
+
+        # verify that the ajax call was not made
+        expect(@spy_on_json).not.toHaveBeenCalled()
+
   describe "language", ->
     beforeEach ->
       # setup two inputs for us to attach  auto complete to
@@ -41,7 +80,6 @@ describe "auto complete", ->
         # verify that the ajax call was made
         expect(@spy_on_json).toHaveBeenCalled()
 
-
     describe "second input", ->
 
       # field triggers auto complete
@@ -83,7 +121,6 @@ describe "auto complete", ->
         # verify that the ajax call was made
         expect(@spy_on_json).toHaveBeenCalled()
 
-
     describe "second input", ->
 
       # field triggers auto complete
@@ -99,7 +136,6 @@ describe "auto complete", ->
         # verify that the ajax call was made
         expect(@spy_on_json).toHaveBeenCalled()
 
-
   describe "location", ->
     beforeEach ->
       # setup two inputs for us to attach  auto complete to
@@ -126,7 +162,6 @@ describe "auto complete", ->
         # verify that the ajax call was made
         expect(@spy_on_json).toHaveBeenCalled()
 
-
     describe "second input", ->
 
       # field triggers auto complete

data/spec/jobs/fixity_check_job_spec.rb

@@ -2,8 +2,7 @@ RSpec.describe FixityCheckJob do
   let(:user) { create(:user) }
 
   let(:file_set) do
-    FileSet.create do |file|
-      file.apply_depositor_metadata(user)
+    create(:file_set, user: user).tap do |file|
       Hydra::Works::AddFileToFileSet.call(file, File.open(fixture_path + '/world.png'), :original_file, versioning: true)
     end
   end

data/spec/lib/hyrax/configuration_spec.rb

@@ -18,8 +18,8 @@ RSpec.describe Hyrax::Configuration do
   it { is_expected.to respond_to(:active_deposit_agreement_acceptance?) }
   it { is_expected.to respond_to(:active_deposit_agreement_acceptance=) }
   it { is_expected.to respond_to(:activity_to_show_default_seconds_since_now) }
-  it { is_expected.to respond_to(:always_display_share_button?) } # deprecated
-  it { is_expected.to respond_to(:always_display_share_button=) } # deprecated
+  it { is_expected.to respond_to(:admin_set_predicate) }
+  it { is_expected.to respond_to(:admin_set_predicate=) }
   it { is_expected.to respond_to(:analytic_start_date) }
   it { is_expected.to respond_to(:analytics?) }
   it { is_expected.to respond_to(:analytics) }
@@ -59,4 +59,6 @@ RSpec.describe Hyrax::Configuration do
   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/admin_set_spec.rb

@@ -97,30 +97,6 @@ RSpec.describe AdminSet, type: :model do
     end
   end
 
-  it "has a title that is an ActiveTriples::Relation" do
-    subject.title = ['Hello World']
-    expect(subject.title).to eq(['Hello World'])
-    expect(subject.title).to be_a(ActiveTriples::Relation)
-  end
-
-  it "has a description that is an ActiveTriples::Relation" do
-    subject.description = ['My description']
-    expect(subject.description).to eq(['My description'])
-    expect(subject.description).to be_a(ActiveTriples::Relation)
-  end
-
-  describe '#title=' do
-    it 'raises an error if set with a String' do
-      expect { subject.title = 'New Title' }.to raise_error(ArgumentError)
-    end
-  end
-
-  describe '#description=' do
-    it 'raises an error if set with a String' do
-      expect { subject.description = 'New Description' }.to raise_error(ArgumentError)
-    end
-  end
-
   describe ".default_set?" do
     context "with default AdminSet ID" do
       it "returns true" do

data/spec/models/collection_spec.rb

@@ -58,19 +58,6 @@ RSpec.describe Collection do
     end
   end
 
-  it "has a title", clean_repo: true do
-    subject.title = ["title"]
-    subject.save!
-    expect(subject.reload.title).to eq ["title"]
-  end
-
-  it "has a description", clean_repo: true do
-    subject.title = ["title"] # Because the title is required
-    subject.description = ["description"]
-    subject.save!
-    expect(subject.reload.description).to eq ["description"]
-  end
-
   describe "#destroy", clean_repo: true do
     let(:collection) { build(:collection) }
     let(:work1) { create(:work) }

data/spec/models/file_set_spec.rb

@@ -296,23 +296,6 @@ RSpec.describe FileSet do
       subject.read_groups = ['group-2', 'group-3']
       expect(subject.read_groups).to eq ['group-2', 'group-3']
     end
-
-    it 'has read groups string writer' do
-      subject.read_groups_string = 'umg/up.dlt.staff, group-3'
-      expect(subject.read_groups).to eq ['umg/up.dlt.staff', 'group-3']
-      expect(subject.edit_groups).to eq ['group-8']
-      expect(subject.read_users).to eq %w[person1 person2]
-      expect(subject.edit_users).to eq ['jcoyne']
-    end
-
-    it 'revokes only eligible groups' do
-      subject.set_read_groups(['group-2', 'group-3'], ['group-6'])
-      # 'group-7' is not eligible to be revoked
-      expect(subject.read_groups).to match_array ['group-2', 'group-3', 'group-7']
-      expect(subject.edit_groups).to eq ['group-8']
-      expect(subject.read_users).to match_array %w[person1 person2]
-      expect(subject.edit_users).to eq ['jcoyne']
-    end
   end
 
   describe 'permissions validation' do

data/spec/models/generic_work_spec.rb

@@ -74,17 +74,6 @@ RSpec.describe GenericWork do
     end
   end
 
-  describe "created for someone (proxy)" do
-    let(:work) { described_class.new(title: ['demoname']) { |gw| gw.apply_depositor_metadata("user") } }
-    let(:transfer_to) { create(:user) }
-
-    it "transfers the request" do
-      work.on_behalf_of = transfer_to.user_key
-      expect(ContentDepositorChangeEventJob).to receive(:perform_later).once
-      work.save!
-    end
-  end
-
   describe "delegations" do
     let(:work) { described_class.new { |gw| gw.apply_depositor_metadata("user") } }
     let(:proxy_depositor) { create(:user) }

data/spec/models/solr_document_spec.rb

@@ -155,38 +155,6 @@ RSpec.describe ::SolrDocument, type: :model do
     end
   end
 
-  describe '#collections' do
-    subject { document.collections }
-
-    context 'when the object belongs to a collection' do
-      let(:coll_id) { '456' }
-      let(:attributes) do
-        { id: '123',
-          title_tesim: ['A generic work'],
-          collection_ids_tesim: [coll_id] }
-      end
-
-      let(:coll_attrs) { { id: coll_id, title_tesim: ['A Collection'] } }
-
-      before do
-        ActiveFedora::SolrService.add(coll_attrs)
-        ActiveFedora::SolrService.commit
-      end
-
-      it 'returns the solr docs for the collections' do
-        expect(subject.count).to eq 1
-        solr_doc = subject.first
-        expect(solr_doc).to be_kind_of described_class
-        expect(solr_doc['id']).to eq coll_id
-        expect(solr_doc['title_tesim']).to eq coll_attrs[:title_tesim]
-      end
-    end
-
-    context 'when the object does not belong to any collections' do
-      it { is_expected.to eq [] }
-    end
-  end
-
   describe "#height" do
     let(:attributes) { { height_is: '444' } }
 

data/spec/models/user_spec.rb

@@ -96,21 +96,36 @@ RSpec.describe User, type: :model do
       expect(user).to be_valid
       expect(user.save).to be true
     end
-    it 'saves when a valid ORCID URI is supplied' do
-      user.orcid = 'http://orcid.org/0000-0000-1111-2222'
+    it 'saves when a valid ORCID HTTP URI w/ trailing slash is supplied' do
+      user.orcid = 'http://orcid.org/0000-0000-1111-2222/'
       expect(user).to be_valid
       expect(user.save).to be true
     end
-    it 'normalizes bare ORCIDs to URIs' do
+    it 'saves when a valid ORCID HTTPS URI is supplied' do
+      user.orcid = 'https://orcid.org/0000-0000-1111-2222'
+      expect(user).to be_valid
+      expect(user.save).to be true
+    end
+    it 'normalizes bare ORCIDs to HTTPS URIs' do
       user.orcid = '0000-0000-1111-2222'
       user.save
-      expect(user.orcid).to eq 'http://orcid.org/0000-0000-1111-2222'
+      expect(user.orcid).to eq 'https://orcid.org/0000-0000-1111-2222'
+    end
+    it 'normalizes HTTP ORCIDs to HTTPS URIs' do
+      user.orcid = 'http://orcid.org/0000-0000-1111-2222'
+      user.save
+      expect(user.orcid).to eq 'https://orcid.org/0000-0000-1111-2222'
     end
-    it 'marks bad ORCIDs as invalid' do
+    it 'marks short ORCIDs as invalid' do
       user.orcid = '000-000-111-222'
       expect(user).not_to be_valid
       expect(user.save).to be false
     end
+    it 'marks long ORCIDs as invalid' do
+      user.orcid = '0000-0000-1111-222222'
+      expect(user).not_to be_valid
+      expect(user.save).to be false
+    end
   end
 
   describe "#to_param" do

data/spec/presenters/hyrax/file_usage_spec.rb

@@ -1,8 +1,7 @@
 RSpec.describe Hyrax::FileUsage, type: :model do
+  let(:user) { build(:user) }
   let(:file) do
-    FileSet.create do |file|
-      file.apply_depositor_metadata("awead")
-    end
+    create(:file_set, user: user)
   end
 
   let(:dates) do
@@ -148,11 +147,8 @@ RSpec.describe Hyrax::FileUsage, type: :model do
 
   describe "on a migrated file" do
     let(:date_uploaded) { "2014-12-31" }
-
     let(:file_migrated) do
-      FileSet.create(date_uploaded: date_uploaded) do |file|
-        file.apply_depositor_metadata("awead")
-      end
+      create(:file_set, date_uploaded: date_uploaded, user: user)
     end
 
     let(:usage) do

data/spec/services/hyrax/admin_set_create_service_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Hyrax::AdminSetCreateService do
       #  * 1 depositing role for the registered group in the default workflow, equals
       #  * 7
       expect(Sipity::WorkflowResponsibility.count).to eq 7
-      expect(admin_set.read_groups).to eq ['public']
+      expect(admin_set.read_groups).not_to include('public')
       expect(admin_set.edit_groups).to eq ['admin']
       # 2 access grants because:
       #  * 1 providing deposit access to registered group
@@ -85,7 +85,7 @@ RSpec.describe Hyrax::AdminSetCreateService do
           #  * 2 available workflows, multiplied by
           #  * 3 roles (from Hyrax::RoleRegistry), equals
           #  * 12
-          expect(admin_set.read_groups).to eq ['public']
+          expect(admin_set.read_groups).not_to include('public')
           expect(admin_set.edit_groups).to eq ['admin']
           expect(admin_set.creator).to eq [user.user_key]
           expect(workflow_importer).to have_received(:call).with(permission_template: permission_template)

data/spec/services/hyrax/admin_set_service_spec.rb

@@ -11,8 +11,8 @@ RSpec.describe Hyrax::AdminSetService do
   describe "#search_results", :clean_repo do
     subject { service.search_results(access) }
 
-    let!(:as1) { create(:admin_set, :public, title: ['foo']) }
-    let!(:as2) { create(:admin_set, :public, title: ['bar']) }
+    let!(:as1) { create(:admin_set, read_groups: ['public'], title: ['foo']) }
+    let!(:as2) { create(:admin_set, read_groups: ['public'], title: ['bar']) }
     let!(:as3) { create(:admin_set, edit_users: [user.user_key], title: ['baz']) }
 
     before do

data/spec/services/hyrax/change_content_depositor_service_spec.rb

@@ -2,14 +2,10 @@ RSpec.describe Hyrax::ChangeContentDepositorService do
   let!(:depositor) { create(:user) }
   let!(:receiver) { create(:user) }
   let!(:file) do
-    FileSet.create! do |f|
-      f.apply_depositor_metadata(depositor.user_key)
-    end
+    create(:file_set, user: depositor)
   end
   let!(:work) do
-    GenericWork.create!(title: ['Test work']) do |w|
-      w.apply_depositor_metadata(depositor.user_key)
-    end
+    create(:work, title: ['Test work'], user: depositor)
   end
 
   before do

data/spec/services/hyrax/collections_service_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe Hyrax::CollectionsService do
     let!(:collection3) { create(:collection, :public, edit_users: [user.user_key], title: ['baz']) }
 
     before do
-      create(:admin_set, :public) # this should never be returned.
+      create(:admin_set, read_groups: ['public']) # this should never be returned.
     end
 
     context "with read access" do

data/spec/services/hyrax/default_middleware_stack_spec.rb

@@ -17,6 +17,7 @@ RSpec.describe Hyrax::DefaultMiddlewareStack do
         Hyrax::Actors::AttachMembersActor,
         Hyrax::Actors::ApplyOrderActor,
         Hyrax::Actors::InterpretVisibilityActor,
+        Hyrax::Actors::TransferRequestActor,
         Hyrax::Actors::DefaultAdminSetActor,
         Hyrax::Actors::ApplyPermissionTemplateActor,
         Hyrax::Actors::CleanupFileSetsActor,

data/spec/services/hyrax/import_url_failure_service_spec.rb

@@ -3,9 +3,7 @@ RSpec.describe Hyrax::ImportUrlFailureService do
   let!(:depositor) { create(:user) }
   let(:inbox) { depositor.mailbox.inbox }
   let(:file) do
-    FileSet.create do |file|
-      file.apply_depositor_metadata(depositor)
-    end
+    create(:file_set, user: depositor)
   end
 
   before do

data/spec/services/hyrax/persist_directly_contained_output_file_service_spec.rb

@@ -1,6 +1,7 @@
 RSpec.describe Hyrax::PersistDirectlyContainedOutputFileService do
   # PersistDirectlyContainedOutputFileService is used by FullTextExtract.output_file_service
-  let(:file_set) { FileSet.create! { |fs| fs.apply_depositor_metadata('justin') } }
+  let(:file_set) { create(:file_set, user: user) }
+  let(:user) { build(:user) }
   let(:content) { "fake file content" }
   let(:resource) { file_set.reload.extracted_text }