sufia 7.1.0 → 7.2.0

data/spec/indexers/sufia/work_indexer_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+RSpec.describe Sufia::WorkIndexer do
+  let(:indexer) { described_class.new(work) }
+
+  describe "#generate_solr_document" do
+    let(:work) { create(:generic_work, admin_set: admin_set) }
+    let(:admin_set) { create(:admin_set, title: ['Title One']) }
+    subject(:document) { indexer.generate_solr_document }
+
+    it "indexes the correct fields" do
+      expect(document.fetch('admin_set_sim')).to eq ["Title One"]
+      expect(document.fetch('admin_set_tesim')).to eq ["Title One"]
+    end
+  end
+end

data/spec/javascripts/required_field_spec.js

@@ -0,0 +1,41 @@
+describe('RequiredFields', function() {
+  var control = require('sufia/save_work/required_fields');
+  var target = null;
+
+  describe('areComplete', function() {
+    describe('when required metadata is not present' ,  function() {
+      beforeEach(function() {
+        var fixture = setFixtures(form('',''));
+        target = new control.RequiredFields(fixture.find('#new_generic_work'),function () {});
+      });
+      it('is not complete', function() {
+        expect(target.areComplete).toEqual(false);
+      });
+    });
+
+    describe('when required metadata is not present', function() {
+      beforeEach(function() {
+        var fixture = setFixtures(form('title','selected="selected"'));
+        target = new control.RequiredFields(fixture.find('#new_generic_work'),function () {});
+      });
+      it('is complete', function() {
+        expect(target.areComplete).toEqual(true);
+      });
+    });
+
+  });
+});
+
+function form(title, resourceTypeSelected) {
+    return '<form id="new_generic_work">' +
+        '  <div>' +
+        '    <input class="string multi_value required form-control generic_work_title form-control multi-text-field" required="required" aria-required="true" name="generic_work[title][]" value="' + title + '" id="generic_work_title" type="text">' +
+        '  </div>' +
+        '  <div>' +
+        '    <select class="form-control select required form-control" multiple="multiple" required="required" aria-required="true" name="generic_work[resource_type][]" id="generic_work_resource_type">' +
+        '      <option value="Article"' + resourceTypeSelected + '>Article</option>' +
+        '      <option value="Other">Other</option>' +
+        '    </select>' +
+        '  </div>' +
+        '</form>';
+}

data/spec/javascripts/save_work_spec.js

@@ -180,6 +180,15 @@ describe("SaveWorkControl", function() {
         $('#new_generic_work').submit();
         expect(spyEvent).not.toHaveBeenPrevented();
       });
+
+      it("disables save after submission", function() {
+        spyOn(target, 'isValid').and.returnValue(true);
+        expect(target.saveButton).toBeDisabled();
+        target.saveButton.prop("disabled", false);
+        expect(target.saveButton).not.toBeDisabled();
+        $('#new_generic_work').submit();
+        expect(target.saveButton).toBeDisabled();
+      });
     });
   });
 });

data/spec/jobs/attach_files_to_work_job_spec.rb

@@ -7,12 +7,17 @@ describe AttachFilesToWorkJob do
     let(:generic_work) { create(:public_generic_work) }
 
     context "with uploaded files on the filesystem" do
-      it "attaches files, copies visibility and updates the uploaded files" do
+      before do
+        generic_work.permissions.build(name: 'userz@bbb.ddd', type: 'person', access: 'edit')
+        generic_work.save
+      end
+      it "attaches files, copies visibility and permissions and updates the uploaded files" do
         expect(CharacterizeJob).to receive(:perform_later).twice
         described_class.perform_now(generic_work, [uploaded_file1, uploaded_file2])
         generic_work.reload
         expect(generic_work.file_sets.count).to eq 2
         expect(generic_work.file_sets.map(&:visibility)).to all(eq 'open')
+        expect(generic_work.file_sets.map(&:edit_users)).to all(match_array([generic_work.depositor, 'userz@bbb.ddd']))
         expect(uploaded_file1.reload.file_set_uri).not_to be_nil
       end
     end

data/spec/jobs/batch_create_job_spec.rb

@@ -26,12 +26,14 @@ describe BatchCreateJob do
     let(:work) { double(errors: errors) }
     let(:actor) { double(curation_concern: work) }
 
-    subject { described_class.perform_later(user,
-                                            title,
-                                            resource_types,
-                                            uploaded_files,
-                                            metadata,
-                                            log) }
+    subject do
+      described_class.perform_later(user,
+                                    title,
+                                    resource_types,
+                                    uploaded_files,
+                                    metadata,
+                                    log)
+    end
 
     it "updates work metadata" do
       expect(CurationConcerns::CurationConcern).to receive(:actor).and_return(actor).twice

data/spec/jobs/content_delete_event_job_spec.rb

@@ -1,7 +1,5 @@
 describe ContentDeleteEventJob do
   let(:user) { create(:user) }
-  let(:another_user) { create(:user) }
-  let(:third_user) { create(:user) }
   let(:mock_time) { Time.zone.at(1) }
   let(:event) do
     {
@@ -11,38 +9,28 @@ describe ContentDeleteEventJob do
   end
 
   before do
-    another_user.follow(user)
-    third_user.follow(user)
     allow(Time).to receive(:now).and_return(mock_time)
   end
 
   context 'with a FileSet' do
     let(:curation_concern) { create(:file_set, title: ['Hamlet'], user: user) }
 
-    it "logs the event to the depositor's profile and followers' dashboards" do
-      expect {
+    it "logs the event to the depositor's profile" do
+      expect do
         described_class.perform_now(curation_concern.id, user)
-      }.to change { user.profile_events.length }.by(1)
-        .and change { another_user.events.length }.by(1)
-        .and change { third_user.events.length }.by(1)
+      end.to change { user.profile_events.length }.by(1)
       expect(user.profile_events.first).to eq(event)
-      expect(another_user.events.first).to eq(event)
-      expect(third_user.events.first).to eq(event)
     end
   end
 
   context 'with a Work' do
     let(:curation_concern) { create(:generic_work, title: ['BethsMac'], user: user) }
 
-    it "logs the event to the depositor's profile and followers' dashboards" do
-      expect {
+    it "logs the event to the depositor's profile" do
+      expect do
         described_class.perform_now(curation_concern.id, user)
-      }.to change { user.profile_events.length }.by(1)
-        .and change { another_user.events.length }.by(1)
-        .and change { third_user.events.length }.by(1)
+      end.to change { user.profile_events.length }.by(1)
       expect(user.profile_events.first).to eq(event)
-      expect(another_user.events.first).to eq(event)
-      expect(third_user.events.first).to eq(event)
     end
   end
 end

data/spec/jobs/content_deposit_event_job_spec.rb

@@ -1,13 +1,8 @@
 describe ContentDepositEventJob do
   let(:user) { create(:user) }
-  let(:another_user) { create(:user) }
-  let(:third_user) { create(:user) }
   let(:mock_time) { Time.zone.at(1) }
 
   before do
-    another_user.follow(user)
-    third_user.follow(user)
-    allow_any_instance_of(User).to receive(:can?).and_return(true)
     allow(Time).to receive(:now).at_least(:once).and_return(mock_time)
   end
 
@@ -19,17 +14,13 @@ describe ContentDepositEventJob do
     }
   end
 
-  it "logs the event to the depositor's profile, followers' dashboards, and the Work" do
-    expect {
+  it "logs the event to the depositor's profile and the Work" do
+    expect do
       described_class.perform_now(curation_concern, user)
-    }.to change { user.profile_events.length }.by(1)
-      .and change { another_user.events.length }.by(1)
-      .and change { third_user.events.length }.by(1)
+    end.to change { user.profile_events.length }.by(1)
       .and change { curation_concern.events.length }.by(1)
 
     expect(user.profile_events.first).to eq(event)
-    expect(another_user.events.first).to eq(event)
-    expect(third_user.events.first).to eq(event)
     expect(curation_concern.events.first).to eq(event)
   end
 end

data/spec/jobs/content_depositor_change_event_job_spec.rb

@@ -1,27 +1,22 @@
 describe ContentDepositorChangeEventJob do
   let(:user) { create(:user) }
   let(:another_user) { create(:user) }
-  let(:third_user) { create(:user) }
   let(:generic_work) { create(:generic_work, title: ['BethsMac'], user: user) }
   let(:mock_time) { Time.zone.at(1) }
   let(:event) { { action: "User <a href=\"/users/#{user.to_param}\">#{user.user_key}</a> has transferred <a href=\"/concern/generic_works/#{generic_work.id}\">BethsMac</a> to user <a href=\"/users/#{another_user.to_param}\">#{another_user.user_key}</a>", timestamp: '1' } }
   before do
-    third_user.follow(another_user)
-    allow_any_instance_of(User).to receive(:can?).and_return(true)
     allow(Time).to receive(:now).at_least(:once).and_return(mock_time)
   end
 
-  it "logs the event to the proxy depositor's profile, the depositor's dashboard, followers' dashboards, and the FileSet" do
-    expect {
+  it "logs the event to the proxy depositor's profile, the depositor's dashboard, and the FileSet" do
+    expect do
       described_class.perform_now(generic_work, another_user)
-    }.to change { user.profile_events.length }.by(1)
+    end.to change { user.profile_events.length }.by(1)
       .and change { another_user.events.length }.by(1)
-      .and change { third_user.events.length }.by(1)
       .and change { generic_work.events.length }.by(1)
 
     expect(user.profile_events.first).to eq(event)
     expect(another_user.events.first).to eq(event)
-    expect(third_user.events.first).to eq(event)
     expect(generic_work.events.first).to eq(event)
   end
 end

data/spec/jobs/content_new_version_event_job_spec.rb

@@ -1,30 +1,21 @@
 describe ContentNewVersionEventJob do
   let(:user) { create(:user) }
-  let(:another_user) { create(:user) }
-  let(:third_user) { create(:user) }
   let(:file_set) { create(:file_set, title: ['Hamlet'], user: user) }
   let(:generic_work) { create(:generic_work, title: ['BethsMac'], user: user) }
   let(:mock_time) { Time.zone.at(1) }
   let(:event) { { action: "User <a href=\"/users/#{user.to_param}\">#{user.user_key}</a> has added a new version of <a href=\"/concern/file_sets/#{file_set.id}\">Hamlet</a>", timestamp: '1' } }
 
   before do
-    another_user.follow(user)
-    third_user.follow(user)
-    allow_any_instance_of(User).to receive(:can?).and_return(true)
     allow(Time).to receive(:now).at_least(:once).and_return(mock_time)
   end
 
-  it "logs the event to the depositor's profile, followers' dashboards, and the FileSet" do
-    expect {
+  it "logs the event to the depositor's profile and the FileSet" do
+    expect do
       described_class.perform_now(file_set, user)
-    }.to change { user.profile_events.length }.by(1)
-      .and change { another_user.events.length }.by(1)
-      .and change { third_user.events.length }.by(1)
+    end.to change { user.profile_events.length }.by(1)
       .and change { file_set.events.length }.by(1)
 
     expect(user.profile_events.first).to eq(event)
-    expect(another_user.events.first).to eq(event)
-    expect(third_user.events.first).to eq(event)
     expect(file_set.events.first).to eq(event)
   end
 end

data/spec/jobs/content_restored_version_event_job_spec.rb

@@ -1,30 +1,22 @@
 describe ContentRestoredVersionEventJob do
   let(:user) { create(:user) }
-  let(:another_user) { create(:user) }
-  let(:third_user) { create(:user) }
   let(:file_set) { create(:file_set, title: ['Hamlet'], user: user) }
   let(:generic_work) { create(:generic_work, title: ['BethsMac'], user: user) }
   let(:mock_time) { Time.zone.at(1) }
   let(:event) { { action: "User <a href=\"/users/#{user.to_param}\">#{user.user_key}</a> has restored a version 'content.0' of <a href=\"/concern/file_sets/#{file_set.id}\">Hamlet</a>", timestamp: '1' } }
   before do
-    another_user.follow(user)
-    third_user.follow(user)
     allow_any_instance_of(User).to receive(:can?).and_return(true)
     allow(Time).to receive(:now).at_least(:once).and_return(mock_time)
   end
 
-  it "logs the event to the depositor's profile, followers' dashboards, and the FileSet" do
+  it "logs the event to the depositor's profile and the FileSet" do
     described_class.perform_now(file_set, user, 'content.0')
-    expect {
+    expect do
       described_class.perform_now(file_set, user, 'content.0')
-    }.to change { user.profile_events.length }.by(1)
-      .and change { another_user.events.length }.by(1)
-      .and change { third_user.events.length }.by(1)
+    end.to change { user.profile_events.length }.by(1)
       .and change { file_set.events.length }.by(1)
 
     expect(user.profile_events.first).to eq(event)
-    expect(another_user.events.first).to eq(event)
-    expect(third_user.events.first).to eq(event)
     expect(file_set.events.first).to eq(event)
   end
 end

data/spec/jobs/content_update_event_job_spec.rb

@@ -1,92 +1,26 @@
 describe ContentUpdateEventJob do
   let(:user) { create(:user) }
-  let(:another_user) { create(:user) }
-  let(:third_user) { create(:user) }
   let(:mock_time) { Time.zone.at(1) }
 
   before do
-    another_user.follow(user)
-    third_user.follow(user)
     allow(Time).to receive(:now).at_least(:once).and_return(mock_time)
   end
 
-  context "when the followers have access to view the FileSet" do
-    let(:curation_concern) { create(:file_set, title: ['Hamlet'], user: user) }
-    let(:event) do
-      {
-        action: "User <a href=\"/users/#{user.to_param}\">#{user.user_key}</a> has updated <a href=\"/concern/file_sets/#{curation_concern.id}\">Hamlet</a>",
-        timestamp: '1'
-      }
-    end
-
-    before do
-      allow_any_instance_of(User).to receive(:can?).and_return(true)
-    end
-
-    it "logs the event to the depositor's profile, followers' dashboards, and the FileSet" do
-      expect {
-        described_class.perform_now(curation_concern, user)
-      }.to change { user.profile_events.length }.by(1)
-        .and change { another_user.events.length }.by(1)
-        .and change { third_user.events.length }.by(1)
-        .and change { curation_concern.events.length }.by(1)
-
-      expect(user.profile_events.first).to eq(event)
-      expect(another_user.events.first).to eq(event)
-      expect(third_user.events.first).to eq(event)
-      expect(curation_concern.events.first).to eq(event)
-    end
-  end
-
-  context "when the followers have access to view the Work" do
-    let(:curation_concern) { create(:work, title: ['BethsMac'], user: user) }
-    let(:event) do
-      {
-        action: "User <a href=\"/users/#{user.to_param}\">#{user.user_key}</a> has updated <a href=\"/concern/generic_works/#{curation_concern.id}\">BethsMac</a>",
-        timestamp: '1'
-      }
-    end
-
-    before do
-      allow_any_instance_of(User).to receive(:can?).and_return(true)
-    end
-
-    it "logs the event to the depositor's profile, followers' dashboards, and the Work" do
-      expect {
-        described_class.perform_now(curation_concern, user)
-      }.to change { user.profile_events.length }.by(1)
-        .and change { another_user.events.length }.by(1)
-        .and change { third_user.events.length }.by(1)
-        .and change { curation_concern.events.length }.by(1)
-
-      expect(user.profile_events.first).to eq(event)
-      expect(another_user.events.first).to eq(event)
-      expect(third_user.events.first).to eq(event)
-      expect(curation_concern.events.first).to eq(event)
-    end
+  let(:curation_concern) { create(:file_set, title: ['Hamlet'], user: user) }
+  let(:event) do
+    {
+      action: "User <a href=\"/users/#{user.to_param}\">#{user.user_key}</a> has updated <a href=\"/concern/file_sets/#{curation_concern.id}\">Hamlet</a>",
+      timestamp: '1'
+    }
   end
 
-  RSpec::Matchers.define_negated_matcher :does_not_change, :change
-
-  context "when the followers lack access to the FileSet" do
-    let(:file_set) { create(:file_set, title: ['Hamlet'], user: user) }
-    let(:event) do
-      {
-        action: "User <a href=\"/users/#{user.to_param}\">#{user.user_key}</a> has updated <a href=\"/concern/file_sets/#{file_set.id}\">Hamlet</a>",
-        timestamp: '1'
-      }
-    end
-
-    it "does not log content-related jobs to followers" do
-      expect {
-        described_class.perform_now(file_set, user)
-      }.to change { user.profile_events.length }.by(1)
-        .and does_not_change { another_user.events.length }
-        .and does_not_change { third_user.events.length }
-        .and change { file_set.events.length }.by(1)
+  it "logs the event to the depositor's profile and the FileSet" do
+    expect do
+      described_class.perform_now(curation_concern, user)
+    end.to change { user.profile_events.length }.by(1)
+      .and change { curation_concern.events.length }.by(1)
 
-      expect(user.profile_events.first).to eq(event)
-      expect(file_set.events.first).to eq(event)
-    end
+    expect(user.profile_events.first).to eq(event)
+    expect(curation_concern.events.first).to eq(event)
   end
 end

data/spec/jobs/file_set_attached_event_job_spec.rb

@@ -1,12 +1,8 @@
 describe FileSetAttachedEventJob do
   let(:user) { create(:user) }
-  let(:another_user) { create(:user) }
-  let(:third_user) { create(:user) }
   let(:mock_time) { Time.zone.at(1) }
 
   before do
-    another_user.follow(user)
-    third_user.follow(user)
     allow_any_instance_of(User).to receive(:can?).and_return(true)
     allow(Time).to receive(:now).at_least(:once).and_return(mock_time)
   end
@@ -22,17 +18,13 @@ describe FileSetAttachedEventJob do
     end
 
     it "logs the event to the right places" do
-      expect {
+      expect do
         described_class.perform_now(file_set, user)
-      }.to change { user.profile_events.length }.by(1)
-        .and change { another_user.events.length }.by(1)
-        .and change { third_user.events.length }.by(1)
+      end.to change { user.profile_events.length }.by(1)
         .and change { file_set.events.length }.by(1)
         .and change { curation_concern.events.length }.by(1)
 
       expect(user.profile_events.first).to eq(event)
-      expect(another_user.events.first).to eq(event)
-      expect(third_user.events.first).to eq(event)
       expect(curation_concern.events.first).to eq(event)
       expect(file_set.events.first).to eq(event)
     end