sufia 7.2.0 → 7.3.0.rc1

data/spec/actors/sufia/default_admin_set_actor_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+RSpec.describe Sufia::DefaultAdminSetActor do
+  let(:next_actor) do
+    double('next actor', create: true,
+                         curation_concern: work,
+                         update: true,
+                         user: depositor)
+  end
+  let(:actor) do
+    CurationConcerns::Actors::ActorStack.new(work, depositor, [described_class])
+  end
+  let(:depositor) { create(:user) }
+  let(:work) { build(:generic_work) }
+  let(:admin_set) { create(:admin_set) }
+  let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id) }
+
+  describe "create" do
+    before do
+      allow(CurationConcerns::Actors::RootActor).to receive(:new).and_return(next_actor)
+    end
+
+    context "when admin_set_id is blank" do
+      let(:attributes) { { admin_set_id: '' } }
+      let(:default_id) { described_class::DEFAULT_ID }
+
+      it "creates the default AdminSet with a PermissionTemplate and calls the next actor with the default admin set id" do
+        expect(next_actor).to receive(:create).with(admin_set_id: default_id).and_return(true)
+        expect { actor.create(attributes) }.to change { AdminSet.count }.by(1)
+          .and change { Sufia::PermissionTemplate.count }.by(1)
+      end
+    end
+
+    context "when admin_set_id is provided" do
+      let(:attributes) { { admin_set_id: admin_set.id } }
+
+      it "uses the provided id and returns true" do
+        expect(next_actor).to receive(:create).with(attributes).and_return(true)
+        expect(actor.create(attributes)).to be true
+      end
+    end
+  end
+end

data/spec/actors/sufia/interpret_visibility_actor_spec.rb

@@ -0,0 +1,266 @@
+require 'spec_helper'
+
+RSpec.describe Sufia::InterpretVisibilityActor do
+  let(:create_actor) do
+    double('create actor', create: true,
+                           curation_concern: work,
+                           user: depositor)
+  end
+  let(:depositor) { create(:user) }
+  let(:work) { build(:generic_work) }
+  let(:admin_set) { create(:admin_set) }
+  let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id) }
+  let(:attributes) { { admin_set_id: admin_set.id } }
+  subject do
+    CurationConcerns::Actors::ActorStack.new(work, depositor, [described_class])
+  end
+  let(:one_year_from_today) { Time.zone.today + 1.year }
+  let(:two_years_from_today) { Time.zone.today + 2.years }
+
+  describe "create" do
+    context "embargo with missing embargo date" do
+      let(:attributes) { { admin_set_id: admin_set.id, visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO } }
+
+      it "returns false and logs error on visibility field" do
+        expect(subject.create(attributes)).to be false
+        expect(subject.curation_concern.errors[:visibility].first).to eq 'When setting visibility to "embargo" you must also specify embargo release date.'
+      end
+    end
+
+    context "embargo with invalid embargo date" do
+      let(:attributes) { { admin_set_id: admin_set.id, visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO, embargo_release_date: 'ffff' } }
+
+      it "returns false and logs error on date field" do
+        expect(subject.create(attributes)).to be false
+        expect(subject.curation_concern.errors[:embargo_release_date].first).to eq 'Must be a future date.'
+      end
+    end
+
+    context "embargo with past embargo date" do
+      let(:attributes) { { admin_set_id: admin_set.id, visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO, embargo_release_date: '1999-12-31' } }
+
+      it "returns false and logs error on date field" do
+        expect(subject.create(attributes)).to be false
+        expect(subject.curation_concern.errors[:embargo_release_date].first).to eq 'Must be a future date.'
+      end
+    end
+
+    context "embargo with future embargo date (and no template requirements)" do
+      let(:attributes) { { admin_set_id: admin_set.id, visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO, embargo_release_date: one_year_from_today.to_s } }
+
+      it "returns true" do
+        expect(subject.create(attributes)).to be true
+      end
+    end
+
+    context "embargo with date = one year from today, and required embargo of 6 months or less" do
+      let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_6_MONTHS) }
+      let(:attributes) { { admin_set_id: admin_set.id, visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO, embargo_release_date: one_year_from_today.to_s } }
+
+      it "returns false and logs error on date field" do
+        permission_template.reload
+        expect(subject.create(attributes)).to be false
+        expect(subject.curation_concern.errors[:embargo_release_date].first).to eq 'Release date specified does not match permission template release requirements for selected AdminSet.'
+      end
+    end
+
+    context "embargo with date = one year from today, and required embargo of 1 year or less" do
+      let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_1_YEAR) }
+      let(:attributes) { { admin_set_id: admin_set.id, visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO, embargo_release_date: one_year_from_today.to_s } }
+
+      it "returns true" do
+        permission_template.reload
+        expect(subject.create(attributes)).to be true
+      end
+    end
+
+    context "embargo with date that doesn't match a required, fixed date" do
+      let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED, release_date: one_year_from_today.to_s) }
+      let(:attributes) { { admin_set_id: admin_set.id, visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO, embargo_release_date: two_years_from_today.to_s } }
+
+      it "returns false and logs error on date field" do
+        permission_template.reload
+        expect(subject.create(attributes)).to be false
+        expect(subject.curation_concern.errors[:embargo_release_date].first).to eq 'Release date specified does not match permission template release requirements for selected AdminSet.'
+      end
+    end
+
+    context "embargo with date matching the required, fixed date" do
+      let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED, release_date: two_years_from_today.to_s) }
+      let(:attributes) { { admin_set_id: admin_set.id, visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO, embargo_release_date: two_years_from_today.to_s } }
+
+      it "returns true" do
+        permission_template.reload
+        expect(subject.create(attributes)).to be true
+      end
+    end
+
+    context "embargo with valid embargo date and invalid post-embargo visibility" do
+      let(:permission_template) do
+        create(:permission_template,
+               admin_set_id: admin_set.id,
+               release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_1_YEAR,
+               visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC)
+      end
+      let(:attributes) do
+        { admin_set_id: admin_set.id,
+          visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO,
+          embargo_release_date: one_year_from_today.to_s,
+          visibility_after_embargo: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED }
+      end
+
+      it "returns false and logs error on visibility field" do
+        permission_template.reload
+        expect(subject.create(attributes)).to be false
+        expect(subject.curation_concern.errors[:visibility_after_embargo].first).to eq 'Visibility after embargo does not match permission template visibility requirements for selected AdminSet.'
+      end
+    end
+
+    context "embargo with valid embargo date and valid post-embargo visibility" do
+      let(:permission_template) do
+        create(:permission_template,
+               admin_set_id: admin_set.id,
+               release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_1_YEAR,
+               visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC)
+      end
+      let(:attributes) do
+        { admin_set_id: admin_set.id,
+          visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO,
+          embargo_release_date: one_year_from_today.to_s,
+          visibility_after_embargo: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
+      end
+
+      it "returns true" do
+        permission_template.reload
+        expect(subject.create(attributes)).to be true
+      end
+    end
+
+    context "embargo with public visibility and public visibility required (no specified release_period in template)" do
+      let(:permission_template) do
+        create(:permission_template,
+               admin_set_id: admin_set.id,
+               visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC)
+      end
+      let(:attributes) do
+        { admin_set_id: admin_set.id,
+          visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO,
+          embargo_release_date: one_year_from_today.to_s,
+          visibility_after_embargo: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
+      end
+
+      it "returns true" do
+        permission_template.reload
+        expect(subject.create(attributes)).to be true
+      end
+    end
+
+    context "embargo with public visibility and authenticated visibility required (no specified release_period in template)" do
+      let(:permission_template) do
+        create(:permission_template,
+               admin_set_id: admin_set.id,
+               visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED)
+      end
+      let(:attributes) do
+        { admin_set_id: admin_set.id,
+          visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO,
+          embargo_release_date: one_year_from_today.to_s,
+          visibility_after_embargo: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
+      end
+
+      it "returns false and logs error on visibility field" do
+        permission_template.reload
+        expect(subject.create(attributes)).to be false
+        expect(subject.curation_concern.errors[:visibility_after_embargo].first).to eq 'Visibility after embargo does not match permission template visibility requirements for selected AdminSet.'
+      end
+    end
+
+    context "embargo when no release delays are allowed" do
+      let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY) }
+      let(:attributes) { { admin_set_id: admin_set.id, visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO, embargo_release_date: one_year_from_today.to_s } }
+
+      it "returns false and logs error on visiblity field" do
+        permission_template.reload
+        expect(subject.create(attributes)).to be false
+        expect(subject.curation_concern.errors[:visibility].first).to eq 'Visibility specified does not match permission template "no release delay" requirement for selected AdminSet.'
+      end
+    end
+
+    context "no embargo/lease when no release delays are allowed" do
+      let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY) }
+      let(:attributes) { { admin_set_id: admin_set.id, visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC } }
+
+      it "returns true" do
+        permission_template.reload
+        expect(subject.create(attributes)).to be true
+      end
+    end
+
+    context "visibility public (no embargo) when visibility required to be authenticated" do
+      let(:permission_template) do
+        create(:permission_template,
+               admin_set_id: admin_set.id,
+               release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY,
+               visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED)
+      end
+      let(:attributes) { { admin_set_id: admin_set.id, visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC } }
+
+      it "returns false and logs an error on visibility field" do
+        permission_template.reload
+        expect(subject.create(attributes)).to be false
+        expect(subject.curation_concern.errors[:visibility].first).to eq 'Visibility specified does not match permission template visibility requirement for selected AdminSet.'
+      end
+    end
+
+    context "visibility public (no embargo) and visibility required to be public" do
+      let(:permission_template) do
+        create(:permission_template,
+               admin_set_id: admin_set.id,
+               release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY,
+               visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC)
+      end
+      let(:attributes) { { admin_set_id: admin_set.id, visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC } }
+
+      it "returns true" do
+        permission_template.reload
+        expect(subject.create(attributes)).to be true
+      end
+    end
+
+    context "lease specified with any release/visibility requirements" do
+      let(:permission_template) do
+        create(:permission_template,
+               admin_set_id: admin_set.id,
+               release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_1_YEAR,
+               visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC)
+      end
+      let(:attributes) do
+        { admin_set_id: admin_set.id,
+          visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE,
+          lease_expiration_date: one_year_from_today.to_s,
+          visibility_after_lease: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
+      end
+
+      it "returns false and logs an error on visibility field" do
+        permission_template.reload
+        expect(subject.create(attributes)).to be false
+        expect(subject.curation_concern.errors[:visibility].first).to eq 'Lease option is not allowed by permission template for selected AdminSet.'
+      end
+    end
+
+    context "lease specified with NO release/visibility requirements" do
+      let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id) }
+      let(:attributes) do
+        { admin_set_id: admin_set.id,
+          visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE,
+          lease_expiration_date: one_year_from_today.to_s,
+          visibility_after_lease: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
+      end
+
+      it "returns true" do
+        permission_template.reload
+        expect(subject.create(attributes)).to be true
+      end
+    end
+  end
+end

data/spec/authorities/qa/authorities/find_works_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe Qa::Authorities::FindWorks do
+  let(:controller) { Qa::TermsController.new }
+  let(:user1) { create(:user) }
+  let(:user2) { create(:user) }
+  let(:ability) { instance_double(Ability, admin?: false, user_groups: [], current_user: user1) }
+  let(:q) { "foo" }
+  let(:params) { ActionController::Parameters.new(q: q, id: work1.id, user: user1.email, controller: "qa/terms", action: "search", vocab: "find_works") }
+  let(:service) { described_class.new }
+
+  before do
+    allow(controller).to receive(:params).and_return(params)
+    allow(controller).to receive(:current_user).and_return(user1)
+    allow(controller).to receive(:current_ability).and_return(ability)
+  end
+
+  let!(:work1) { create(:generic_work, :public, title: ['foo'], user: user1) }
+  let!(:work2) { create(:generic_work, :public, title: ['foo foo'], user: user1) }
+  let!(:work3) { create(:generic_work, :public, title: ['bar'], user: user1) }
+  let!(:work4) { create(:generic_work, :public, title: ['another foo'], user: user1) }
+  let!(:work5) { create(:generic_work, :public, title: ['foo foo foo'], user: user2) }
+
+  subject { service.search(q, controller) }
+
+  describe '#search' do
+    context "works by all users" do
+      it 'displays a list of other works deposited by current user' do
+        expect(subject.map { |result| result[:id] }).to match_array [work2.id, work4.id]
+      end
+    end
+
+    context "when work has child works" do
+      before do
+        work4.ordered_members << work1
+        work4.save!
+      end
+
+      it 'displays a list of other works deposited by current user, exluding the child work' do
+        expect(subject.map { |result| result[:id] }).to match_array [work2.id]
+      end
+    end
+
+    context "when work has parent works" do
+      before do
+        work1.ordered_members << work4
+        work1.save!
+      end
+
+      it 'displays a list of other works deposited by current user, excluding the parent work' do
+        expect(subject.map { |result| result[:id] }).to match_array [work2.id]
+      end
+    end
+  end
+end

data/spec/controllers/batch_edits_controller_spec.rb

@@ -24,12 +24,6 @@ describe BatchEditsController, type: :controller do
       expect(response).to be_successful
       expect(assigns[:form].model.creator).to match_array ["Fred", "Wilma"]
     end
-
-    it "sets the breadcrumb trail" do
-      expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.dashboard.title'), Sufia::Engine.routes.url_helpers.dashboard_index_path)
-      expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.dashboard.my.works'), Sufia::Engine.routes.url_helpers.dashboard_works_path)
-      get :edit
-    end
   end
 
   describe "update" do
@@ -46,6 +40,7 @@ describe BatchEditsController, type: :controller do
     end
 
     before do
+      # TODO: why aren't we just submitting batch_document_ids[] as a parameter?
       controller.batch = [one.id, two.id]
       expect(controller).to receive(:can?).with(:edit, one.id).and_return(true)
       expect(controller).to receive(:can?).with(:edit, two.id).and_return(true)

data/spec/controllers/citations_controller_spec.rb

@@ -1,18 +1,57 @@
 describe CitationsController do
-  let(:user) { create(:user) }
-
   describe "#work" do
+    let(:user) { create(:user) }
     let(:work) { create(:work, user: user) }
-    before do
-      sign_in user
-      request.env['HTTP_REFERER'] = 'http://test.host/foo'
+
+    context "with an authenticated_user" do
+      before do
+        sign_in user
+        request.env['HTTP_REFERER'] = 'http://test.host/foo'
+      end
+
+      it "is successful" do
+        expect(controller).to receive(:add_breadcrumb).with('My Dashboard', Sufia::Engine.routes.url_helpers.dashboard_index_path)
+        get :work, params: { id: work }
+        expect(response).to be_successful
+        expect(assigns(:presenter)).to be_kind_of Sufia::WorkShowPresenter
+      end
+    end
+
+    context "with an unauthenticated user" do
+      it "is not successful" do
+        get :work, params: { id: work }
+        expect(response).to redirect_to main_app.new_user_session_path
+        expect(flash[:alert]).to eq "You are not authorized to access this page."
+        expect(session['user_return_to']).to eq request.url
+      end
+    end
+  end
+  describe "#file" do
+    let(:user) { create(:user) }
+    let(:file_set) { create(:file_set, user: user) }
+
+    context "with an authenticated_user" do
+      before do
+        sign_in user
+        request.env['HTTP_REFERER'] = 'http://test.host/foo'
+      end
+
+      # TODO: fix this behavior
+      it "is not successful" do
+        expect(controller).to receive(:add_breadcrumb).with('My Dashboard', Sufia::Engine.routes.url_helpers.dashboard_index_path)
+        get :file, params: { id: file_set }
+        expect(response).not_to be_successful
+        # expect(assigns(:presenter)).to be_kind_of Sufia::FileSetPresenter
+      end
     end
 
-    it "is successful" do
-      expect(controller).to receive(:add_breadcrumb).with('My Dashboard', Sufia::Engine.routes.url_helpers.dashboard_index_path)
-      get :work, params: { id: work }
-      expect(response).to be_successful
-      expect(assigns(:presenter)).to be_kind_of Sufia::WorkShowPresenter
+    context "with an unauthenticated user" do
+      it "is not successful" do
+        get :file, params: { id: file_set }
+        expect(response).to redirect_to main_app.new_user_session_path
+        expect(flash[:alert]).to eq "You are not authorized to access this page."
+        expect(session['user_return_to']).to eq request.url
+      end
     end
   end
 end