hyrax 2.1.0.beta1 → 2.1.0.beta2

data/spec/features/dashboard/display_admin_dashboard_spec.rb

@@ -0,0 +1,29 @@
+RSpec.describe "The dashboard as viewed by a admin user", type: :feature do
+  before do
+    sign_in create(:admin)
+  end
+
+  context "upon sign-in" do
+    it "shows the admin user's information" do
+      expect(page).to have_content "Dashboard"
+      expect(page).to have_content "Registered Users"
+      expect(page).to have_content "Total Visitors"
+      expect(page).to have_content "Returning Visitors"
+      expect(page).to have_content "New Visitors"
+      expect(page).to have_content "Administrative Sets"
+      expect(page).to have_content "Recent activity"
+      expect(page).to have_content "Administrative Set"
+      expect(page).to have_content "User Activity"
+      expect(page).to have_content "Repository Growth"
+      expect(page).to have_content "Repository Objects"
+
+      within '.sidebar' do
+        expect(page).to have_link "Works"
+        expect(page).to have_link "Collections"
+        expect(page).to have_content "Review Submissions"
+        expect(page).to have_content "Manage Embargoes"
+        expect(page).to have_content "Manage Leases"
+      end
+    end
+  end
+end

data/spec/features/dashboard/display_dashboard_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe "The dashboard as viewed by a regular user", type: :feature do
 
   context "upon sign-in" do
     it "shows the user's information" do
-      expect(page).to have_content "My Dashboard"
+      expect(page).to have_content "Dashboard"
       expect(page).to have_content "User Activity"
       expect(page).to have_content "User Notifications"
 

data/spec/features/edit_content_block_admin_spec.rb

@@ -0,0 +1,45 @@
+RSpec.describe 'Editing content blocks as admin', :js do
+  let(:user) { create(:admin) }
+
+  context 'when user wants to change tabs' do
+    let!(:confirm_modal_text) { 'Are you sure you want to leave this tab?  Any unsaved data will be lost.' }
+
+    before do
+      sign_in user
+      visit '/dashboard'
+      click_link 'Settings'
+      click_link 'Content Blocks'
+    end
+
+    it "gives a confirmation message" do
+      expect(page).to have_content('Content Blocks')
+      expect(page).to have_content('Announcement')
+      click_link 'Marketing Text'
+      within('#change-tab-content-block') do
+        expect(page).to have_content(confirm_modal_text)
+      end
+    end
+
+    it "changes tab when user accept the changing tab confirmation" do
+      expect(page).to have_selector('#announcement_text', class: 'active')
+      expect(page).not_to have_selector('#marketing', class: 'active')
+      click_link 'Marketing Text'
+      within('#change-tab-content-block') do
+        click_link('OK')
+      end
+      expect(page).to have_selector('#marketing', class: 'active')
+      expect(page).not_to have_selector('#announcement_text', class: 'active')
+    end
+
+    it "does not change tab when user cancel the changing tab confirmation" do
+      expect(page).to have_selector('#announcement_text', class: 'active')
+      expect(page).not_to have_selector('#marketing', class: 'active')
+      click_link 'Marketing Text'
+      within('#change-tab-content-block') do
+        click_button('Cancel')
+      end
+      expect(page).not_to have_selector('#marketing', class: 'active')
+      expect(page).to have_selector('#announcement_text', class: 'active')
+    end
+  end
+end

data/spec/features/edit_work_spec.rb

@@ -1,6 +1,17 @@
 RSpec.describe 'Editing a work', type: :feature do
   let(:user) { create(:user) }
-  let(:work) { build(:work, user: user) }
+  let(:work) { build(:work, user: user, admin_set: another_admin_set) }
+  let(:default_admin_set) do
+    create(:admin_set, id: AdminSet::DEFAULT_ID,
+                       title: ["Default Admin Set"],
+                       description: ["A description"],
+                       edit_users: [user.user_key])
+  end
+  let(:another_admin_set) do
+    create(:admin_set, title: ["Another Admin Set"],
+                       description: ["A description"],
+                       edit_users: [user.user_key])
+  end
 
   before do
     sign_in user
@@ -10,7 +21,9 @@ RSpec.describe 'Editing a work', type: :feature do
   end
 
   context 'when the user changes permissions' do
-    it 'confirms copying permissions to files using Hyrax layout' do
+    let(:work) { create(:private_work, user: user, admin_set: default_admin_set) }
+
+    it 'confirms copying permissions to files using Hyrax layout and shows updated value', with_nested_reindexing: true do
       # e.g. /concern/generic_works/jq085k20z/edit
       visit edit_hyrax_generic_work_path(work)
       choose('generic_work_visibility_open')
@@ -18,6 +31,31 @@ RSpec.describe 'Editing a work', type: :feature do
       click_on('Save')
       expect(page).to have_content 'Apply changes to contents?'
       expect(page).not_to have_content "Powered by Hyrax"
+      click_on("No. I'll update it manually.")
+      within(".panel-heading") do
+        expect(page).to have_content('Public')
+      end
+    end
+  end
+
+  context 'when form loads' do
+    before do
+      create(:permission_template_access,
+             :deposit,
+             permission_template: create(:permission_template, source_id: default_admin_set.id, with_admin_set: true, with_active_workflow: true),
+             agent_type: 'user',
+             agent_id: user.user_key)
+      create(:permission_template_access,
+             :deposit,
+             permission_template: create(:permission_template, source_id: another_admin_set.id, with_admin_set: true, with_active_workflow: true),
+             agent_type: 'user',
+             agent_id: user.user_key)
+    end
+
+    it 'selects admin set already assigned' do
+      visit edit_hyrax_generic_work_path(work)
+      click_link "Relationships" # switch tab
+      expect(page).to have_select('generic_work_admin_set_id', selected: another_admin_set.title)
     end
   end
 end

data/spec/features/ownership_transfer_spec.rb

@@ -34,6 +34,7 @@ RSpec.describe 'Transferring work ownership:', type: :feature do
 
       context 'If the new owner accepts it' do
         before do
+          expect(page).to have_content('Transfer request created')
           new_owner.proxy_deposit_requests.last.transfer!
           # refresh the page
           visit '/dashboard'

data/spec/features/proxy_spec.rb

@@ -6,8 +6,7 @@ RSpec.describe 'proxy', type: :feature do
     it "creates a proxy" do
       sign_in user
       click_link "Your activity"
-      click_link "Profile"
-      click_link "Edit Profile"
+      click_link "Manage Proxies"
       expect(first("td.depositor-name")).to be_nil
 
       # BEGIN create_proxy_using_partial
@@ -18,6 +17,7 @@ RSpec.describe 'proxy', type: :feature do
       # END create_proxy_using_partial
 
       expect(page).to have_css('td.depositor-name', text: second_user.user_key)
+      expect(page).to have_link('Delete Proxy')
     end
   end
 end

data/spec/features/search_spec.rb

@@ -35,21 +35,18 @@ RSpec.describe 'searching' do
       # it "does not display search options for dashboard files" do
       # This section was tested on its own, and required a full setup.
       within(".input-group-btn") do
+        expect(page).not_to have_content("All")
         expect(page).not_to have_content("My Works")
         expect(page).not_to have_content("My Collections")
         expect(page).not_to have_content("My Shares")
       end
-      # end
 
-      expect(page).to have_content("All")
-      expect(page).to have_css("a[data-search-label*=All]", visible: false)
+      expect(page).not_to have_css("a[data-search-label*=All]", visible: false)
       expect(page).not_to have_css("a[data-search-label*='My Works']", visible: false)
       expect(page).not_to have_css("a[data-search-label*='My Collections']", visible: false)
       expect(page).not_to have_css("a[data-search-label*='My Highlights']", visible: false)
       expect(page).not_to have_css("a[data-search-label*='My Shares']", visible: false)
 
-      click_button("All")
-      expect(page).to have_content("All of Hyrax")
       fill_in "search-field-header", with: subject_value
       click_button("Go")
 

data/spec/features/work_show_spec.rb

@@ -7,14 +7,18 @@ RSpec.describe "display a work as its owner" do
 
   context "as the work owner" do
     let(:work) do
-      create(:work_with_one_file,
+      create(:work,
              with_admin_set: true,
-             title: ["Magnificent splendor"],
+             title: ["Magnificent splendor", "Happy little trees"],
              source: ["The Internet"],
              based_near: ["USA"],
-             user: user)
+             user: user,
+             ordered_members: [file_set],
+             representative_id: file_set.id)
     end
     let(:user) { create(:user) }
+    let(:file_set) { create(:file_set, user: user, title: ['A Contained FileSet'], content: file) }
+    let(:file) { File.open(fixture_path + '/world.png') }
 
     before do
       sign_in user
@@ -23,19 +27,25 @@ RSpec.describe "display a work as its owner" do
 
     it "shows a work" do
       expect(page).to have_selector 'h2', text: 'Magnificent splendor'
+      expect(page).to have_selector 'h2', text: 'Happy little trees'
       expect(page).to have_selector 'li', text: 'The Internet'
       expect(page).to have_selector 'th', text: 'Location'
       expect(page).not_to have_selector 'th', text: 'Based near'
+      expect(page).to have_selector 'button', text: 'Attach Child', count: 1
 
       # Displays FileSets already attached to this work
       within '.related-files' do
         expect(page).to have_selector '.attribute-filename', text: 'A Contained FileSet'
       end
+
+      # IIIF manifest does not include locale query param
+      expect(find('div.viewer:first')['data-uri']).to eq "/concern/generic_works/#{work.id}/manifest"
     end
   end
 
   context "as a user who is not logged in" do
     let(:work) { create(:public_generic_work, title: ["Magnificent splendor"], source: ["The Internet"], based_near: ["USA"]) }
+    let(:page_title) { { text: "Generic Work | Magnificent splendor | ID: #{work.id} | Hyrax" }.to_param }
 
     before do
       visit work_path
@@ -51,7 +61,7 @@ RSpec.describe "display a work as its owner" do
       expect(page).not_to have_selector "form#fileupload"
 
       # has some social media buttons
-      expect(page).to have_link '', href: "https://twitter.com/intent/tweet/?text=Magnificent+splendor&url=http%3A%2F%2Fwww.example.com%2Fconcern%2Fgeneric_works%2F#{work.id}"
+      expect(page).to have_link '', href: "https://twitter.com/intent/tweet/?#{page_title}&url=http%3A%2F%2Fwww.example.com%2Fconcern%2Fgeneric_works%2F#{work.id}"
 
       # exports EndNote
       expect(page).to have_link 'EndNote'

data/spec/forms/hyrax/forms/admin/collection_type_form_spec.rb

@@ -7,6 +7,7 @@ RSpec.describe Hyrax::Forms::Admin::CollectionTypeForm do
   it { is_expected.to delegate_method(:title).to(:collection_type) }
   it { is_expected.to delegate_method(:description).to(:collection_type) }
   it { is_expected.to delegate_method(:nestable).to(:collection_type) }
+  it { is_expected.to delegate_method(:brandable).to(:collection_type) }
   it { is_expected.to delegate_method(:sharable).to(:collection_type) }
   it { is_expected.to delegate_method(:share_applies_to_new_works).to(:collection_type) }
   it { is_expected.to delegate_method(:require_membership).to(:collection_type) }

data/spec/forms/hyrax/forms/collection_form_spec.rb

@@ -159,7 +159,7 @@ RSpec.describe Hyrax::Forms::CollectionForm do
       it { is_expected.to be_empty }
     end
 
-    context 'with a work/file attached', :with_nested_reindexing do
+    context 'with a work/file attached' do
       let!(:work) { create(:work_with_one_file, :public, member_of_collections: [collection]) }
       let(:title) { work.file_sets.first.title.first }
       let(:file_id) { work.file_sets.first.id }

data/spec/helpers/hyrax/ability_helper_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe Hyrax::AbilityHelper do
       Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC =>
         "<span class=\"label label-success\">Public</span>",
       Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED =>
-        "<span class=\"label label-info\">%s</span>",
+        "<span class=\"label label-info\">%<name>s</span>",
       Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE =>
         "<span class=\"label label-danger\">Private</span>",
       Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO =>
@@ -17,7 +17,7 @@ RSpec.describe Hyrax::AbilityHelper do
       context value do
         let(:visibility) { value }
 
-        it { expect(subject).to eql(output % t('hyrax.institution_name')) }
+        it { expect(subject).to eql(format(output, name: t('hyrax.institution_name'))) }
       end
     end
   end

data/spec/helpers/hyrax/collections_helper_spec.rb

@@ -1,4 +1,7 @@
 RSpec.describe Hyrax::CollectionsHelper do
+  let(:user) { create(:user, groups: ['admin']) }
+  let(:ability) { Ability.new(user) }
+
   before do
     # Stub route because helper specs don't handle engine routes
     # https://github.com/rspec/rspec-rails/issues/1250
@@ -9,9 +12,13 @@ RSpec.describe Hyrax::CollectionsHelper do
   end
 
   describe '#render_collection_links' do
-    let!(:work_doc) { SolrDocument.new(id: '123', title_tesim: ['My GenericWork']) }
+    before do
+      allow(controller).to receive(:current_ability).and_return(ability)
+    end
 
     context 'when a GenericWork does not belongs to any collections', :clean_repo do
+      let!(:work_doc) { SolrDocument.new(id: '123', title_tesim: ['My GenericWork']) }
+
       it 'renders nothing' do
         expect(helper.render_collection_links(work_doc)).to be_nil
       end
@@ -20,8 +27,9 @@ RSpec.describe Hyrax::CollectionsHelper do
     context 'when a GenericWork belongs to collections' do
       let(:coll_ids) { ['111', '222'] }
       let(:coll_titles) { ['Collection 111', 'Collection 222'] }
-      let(:coll1_attrs) { { id: coll_ids[0], title_tesim: [coll_titles[0]], child_object_ids_ssim: [work_doc.id] } }
-      let(:coll2_attrs) { { id: coll_ids[1], title_tesim: [coll_titles[1]], child_object_ids_ssim: [work_doc.id, 'abc123'] } }
+      let(:coll1_attrs) { { id: coll_ids[0], title_tesim: [coll_titles[0]] } }
+      let(:coll2_attrs) { { id: coll_ids[1], title_tesim: [coll_titles[1]] } }
+      let!(:work_doc) { SolrDocument.new(id: '123', title_tesim: ['My GenericWork'], member_of_collection_ids_ssim: coll_ids) }
 
       before do
         ActiveFedora::SolrService.add(coll1_attrs)
@@ -80,7 +88,7 @@ RSpec.describe Hyrax::CollectionsHelper do
       let(:test_collection_type) { FactoryBot.create(:collection_type) }
 
       it "returns the CollectionType title" do
-        expect(collection_type_label(test_collection_type.gid)).to match %r{^Title \d+$}
+        expect(collection_type_label(test_collection_type.gid)).to eq test_collection_type.title
       end
     end
 

data/spec/javascripts/authority_select_spec.js

@@ -15,7 +15,7 @@ describe('authority select', () => {
     })
 
     it('should change the data-autocomplete-url when you select an authority', () => {
-	      new AuthoritySelect(editor, { selectBox : "select.generic_work_creator", inputField : "input.generic_work_creator" }).initialize()
+	      new AuthoritySelect({ selectBox : "select.generic_work_creator", inputField : "input.generic_work_creator" })
 	      $('select.generic_work_creator').val('/authorities/search/assign_fast/all').change()
 	      expect($('input.generic_work_creator').data('autocomplete-url')).toEqual('/authorities/search/assign_fast/all')
     })

data/spec/javascripts/settings_spec.js

@@ -51,6 +51,7 @@ function settingsForm() {
         '            <div class="form-inline">' +
         '              <p><div class="form-group boolean optional collection_type_nestable"><div class="checkbox"><input value="0" type="hidden" name="collection_type[nestable]" /><label class="boolean optional" for="collection_type_nestable"><input class="boolean optional" type="checkbox" value="1" checked="checked" name="collection_type[nestable]" id="collection_type_nestable" />NESTABLE</label></div><p class="help-block">Allow collections of this type to be nested (a collection can contain other collections)</p></div></p>' +
         '              <p><div class="form-group boolean optional collection_type_discoverable"><div class="checkbox"><input value="0" type="hidden" name="collection_type[discoverable]" /><label class="boolean optional" for="collection_type_discoverable"><input class="boolean optional" type="checkbox" value="1" checked="checked" name="collection_type[discoverable]" id="collection_type_discoverable" />DISCOVERY</label></div><p class="help-block">Allow collections of this type to be discoverable</p></div></p>' +
+        '              <p><div class="form-group boolean optional collection_type_brandable"><div class="checkbox"><input value="0" type="hidden" name="collection_type[brandable]" /><label class="boolean optional" for="collection_type_brandable"><input class="boolean optional" type="checkbox" value="1" checked="checked" name="collection_type[brandable]" id="collection_type_brandable" />BRANDABLE</label></div><p class="help-block">Allow collections of this type to be branded</p></div></p>' +
         '              <p><div class="form-group boolean optional collection_type_sharable"><div class="checkbox"><input value="0" type="hidden" name="collection_type[sharable]" /><label class="boolean optional" for="collection_type_sharable"><input class="boolean optional" type="checkbox" value="1" checked="checked" name="collection_type[sharable]" id="collection_type_sharable" />SHARING</label></div><p class="help-block">Allow users to assign collection managers, depositors, and viewers for collections they manage</p></div></p>' +
         '              <div class="form-group collection-type-share-applies-to">' +
         '                <div class="form-group boolean optional collection_type_share_applies_to_new_works"><div class="checkbox"><input value="0" type="hidden" name="collection_type[share_applies_to_new_works]" /><label class="boolean optional" for="collection_type_share_applies_to_new_works"><input class="boolean optional" type="checkbox" value="1" checked="checked" name="collection_type[share_applies_to_new_works]" id="collection_type_share_applies_to_new_works" />APPLY TO NEW WORKS</label></div><p class="help-block">When new works are created directly in the collection, grant sharing users and groups permissions for the new work according to their collection roles.</p></div>' +

data/spec/jobs/attach_files_to_work_job_spec.rb

@@ -5,6 +5,7 @@ RSpec.describe AttachFilesToWorkJob do
     let(:uploaded_file1) { build(:uploaded_file, file: file1) }
     let(:uploaded_file2) { build(:uploaded_file, file: file2) }
     let(:generic_work) { create(:public_generic_work) }
+    let(:user) { create(:user) }
 
     shared_examples 'a file attacher' do
       it 'attaches files, copies visibility and permissions and updates the uploaded files' do
@@ -43,5 +44,17 @@ RSpec.describe AttachFilesToWorkJob do
 
       it_behaves_like 'a file attacher'
     end
+
+    context "deposited on behalf of another user" do
+      before do
+        generic_work.on_behalf_of = user.user_key
+        generic_work.save
+      end
+      it_behaves_like 'a file attacher' do
+        it 'records the depositor(s) in edit_users' do
+          expect(generic_work.file_sets.map(&:edit_users)).to all(match_array([user.user_key]))
+        end
+      end
+    end
   end
 end

data/spec/jobs/import_url_job_spec.rb

@@ -29,9 +29,18 @@ RSpec.describe ImportUrlJob do
   end
 
   context 'after running the job' do
+    let!(:tmpdir) { Rails.root.join("tmp/spec/#{Process.pid}") }
+
     before do
       file_set.id = 'abc123'
       allow(file_set).to receive(:reload)
+
+      FileUtils.mkdir_p(tmpdir)
+      allow(Dir).to receive(:mktmpdir).and_return(tmpdir)
+    end
+
+    after do
+      FileUtils.remove_entry(tmpdir)
     end
 
     it 'creates the content and updates the associated operation' do
@@ -39,6 +48,11 @@ RSpec.describe ImportUrlJob do
       described_class.perform_now(file_set, operation)
       expect(operation).to be_success
     end
+
+    it 'leaves the temp directory in place' do
+      described_class.perform_now(file_set, operation)
+      expect(File.exist?(File.join(tmpdir, file_hash))).to be true
+    end
   end
 
   context "when a batch update job is running too" do

data/spec/models/collection_spec.rb

@@ -174,6 +174,7 @@ RSpec.describe Collection, type: :model do
 
     it { is_expected.to delegate_method(:nestable?).to(:collection_type) }
     it { is_expected.to delegate_method(:discoverable?).to(:collection_type) }
+    it { is_expected.to delegate_method(:brandable?).to(:collection_type) }
     it { is_expected.to delegate_method(:sharable?).to(:collection_type) }
     it { is_expected.to delegate_method(:share_applies_to_new_works?).to(:collection_type) }
     it { is_expected.to delegate_method(:allow_multiple_membership?).to(:collection_type) }

data/spec/models/concerns/hyrax/collection_nesting_spec.rb

@@ -6,6 +6,8 @@ RSpec.describe Hyrax::CollectionNesting do
         include ActiveModel::Validations::Callbacks
         # Because we need these declared before we include the Hyrax::CollectionNesting
         define_model_callbacks :destroy, only: :after
+        define_model_callbacks :save, only: :after
+        define_model_callbacks :save, only: :before
 
         def destroy
           true
@@ -15,6 +17,13 @@ RSpec.describe Hyrax::CollectionNesting do
           true
         end
 
+        def before_save
+          false
+        end
+
+        def after_save
+          true
+        end
         include Hyrax::CollectionNesting
 
         attr_accessor :id
@@ -33,6 +42,8 @@ RSpec.describe Hyrax::CollectionNesting do
 
     it { is_expected.to callback(:update_nested_collection_relationship_indices).after(:update_index) }
     it { is_expected.to callback(:update_child_nested_collection_relationship_indices).after(:destroy) }
+    it { is_expected.to callback(:before_update_nested_collection_relationship_indices).before(:save) }
+    it { is_expected.to callback(:after_update_nested_collection_relationship_indices).after(:save) }
     it { is_expected.to respond_to(:update_nested_collection_relationship_indices) }
     it { is_expected.to respond_to(:update_child_nested_collection_relationship_indices) }
     it { is_expected.to respond_to(:use_nested_reindexing?) }
@@ -43,6 +54,11 @@ RSpec.describe Hyrax::CollectionNesting do
           expect(Hyrax.config.nested_relationship_reindexer).to receive(:call).with(id: subject.id).and_call_original
           subject.update_nested_collection_relationship_indices
         end
+
+        it 'will not call during save' do
+          allow(klass).to receive(:before_save).and_return(true)
+          expect(Hyrax.config.nested_relationship_reindexer).not_to receive(:call)
+        end
       end
     end