sufia 7.3.0.rc3 → 7.3.0

data/spec/presenters/sufia/admin_set_options_presenter_spec.rb

@@ -0,0 +1,73 @@
+require 'spec_helper'
+
+RSpec.describe Sufia::AdminSetOptionsPresenter do
+  let(:service) { instance_double(Sufia::AdminSetService) }
+  let(:presenter) { described_class.new(service) }
+
+  describe "#select_options" do
+    subject { presenter.select_options }
+    before do
+      allow(service).to receive(:search_results)
+        .with(:deposit)
+        .and_return(results)
+    end
+
+    context "with permission_template visibility" do
+      let(:solr_doc1) { instance_double(SolrDocument, id: '123', to_s: 'Public Set') }
+      let(:solr_doc2) { instance_double(SolrDocument, id: '345', to_s: 'Private Set') }
+      before do
+        allow(presenter).to receive(:workflow) { nil }
+        create(:permission_template, admin_set_id: '123', visibility: 'open')
+        create(:permission_template, admin_set_id: '345', visibility: 'restricted')
+      end
+      let(:results) { [solr_doc1, solr_doc2] }
+
+      it do
+        is_expected.to eq [['Public Set', '123', { 'data-sharing' => false, 'data-visibility' => 'open' }],
+                           ['Private Set', '345', { 'data-sharing' => false, 'data-visibility' => 'restricted' }]]
+      end
+    end
+
+    context "with permission_template release_date" do
+      let(:today) { Time.zone.today }
+      let(:solr_doc1) { instance_double(SolrDocument, id: '123', to_s: 'Fixed Release Date Set') }
+      let(:solr_doc2) { instance_double(SolrDocument, id: '345', to_s: 'No Delay Set') }
+      let(:solr_doc3) { instance_double(SolrDocument, id: '567', to_s: 'One Year Max Embargo Set') }
+      let(:solr_doc4) { instance_double(SolrDocument, id: '789', to_s: 'Release Before Date Set') }
+      let(:results) { [solr_doc1, solr_doc2, solr_doc3, solr_doc4] }
+
+      before do
+        allow(presenter).to receive(:workflow) { nil }
+        create(:permission_template, admin_set_id: '123', release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED, release_date: today + 2.days)
+        create(:permission_template, admin_set_id: '345', release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY)
+        create(:permission_template, admin_set_id: '567', release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_1_YEAR)
+        create(:permission_template, admin_set_id: '789', release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE, release_date: today + 1.month)
+      end
+
+      it do
+        is_expected.to eq [['Fixed Release Date Set', '123', { 'data-sharing' => false, 'data-release-date' => today + 2.days }],
+                           ['No Delay Set', '345', { 'data-sharing' => false, 'data-release-date' => today }],
+                           ['One Year Max Embargo Set', '567', { 'data-sharing' => false, 'data-release-date' => today + 1.year, 'data-release-before-date' => true }],
+                           ['Release Before Date Set', '789', { 'data-sharing' => false, 'data-release-date' => today + 1.month, 'data-release-before-date' => true }]]
+      end
+    end
+
+    context "with empty permission_template" do
+      let(:solr_doc1) { instance_double(SolrDocument, id: '123', to_s: 'Empty Template Set') }
+      let(:results) { [solr_doc1] }
+
+      before do
+        create(:permission_template, admin_set_id: '567')
+      end
+
+      it { is_expected.to eq [['Empty Template Set', '123', {}]] }
+    end
+
+    context "with no permission_template" do
+      let(:solr_doc1) { instance_double(SolrDocument, id: '123', to_s: 'No Template Set') }
+      let(:results) { [solr_doc1] }
+
+      it { is_expected.to eq [['No Template Set', '123', {}]] }
+    end
+  end
+end

data/spec/presenters/sufia/admin_set_presenter_spec.rb

@@ -7,22 +7,51 @@ describe Sufia::AdminSetPresenter do
           description: ['An example admin set.'],
           title: ['Example Admin Set Title'])
   end
-  let(:work) { build(:work, title: ['Example Work Title'], admin_set_id: '123') }
+  let(:work) { build(:work, title: ['Example Work Title']) }
   let(:solr_document) { SolrDocument.new(admin_set.to_solr) }
   let(:ability) { double }
   let(:presenter) { described_class.new(solr_document, ability) }
 
   describe "total_items" do
     subject { presenter.total_items }
+
     context "empty admin set" do
       it { is_expected.to eq 0 }
     end
+
     context "admin set with work" do
       before do
+        admin_set.members = [work]
         admin_set.save!
-        work.save!
       end
       it { is_expected.to eq 1 }
     end
   end
+
+  describe "disable_delete?" do
+    subject { presenter.disable_delete? }
+
+    context "empty admin set" do
+      before do
+        admin_set.members = []
+        admin_set.save!
+      end
+      it { is_expected.to be false }
+    end
+
+    context "non-empty admin set" do
+      before do
+        admin_set.members = [work]
+        admin_set.save!
+      end
+      it { is_expected.to be true }
+    end
+
+    context "default admin set" do
+      let(:admin_set) do
+        build(:admin_set, id: AdminSet::DEFAULT_ID)
+      end
+      it { is_expected.to be true }
+    end
+  end
 end

data/spec/services/sufia/actor_factory_spec.rb

@@ -12,6 +12,7 @@ describe Sufia::ActorFactory, :no_clean do
                          CurationConcerns::Actors::AddToWorkActor,
                          CurationConcerns::Actors::AssignRepresentativeActor,
                          CurationConcerns::Actors::AttachFilesActor,
+                         Sufia::Actors::AttachMembersActor,
                          CurationConcerns::Actors::ApplyOrderActor,
                          Sufia::InterpretVisibilityActor,
                          Sufia::DefaultAdminSetActor,
@@ -31,6 +32,7 @@ describe Sufia::ActorFactory, :no_clean do
         CurationConcerns::Actors::AddToWorkActor,
         CurationConcerns::Actors::AssignRepresentativeActor,
         CurationConcerns::Actors::AttachFilesActor,
+        Sufia::Actors::AttachMembersActor,
         CurationConcerns::Actors::ApplyOrderActor,
         Sufia::InterpretVisibilityActor,
         Sufia::DefaultAdminSetActor,

data/spec/services/sufia/admin_set_create_service_spec.rb

@@ -2,7 +2,8 @@ require 'spec_helper'
 
 RSpec.describe Sufia::AdminSetCreateService do
   let(:admin_set) { AdminSet.new(title: ['test']) }
-  let(:service) { described_class.new(admin_set, user) }
+  let(:workflow_name) { AdminSet::DEFAULT_WORKFLOW_NAME }
+  let(:service) { described_class.new(admin_set, user, workflow_name) }
   let(:user) { create(:user) }
 
   describe "#create" do
@@ -30,7 +31,7 @@ RSpec.describe Sufia::AdminSetCreateService do
   end
 
   describe '.create_default!' do
-    let(:default_admin_set_id) { 'admin_sets/default' }
+    let(:default_admin_set_id) { AdminSet::DEFAULT_ID }
     let(:permission_template) { Sufia::PermissionTemplate.find_by!(admin_set_id: default_admin_set_id) }
     # It is important to test the side-effects as a default admin set is a fundamental assumption for Sufia >= 7.3
     it 'creates AdminSet, PermissionTemplate' do
@@ -39,6 +40,7 @@ RSpec.describe Sufia::AdminSetCreateService do
       admin_set = AdminSet.find(default_admin_set_id)
       expect(admin_set).to be_persisted
       expect(permission_template).to be_persisted
+      expect(permission_template.workflow_name).to eq workflow_name
     end
   end
 end

data/spec/services/sufia/admin_set_service_spec.rb

@@ -39,76 +39,4 @@ RSpec.describe Sufia::AdminSetService, :no_clean do
       expect(subject).to eq [[doc1, 8], [doc2, 2], [doc3, nil]]
     end
   end
-
-  describe "#select_options" do
-    subject { service.select_options }
-
-    context "with permission_template visibility" do
-      let(:solr_doc1) { instance_double(SolrDocument, id: '123', to_s: 'Public Set') }
-      let(:solr_doc2) { instance_double(SolrDocument, id: '345', to_s: 'Private Set') }
-      let!(:permission_template1) { create(:permission_template, admin_set_id: '123', visibility: 'open') }
-      let!(:permission_template2) { create(:permission_template, admin_set_id: '345', visibility: 'restricted') }
-
-      before do
-        allow(service).to receive(:search_results)
-          .with(:read)
-          .and_return([solr_doc1, solr_doc2])
-      end
-
-      it do
-        is_expected.to eq [['Public Set', '123', { 'data-visibility' => 'open' }],
-                           ['Private Set', '345', { 'data-visibility' => 'restricted' }]]
-      end
-    end
-
-    context "with permission_template release_date" do
-      let(:today) { Time.zone.today }
-      let(:solr_doc1) { instance_double(SolrDocument, id: '123', to_s: 'Fixed Release Date Set') }
-      let(:solr_doc2) { instance_double(SolrDocument, id: '345', to_s: 'No Delay Set') }
-      let(:solr_doc3) { instance_double(SolrDocument, id: '567', to_s: 'One Year Max Embargo Set') }
-      let(:solr_doc4) { instance_double(SolrDocument, id: '789', to_s: 'Release Before Date Set') }
-      let!(:permission_template1) { create(:permission_template, admin_set_id: '123', release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED, release_date: today + 2.days) }
-      let!(:permission_template2) { create(:permission_template, admin_set_id: '345', release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY) }
-      let!(:permission_template3) { create(:permission_template, admin_set_id: '567', release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_1_YEAR) }
-      let!(:permission_template4) { create(:permission_template, admin_set_id: '789', release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE, release_date: today + 1.month) }
-
-      before do
-        allow(service).to receive(:search_results)
-          .with(:read)
-          .and_return([solr_doc1, solr_doc2, solr_doc3, solr_doc4])
-      end
-
-      it do
-        is_expected.to eq [['Fixed Release Date Set', '123', { 'data-release-date' => today + 2.days }],
-                           ['No Delay Set', '345', { 'data-release-date' => today }],
-                           ['One Year Max Embargo Set', '567', { 'data-release-date' => today + 1.year, 'data-release-before-date' => true }],
-                           ['Release Before Date Set', '789', { 'data-release-date' => today + 1.month, 'data-release-before-date' => true }]]
-      end
-    end
-
-    context "with empty permission_template" do
-      let(:solr_doc1) { instance_double(SolrDocument, id: '123', to_s: 'Empty Template Set') }
-      let!(:permission_template1) { create(:permission_template, admin_set_id: '567') }
-
-      before do
-        allow(service).to receive(:search_results)
-          .with(:read)
-          .and_return([solr_doc1])
-      end
-
-      it { is_expected.to eq [['Empty Template Set', '123', {}]] }
-    end
-
-    context "with no permission_template" do
-      let(:solr_doc1) { instance_double(SolrDocument, id: '123', to_s: 'No Template Set') }
-
-      before do
-        allow(service).to receive(:search_results)
-          .with(:read)
-          .and_return([solr_doc1])
-      end
-
-      it { is_expected.to eq [['No Template Set', '123', {}]] }
-    end
-  end
 end

data/spec/services/sufia/workflow/changes_required_notification_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe Sufia::Workflow::ChangesRequiredNotification do
 
   describe ".send_notification" do
     it 'sends a message to all users' do
-      expect(approver).to receive(:send_message).once.and_call_original
+      expect(approver).to receive(:send_message).with(anything, "Test title (<a href=\"/concern/generic_works/#{work.id}\">#{work.id}</a>) requires additional changes before approval.\n\n 'A pleasant read'", anything).once.and_call_original
 
       expect { described_class.send_notification(entity: entity, user: approver, comment: comment, recipients: recipients) }
         .to change { depositor.mailbox.inbox.count }.by(1)

data/spec/services/sufia/workflow/deposited_notification_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe Sufia::Workflow::DepositedNotification do
 
   describe ".send_notification" do
     it 'sends a message to all users' do
-      expect(approver).to receive(:send_message).once.and_call_original
+      expect(approver).to receive(:send_message).with(anything, "Test title (<a href=\"/concern/generic_works/#{work.id}\">#{work.id}</a>) was approved by #{approver.user_key}. A pleasant read", anything).once.and_call_original
 
       expect { described_class.send_notification(entity: entity, user: approver, comment: comment, recipients: recipients) }
         .to change { depositor.mailbox.inbox.count }.by(1)

data/spec/services/sufia/workflow/pending_review_notification_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe Sufia::Workflow::PendingReviewNotification do
 
   describe ".send_notification" do
     it 'sends a message to all users except depositor' do
-      expect(depositor).to receive(:send_message).once.and_call_original
+      expect(depositor).to receive(:send_message).with(anything, "Test title (<a href=\"/concern/generic_works/#{work.id}\">#{work.id}</a>) was deposited by #{depositor.user_key} and is awaiting approval A pleasant read", anything).once.and_call_original
 
       expect { described_class.send_notification(entity: entity, user: depositor, comment: comment, recipients: recipients) }
         .to change { depositor.mailbox.inbox.count }.by(1)

data/spec/views/curation_concerns/base/_find_work_widget.html.erb_spec.rb

@@ -11,8 +11,7 @@ RSpec.describe 'curation_concerns/base/_find_work_widget.html.erb', type: :view
     allow(view).to receive(:current_user).and_return(stub_model(User))
     render 'curation_concerns/base/find_work_widget',
            f: form,
-           id_name: 'work_child_members_ids',
-           id_type: 'ordered_member_ids',
+           name: 'child_work',
            user_email: 'foo@bar.com',
            id: '999'
   end

data/spec/views/curation_concerns/base/_form_child_work_relationships.html.erb_spec.rb

@@ -1,21 +1,21 @@
 require 'spec_helper'
 
-describe "curation_concerns/base/_form_child_work_relationships.html.erb", type: :view do
+RSpec.describe "curation_concerns/base/_form_child_work_relationships.html.erb", type: :view do
   let(:work) do
     stub_model(GenericWork, id: '456', title: ["MyWork"])
   end
 
-  let(:work_2) do
-    stub_model(GenericWork, id: '567', title: ["Child Work"])
-  end
-
   let(:ability) { double }
 
   let(:form) do
     Sufia::Forms::WorkForm.new(work, ability)
   end
 
-  let(:f) { double }
+  let(:f) do
+    view.simple_form_for(form, url: '/update') do |work_form|
+      return work_form
+    end
+  end
 
   let(:page) do
     render
@@ -29,84 +29,49 @@ describe "curation_concerns/base/_form_child_work_relationships.html.erb", type:
     allow(view).to receive(:f).and_return(f)
     allow(f).to receive(:object).and_return(form)
     allow(controller).to receive(:current_user).and_return(stub_model(User))
-    stub_template '_find_work_widget.html.erb' => "<input value=''/>"
+    stub_template '_find_work_widget.html.erb' => "<input class='finder'/>"
     assign(:form, form)
   end
 
   context "When editing a work" do
     context "and no children works are present" do
       before do
-        allow(work).to receive(:ordered_members).and_return([])
-      end
-      it "has 1 empty child work input" do
-        expect(page).to have_selector("input[value='']", count: 1)
+        allow(form).to receive(:work_members).and_return([])
       end
 
-      it "will not display the remove button in the actions" do
-        expect(page).to have_selector(".btn-remove-row", visible: false)
-      end
+      it "draws the page" do
+        # remove button is not present
+        expect(page).not_to have_selector("[data-behavior='remove-relationship']")
 
-      it "will display the add button in the actions" do
-        expect(page).to have_selector(".btn-add-row", visible: true, count: 1)
+        # input with add button
+        expect(page).to have_selector("input.finder")
+        expect(page).to have_selector("[data-behavior='add-relationship']")
       end
     end
-    context "When 1 child work is present" do
+
+    context "and child works are present" do
       let(:work_2) do
         stub_model(GenericWork, id: '567', title: ["Test Child Work"])
       end
 
       before do
-        allow(work).to receive(:ordered_members).and_return([work_2])
-      end
-      it "has 1 empty child work input with add button" do
-        expect(page).to have_selector("input[value='']", count: 1)
-        expect(page).to have_selector(".btn-add-row", visible: true, count: 1)
+        allow(form).to receive(:work_members).and_return([work_2])
       end
 
-      it "has an input box that is filled in with the child id" do
-        expect(page).to have_selector("input[value='#{work_2.id}']", count: 1)
-      end
+      it "draws the page" do
+        # input with add button
+        expect(page).to have_selector("input.finder")
+        expect(page).to have_selector("[data-behavior='add-relationship']")
 
-      it "generates a link for the childs first title" do
-        expect(page).to have_link("Test Child Work")
-      end
+        # an input box that is filled in with the child id
+        expect(page).to have_selector("input[value='#{work_2.id}']", visible: false)
 
-      it "has an edit and remove button" do
-        within ".old-row" do
-          expect(page).to have_selector(".btn-remove-row", visible: true, count: 1)
-          expect(page).to have_selector(".btn-edit-row", visible: true, count: 1)
-        end
-      end
-    end
-    context "When multiple child works are present" do
-      let(:work_2) do
-        stub_model(GenericWork, id: '567', title: ["Test Child Work"])
-      end
-      let(:work_3) do
-        stub_model(GenericWork, id: '789', title: ["Test Child Work 2"])
-      end
-      before do
-        allow(work).to receive(:ordered_members).and_return([work_2, work_3])
-      end
-      it "has 1 empty child work input with add button" do
-        expect(page).to have_selector("input[value='']", count: 1)
-        expect(page).to have_selector(".btn-add-row", visible: true, count: 1)
-      end
-
-      it "has an input box that is filled in with the child ids" do
-        expect(page).to have_selector("input[value='#{work_2.id}']", count: 1)
-        expect(page).to have_selector("input[value='#{work_3.id}']", count: 1)
-      end
-
-      it "generates a link for the childs first title" do
+        # generate a link for the child work's title
         expect(page).to have_link("Test Child Work")
-        expect(page).to have_link("Test Child Work 2")
-      end
 
-      it "has an edit and remove button" do
-        within ".old-row" do
-          expect(page).to have_selector(".btn-remove-row", visible: true, count: 2)
-          expect(page).to have_selector(".btn-edit-row", visible: true, count: 2)
+        # a remove button
+        within "tr" do
+          expect(page).to have_selector("[data-behavior='remove-relationship']")
         end
       end
     end

data/spec/views/curation_concerns/base/_form_relationships.html.erb_spec.rb

@@ -1,15 +1,17 @@
-describe 'curation_concerns/base/_form_relationships.html.erb', type: :view do
+RSpec.describe 'curation_concerns/base/_form_relationships.html.erb', type: :view do
   let(:ability) { double }
   let(:work) { GenericWork.new }
   let(:form) do
     CurationConcerns::GenericWorkForm.new(work, ability)
   end
-  let(:service) { instance_double CurationConcerns::AdminSetService, select_options: [] }
+  let(:service) { instance_double CurationConcerns::AdminSetService }
+  let(:presenter) { instance_double Sufia::AdminSetOptionsPresenter, select_options: [] }
 
   before do
     allow(view).to receive(:available_collections).and_return([])
     allow(view).to receive(:action_name).and_return('new')
     allow(CurationConcerns::AdminSetService).to receive(:new).with(controller).and_return(service)
+    allow(Sufia::AdminSetOptionsPresenter).to receive(:new).with(service).and_return(presenter)
   end
 
   let(:form_template) do

data/spec/views/sufia/admin/admin_sets/_form_participants.html.erb_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 RSpec.describe 'sufia/admin/admin_sets/_form_participants.html.erb', type: :view do
   let(:admin_set) { create(:admin_set) }
-  let(:permission_template) { Sufia::PermissionTemplate.find_or_create_by(admin_set_id: admin_set.id) }
+  let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id) }
   before do
     @form = Sufia::Forms::AdminSetForm.new(admin_set, permission_template)
     render