hyrax 2.3.3 → 2.4.0

data/spec/controllers/hyrax/generic_works_controller_spec.rb

@@ -609,9 +609,14 @@ RSpec.describe Hyrax::GenericWorksController do
         .and_return(manifest_factory)
     end
 
-    it "produces a manifest" do
+    it "produces a manifest for a json request" do
       get :manifest, params: { id: work, format: :json }
       expect(response.body).to eq "{\"test\":\"manifest\"}"
     end
+
+    it "produces a manifest for a html request" do
+      get :manifest, params: { id: work, format: :html }
+      expect(response.body).to eq "{\"test\":\"manifest\"}"
+    end
   end
 end

data/spec/factories/generic_works.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :work, aliases: [:generic_work, :private_generic_work], class: GenericWork do
     transient do
@@ -34,6 +36,10 @@ FactoryBot.define do
       visibility { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
     end
 
+    factory :invalid_generic_work do
+      title { nil }
+    end
+
     factory :private_work do
       # private is default
       # visibility { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }

data/spec/features/collection_multi_membership_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe 'Adding a work to multiple collections', type: :feature, clean_re
       let!(:new_collection) { create(:collection_lw, user: admin_user, collection_type_gid: multi_membership_type_2.gid, title: ['NewCollectionTitle']) }
 
       it 'then the work is added to both collections' do
-        optional 'ability to get capybara to find css select2-result (see Issue #3038)' if ENV['TRAVIS']
+        optional 'ability to get capybara to find css select2-result (see Issue #3038)' if ci_build?
         # Add to second multi-membership collection of a different type
         visit '/dashboard/my/works'
         check 'check_all'
@@ -38,7 +38,7 @@ RSpec.describe 'Adding a work to multiple collections', type: :feature, clean_re
       let!(:new_collection) { create(:collection_lw, user: admin_user, collection_type_gid: multi_membership_type_1.gid, title: ['NewCollectionTitle']) }
 
       it 'then the work is added to both collections' do
-        optional 'ability to get capybara to find css select2-result (see Issue #3038)' if ENV['TRAVIS']
+        optional 'ability to get capybara to find css select2-result (see Issue #3038)' if ci_build?
         # Add to second multi-membership collection of a different type
         visit '/dashboard/my/works'
         check 'check_all'
@@ -70,7 +70,7 @@ RSpec.describe 'Adding a work to multiple collections', type: :feature, clean_re
       let!(:new_collection) { create(:collection_lw, user: admin_user, collection_type_gid: single_membership_type_2.gid, title: ['NewCollectionTitle']) }
 
       it 'then the work is added to both collections' do
-        optional 'ability to get capybara to find css select2-result (see Issue #3038)' if ENV['TRAVIS']
+        optional 'ability to get capybara to find css select2-result (see Issue #3038)' if ci_build?
         # Add to second single-membership collection of a different type
         visit '/dashboard/my/works'
         check 'check_all'
@@ -91,7 +91,7 @@ RSpec.describe 'Adding a work to multiple collections', type: :feature, clean_re
 
       context 'then the work fails to add to the second collection' do
         it 'from the dashboard->works batch add to collection' do
-          optional 'ability to get capybara to find css select2-result (see Issue #3038)' if ENV['TRAVIS']
+          optional 'ability to get capybara to find css select2-result (see Issue #3038)' if ci_build?
           # Attempt to add to second single-membership collection of the same type
           visit '/dashboard/my/works'
           check 'check_all'
@@ -165,7 +165,7 @@ RSpec.describe 'Adding a work to multiple collections', type: :feature, clean_re
       let!(:new_collection) { old_collection }
 
       it 'then the add is treated as a success' do
-        optional 'ability to get capybara to find css select2-result (see Issue #3038)' if ENV['TRAVIS']
+        optional 'ability to get capybara to find css select2-result (see Issue #3038)' if ci_build?
         # Re-add to same multi-membership collection
         visit '/dashboard/my/works'
         check 'check_all'
@@ -186,7 +186,7 @@ RSpec.describe 'Adding a work to multiple collections', type: :feature, clean_re
       let!(:new_collection) { old_collection }
 
       it 'then the add is treated as a success' do
-        optional 'ability to get capybara to find css select2-result (see Issue #3038)' if ENV['TRAVIS']
+        optional 'ability to get capybara to find css select2-result (see Issue #3038)' if ci_build?
         # Re-add to same single-membership collection
         visit '/dashboard/my/works'
         check 'check_all'

data/spec/features/work_show_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe "display a work as its owner" do
+RSpec.describe "work show view" do
   include Selectors::Dashboard
 
   let(:work_path) { "/concern/generic_works/#{work.id}" }
@@ -29,13 +29,17 @@ RSpec.describe "display a work as its owner" do
       visit work_path
     end
 
-    it "shows a work" do
+    it "shows work content and all editor buttons and links" 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 'dt', text: 'Location'
       expect(page).not_to have_selector 'dt', text: 'Based near'
       expect(page).to have_selector 'button', text: 'Attach Child', count: 1
+      expect(page).to have_link 'Analytics'
+      expect(page).to have_link 'Edit'
+      expect(page).to have_link 'Delete'
+      expect(page).to have_selector 'button', text: 'Add to collection', count: 1
 
       # Displays FileSets already attached to this work
       within '.related-files' do
@@ -43,11 +47,60 @@ RSpec.describe "display a work as its owner" do
       end
 
       # IIIF manifest does not include locale query param
-      expect(find('div.viewer:first')['data-uri']).to eq "/concern/generic_works/#{work.id}/manifest"
+      expect(find('div.viewer:first')['data-uri']).to eq "http://www.example.com/concern/generic_works/#{work.id}/manifest"
+    end
+
+    it "allows adding work to a collection", clean_repo: true, js: true do
+      optional 'ability to get capybara to find css select2-result (see Issue #3038)' if ci_build?
+      click_button "Add to collection" # opens the modal
+      select_member_of_collection(collection)
+      click_button 'Save changes'
+
+      # forwards to collection show page
+      expect(page).to have_content collection.title.first
+      expect(page).to have_content work.title.first
+      expect(page).to have_selector '.alert-success', text: 'Collection was successfully updated.'
+    end
+  end
+
+  context "as the work viewer" do
+    let(:work) do
+      create(:public_work,
+             with_admin_set: true,
+             title: ["Magnificent splendor", "Happy little trees"],
+             source: ["The Internet"],
+             based_near: ["USA"],
+             user: user,
+             ordered_members: [file_set],
+             representative_id: file_set.id)
+    end
+    let(:user) { create(:user) }
+    let(:viewer) { create(:user) }
+    let(:file_set) { create(:file_set, user: user, title: ['A Contained FileSet'], content: file) }
+    let(:file) { File.open(fixture_path + '/world.png') }
+    let(:multi_membership_type_1) { create(:collection_type, :allow_multiple_membership, title: 'Multi-membership 1') }
+    let!(:collection) { create(:collection_lw, user: viewer, collection_type_gid: multi_membership_type_1.gid) }
+
+    before do
+      sign_in viewer
+      visit work_path
+    end
+
+    it "shows work content and only Analytics and Add to collection buttons" 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 'dt', text: 'Location'
+      expect(page).not_to have_selector 'dt', text: 'Based near'
+      expect(page).not_to have_selector 'button', text: 'Attach Child', count: 1
+      expect(page).to have_link 'Analytics'
+      expect(page).not_to have_link 'Edit'
+      expect(page).not_to have_link 'Delete'
+      expect(page).to have_selector 'button', text: 'Add to collection', count: 1
     end
 
-    it "add work to a collection", clean_repo: true, js: true do
-      optional 'ability to get capybara to find css select2-result (see Issue #3038)' if ENV['TRAVIS']
+    it "allows adding work to a collection", clean_repo: true, js: true do
+      optional 'ability to get capybara to find css select2-result (see Issue #3038)' if ci_build?
       click_button "Add to collection" # opens the modal
       select_member_of_collection(collection)
       click_button 'Save changes'

data/spec/helpers/hyrax/batch_edits_helper_spec.rb

@@ -40,8 +40,10 @@ RSpec.describe Hyrax::BatchEditsHelper, type: :helper do
     context "with my collections" do
       let(:controller_path) { "hyrax/my/collections" }
 
-      it "does not show the check all dropdown" do
-        expect(subject).to be_nil
+      it "show the check all dropdown" do
+        expect(subject).to have_css("span.caret")
+        expect(subject).to have_content t("hyrax.dashboard.my.action.select_all")
+        expect(subject).to have_content t("hyrax.dashboard.my.action.select_none")
       end
     end
 

data/spec/helpers/hyrax/iiif_helper_spec.rb

@@ -0,0 +1,44 @@
+RSpec.describe Hyrax::IiifHelper, type: :helper do
+  let(:solr_document) { SolrDocument.new }
+  let(:request) { double }
+  let(:ability) { nil }
+  let(:presenter) { Hyrax::WorkShowPresenter.new(solr_document, ability, request) }
+  let(:uv_partial_path) { 'hyrax/base/iiif_viewers/universal_viewer' }
+
+  describe '#iiif_viewer_display' do
+    before do
+      allow(helper).to receive(:iiif_viewer_display_partial).with(presenter)
+                                                            .and_return(uv_partial_path)
+    end
+
+    it "renders a partial" do
+      expect(helper).to receive(:render)
+        .with(uv_partial_path, presenter: presenter)
+      helper.iiif_viewer_display(presenter)
+    end
+
+    it "takes options" do
+      expect(helper).to receive(:render)
+        .with(uv_partial_path, presenter: presenter, transcript_id: '123')
+      helper.iiif_viewer_display(presenter, transcript_id: '123')
+    end
+  end
+
+  describe '#iiif_viewer_display_partial' do
+    subject { helper.iiif_viewer_display_partial(presenter) }
+
+    it 'defaults to universal viewer' do
+      expect(subject).to eq uv_partial_path
+    end
+
+    context "with #iiif_viewer override" do
+      let(:iiif_viewer) { :mirador }
+
+      before do
+        allow(presenter).to receive(:iiif_viewer).and_return(iiif_viewer)
+      end
+
+      it { is_expected.to eq 'hyrax/base/iiif_viewers/mirador' }
+    end
+  end
+end

data/spec/hyrax/transactions/create_work_spec.rb

@@ -0,0 +1,155 @@
+# frozen_string_literal: true
+require 'spec_helper'
+require 'hyrax/transactions'
+
+RSpec.describe Hyrax::Transactions::CreateWork do
+  subject(:transaction) { described_class.new }
+  let(:template)        { Hyrax::PermissionTemplate.find_by!(source_id: work.admin_set_id) }
+  let(:work)            { build(:generic_work) }
+  let(:xmas)            { DateTime.parse('2018-12-25 11:30').iso8601 }
+
+  before do
+    Hyrax::PermissionTemplate
+      .find_or_create_by(source_id: AdminSet.find_or_create_default_admin_set_id)
+  end
+
+  describe '#call' do
+    context 'with an invalid work' do
+      let(:work) { build(:invalid_generic_work) }
+
+      it 'is a failure' do
+        expect(transaction.call(work)).to be_failure
+      end
+
+      it 'does not save the work' do
+        expect { transaction.call(work) }.not_to change { work.new_record? }.from true
+      end
+
+      it 'gives useful errors' do
+        expect(transaction.call(work).failure).to eq work.errors
+      end
+    end
+
+    it 'is a success' do
+      expect(transaction.call(work)).to be_success
+    end
+
+    it 'persists the work' do
+      expect { transaction.call(work) }
+        .to change { work.persisted? }
+        .to true
+    end
+
+    it 'sets visibility to restricted by default' do
+      expect { transaction.call(work) }
+        .not_to change { work.visibility }
+        .from Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+    end
+
+    it 'sets the default admin set' do
+      expect { transaction.call(work) }
+        .to change { work.admin_set&.id }
+        .to AdminSet.find_or_create_default_admin_set_id
+    end
+
+    it 'sets the modified time using Hyrax::TimeService' do
+      allow(Hyrax::TimeService).to receive(:time_in_utc).and_return(xmas)
+
+      expect { transaction.call(work) }.to change { work.date_modified }.to xmas
+    end
+
+    it 'sets the created time using Hyrax::TimeService' do
+      allow(Hyrax::TimeService).to receive(:time_in_utc).and_return(xmas)
+
+      expect { transaction.call(work) }.to change { work.date_uploaded }.to xmas
+    end
+
+    it 'grants edit permission to depositor' do
+      transaction.call(work)
+
+      expect(work.edit_users).to include work.depositor
+    end
+  end
+
+  context 'when visibility is set' do
+    let(:visibility) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
+
+    before { work.visibility = visibility }
+
+    it 'keeps the visibility' do
+      expect { transaction.call(work) }
+        .not_to change { work.visibility }
+        .from visibility
+    end
+  end
+
+  context 'with an admin set' do
+    let(:admin_set) { AdminSet.find(template.source_id) }
+    let(:template)  { create(:permission_template, with_admin_set: true) }
+    let(:work)      { build(:generic_work, admin_set: admin_set) }
+
+    context 'without a permission template' do
+      let(:admin_set) { create(:admin_set, with_permission_template: false) }
+
+      it 'is a failure' do
+        expect(transaction.call(work)).to be_failure
+      end
+
+      it 'is does not persist the work' do
+        expect { transaction.call(work) }
+          .not_to change { work.persisted? }
+          .from false
+      end
+    end
+
+    it 'is a success' do
+      expect(transaction.call(work)).to be_success
+    end
+
+    it 'retains the set admin set' do
+      expect { transaction.call(work) }
+        .not_to change { work.admin_set&.id }
+        .from admin_set.id
+    end
+
+    context 'with users and groups' do
+      let(:manage_groups) { ['manage_group_1', 'manage_group_2'] }
+      let(:manage_users)  { create_list(:user, 2) }
+      let(:view_groups)   { ['view_group_1', 'view_group_2'] }
+      let(:view_users)    { create_list(:user, 2) }
+
+      let(:template) do
+        create(:permission_template,
+               with_admin_set: true,
+               manage_groups: manage_groups,
+               manage_users:  manage_users,
+               view_groups:   view_groups,
+               view_users:    view_users)
+      end
+
+      it 'assigns edit groups from template' do
+        expect { transaction.call(work) }
+          .to change { work.edit_groups }
+          .to include(*manage_groups)
+      end
+
+      it 'assigns edit users from template' do
+        expect { transaction.call(work) }
+          .to change { work.edit_users }
+          .to include(*manage_users.map(&:user_key))
+      end
+
+      it 'assigns read groups from template' do
+        expect { transaction.call(work) }
+          .to change { work.read_groups }
+          .to include(*view_groups)
+      end
+
+      it 'assigns read users from template' do
+        expect { transaction.call(work) }
+          .to change { work.read_users }
+          .to include(*view_users.map(&:user_key))
+      end
+    end
+  end
+end

data/spec/hyrax/transactions/steps/apply_permission_template_spec.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+require 'spec_helper'
+require 'hyrax/transactions'
+
+RSpec.describe Hyrax::Transactions::Steps::ApplyPermissionTemplate do
+  subject(:step) { described_class.new }
+  let(:work)     { build(:generic_work) }
+
+  context 'without an admin_set' do
+    it 'is a failure' do
+      expect(step.call(work)).to be_failure
+    end
+  end
+
+  context 'with an admin_set' do
+    let(:work)      { build(:generic_work, admin_set: admin_set) }
+    let(:admin_set) { create(:admin_set, with_permission_template: true) }
+
+    it 'is a success' do
+      expect(step.call(work)).to be_success
+    end
+
+    context 'with users and groups' do
+      let(:admin_set)     { AdminSet.find(template.source_id) }
+      let(:manage_groups) { ['edit_group_1', 'edit_group_2'] }
+      let(:manage_users)  { create_list(:user, 2) }
+      let(:view_groups)   { ['read_group_1', 'read_group_2'] }
+      let(:view_users)    { create_list(:user, 2) }
+
+      let(:template) do
+        create(:permission_template,
+               with_admin_set: true,
+               manage_groups: manage_groups,
+               manage_users:  manage_users,
+               view_groups:   view_groups,
+               view_users:    view_users)
+      end
+
+      it 'assigns edit users from template' do
+        expect { step.call(work) }
+          .to change { work.edit_users }
+          .to include(*manage_users.map(&:user_key))
+      end
+
+      it 'assigns edit groups from template' do
+        expect { step.call(work) }
+          .to change { work.edit_groups }
+          .to include(*manage_groups)
+      end
+
+      it 'assigns read users from template' do
+        expect { step.call(work) }
+          .to change { work.read_users }
+          .to include(*view_users.map(&:user_key))
+      end
+
+      it 'assigns read groups from template' do
+        expect { step.call(work) }
+          .to change { work.read_groups }
+          .to include(*view_groups)
+      end
+    end
+
+    context 'missing PermissionTemplate' do
+      let(:admin_set) { create(:admin_set, with_permission_template: false) }
+
+      it 'is a failure' do
+        expect(step.call(work)).to be_failure
+      end
+    end
+  end
+end