sufia 7.3.0.rc3 → 7.3.0

data/spec/controllers/sufia/admin/permission_templates_controller_spec.rb

@@ -26,7 +26,7 @@ RSpec.describe Sufia::Admin::PermissionTemplatesController do
   context "when signed in as an admin" do
     describe "update participants" do
       let(:admin_set) { create(:admin_set) }
-      let!(:permission_template) { Sufia::PermissionTemplate.create!(admin_set_id: admin_set.id) }
+      let!(:permission_template) { create(:permission_template, admin_set_id: admin_set.id) }
       let(:grant_attributes) { [{ "agent_type" => "user", "agent_id" => "bob", "access" => "view" }] }
       let(:input_params) do
         { admin_set_id: admin_set.id,

data/spec/controllers/sufia/batch_uploads_controller_spec.rb

@@ -38,7 +38,7 @@ describe Sufia::BatchUploadsController do
   end
 
   describe "#create" do
-    context "enquing a update job" do
+    context "with expected params" do
       it "is successful" do
         expect(BatchCreateJob).to receive(:perform_later)
           .with(user,
@@ -53,7 +53,29 @@ describe Sufia::BatchUploadsController do
       end
     end
 
-    describe "when submiting works on behalf of another user" do
+    context 'with missing resource_type' do
+      let(:post_params) do
+        {
+          title: expected_individual_params,
+          uploaded_files: ['1', '2'],
+          batch_upload_item: batch_upload_item
+        }
+      end
+      it 'is successful' do
+        expect(BatchCreateJob).to receive(:perform_later)
+          .with(user,
+                expected_individual_params,
+                {},
+                ['1', '2'],
+                expected_shared_params,
+                a_kind_of(Sufia::BatchCreateOperation))
+        post :create, params: post_params
+        expect(response).to redirect_to Sufia::Engine.routes.url_helpers.dashboard_works_path
+        expect(flash[:notice]).to include("Your files are being processed")
+      end
+    end
+
+    context "when submiting works on behalf of another user" do
       let(:batch_upload_item) do
         {
           payload_concern: Atlas,

data/spec/factories/permission_templates.rb

@@ -1,5 +1,6 @@
 FactoryGirl.define do
   factory :permission_template, class: Sufia::PermissionTemplate do
     admin_set_id '88888'
+    workflow_name AdminSet::DEFAULT_WORKFLOW_NAME
   end
 end

data/spec/factories/workflows.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
   factory :workflow, class: Sipity::Workflow do
-    name 'generic_work'
+    name 'one_step_mediated_deposit'
   end
 end

data/spec/forms/curation_concerns/generic_work_form_spec.rb

@@ -1,4 +1,4 @@
-describe CurationConcerns::GenericWorkForm do
+RSpec.describe CurationConcerns::GenericWorkForm do
   let(:work) { GenericWork.new }
   let(:form) { described_class.new(work, nil) }
 
@@ -39,12 +39,15 @@ describe CurationConcerns::GenericWorkForm do
   end
 
   describe '.model_attributes' do
+    before { create(:permission_template, admin_set_id: admin_set_id, workflow_name: workflow.name) }
+    let(:workflow) { create(:workflow) }
+    let(:admin_set_id) { '123' }
     let(:params) do
       ActionController::Parameters.new(
         title: ['foo'],
         description: [''],
         visibility: 'open',
-        admin_set_id: '123',
+        admin_set_id: admin_set_id,
         representative_id: '456',
         thumbnail_id: '789',
         keyword: ['derp'],

data/spec/forms/sufia/forms/batch_edit_form_spec.rb

@@ -1,4 +1,4 @@
-describe Sufia::Forms::BatchEditForm do
+RSpec.describe Sufia::Forms::BatchEditForm do
   let(:model) { GenericWork.new }
   let(:work1) { create :generic_work, title: ["title 1"], keyword: ["abc"], creator: ["Wilma"], language: ['en'], contributor: ['contributor1'], description: ['description1'], rights: ['rights1'], subject: ['subject1'], identifier: ['id1'], based_near: ['based_near1'], related_url: ['related_url1'] }
   let(:work2) { create :generic_work, title: ["title 2"], keyword: ["123"], creator: ["Fred"], publisher: ['Rand McNally'], language: ['en'], resource_type: ['bar'], contributor: ['contributor2'], description: ['description2'], rights: ['rights2'], subject: ['subject2'], identifier: ['id2'], based_near: ['based_near2'], related_url: ['related_url2'] }

data/spec/forms/sufia/forms/work_form_spec.rb

@@ -4,24 +4,13 @@ describe Sufia::Forms::WorkForm, :no_clean do
   let(:works) { [GenericWork.new, FileSet.new, GenericWork.new] }
   let(:files) { [FileSet.new, GenericWork.new, FileSet.new] }
 
-  describe "#ordered_fileset_members" do
-    it "expects ordered fileset members" do
-      allow(work).to receive(:ordered_members).and_return(files)
-      expect(form.ordered_fileset_members.size).to eq(2)
-    end
-  end
-
-  describe "#ordered_work_members" do
-    it "expects ordered work members" do
-      allow(work).to receive(:ordered_members).and_return(works)
-      expect(form.ordered_work_members.size).to eq(2)
+  describe "#work_members" do
+    subject { form.work_members }
+    before do
+      allow(work).to receive(:members).and_return(works)
     end
-  end
-
-  describe "#in_work_members" do
-    it "expects parent work members" do
-      allow(work).to receive(:in_works).and_return(works)
-      expect(form.in_work_members.size).to eq(3)
+    it "expects members that are works" do
+      expect(form.work_members.size).to eq(2)
     end
   end
 
@@ -30,6 +19,7 @@ describe Sufia::Forms::WorkForm, :no_clean do
       allow(described_class).to receive(:model_class).and_return(GenericWork)
     end
     subject { described_class.build_permitted_params }
+
     context "without mediated deposit" do
       it { is_expected.to include(permissions_attributes: [:type, :name, :access, :id, :_destroy]) }
     end
@@ -42,8 +32,31 @@ describe Sufia::Forms::WorkForm, :no_clean do
     subject { described_class.model_attributes(ActionController::Parameters.new(attributes)) }
 
     context "when a user is granted edit access" do
-      let(:attributes) { { permissions_attributes: [{ type: 'person', name: 'justin', access: 'edit' }] } }
-      it { is_expected.to eq ActionController::Parameters.new(permissions_attributes: [ActionController::Parameters.new(type: 'person', name: 'justin', access: 'edit')]).permit! }
+      let(:admin_set) { create(:admin_set) }
+
+      context "and a admin_set that allows grants has been selected" do
+        let(:attributes) { { admin_set_id: admin_set.id, permissions_attributes: [{ type: 'person', name: 'justin', access: 'edit' }] } }
+        before { create(:permission_template, admin_set_id: admin_set.id, workflow_name: workflow.name) }
+        let(:workflow) { create(:workflow, allows_access_grant: true) }
+
+        it do
+          is_expected.to eq ActionController::Parameters.new(admin_set_id: admin_set.id,
+                                                             permissions_attributes: [ActionController::Parameters.new(type: 'person', name: 'justin', access: 'edit')]).permit!
+        end
+      end
+
+      context "and no admin_set has been selected" do
+        let(:attributes) { { permissions_attributes: [{ type: 'person', name: 'justin', access: 'edit' }] } }
+        it { is_expected.to eq ActionController::Parameters.new.permit! }
+      end
+
+      context "and an admin_set that doesn't allow grants has been selected" do
+        let(:attributes) { { admin_set_id: admin_set.id, permissions_attributes: [{ type: 'person', name: 'justin', access: 'edit' }] } }
+        before { create(:permission_template, admin_set_id: admin_set.id, workflow_name: workflow.name) }
+        let(:workflow) { create(:workflow, allows_access_grant: false) }
+
+        it { is_expected.to eq ActionController::Parameters.new(admin_set_id: admin_set.id).permit! }
+      end
     end
 
     context "without permssions being set" do

data/spec/javascripts/autocomplete_spec.js.coffee

@@ -99,8 +99,8 @@ describe "auto complete", ->
   describe "location", ->
     beforeEach ->
       # setup two inputs for us to attach  auto complete to
-      setFixtures  '<input class="generic_work_based_near"  value="" id="generic_work_based_near" type="text" data-autocomplete="based_near" data-autocomplete-url="foo">
-                    <input class="generic_work_based_near"  value="" type="text" data-autocomplete="based_near" data-autocomplete-url="foo">'
+      setFixtures  '<input class="generic_work_based_near" value="" id="generic_work_based_near" type="text" data-autocomplete="based_near" data-autocomplete-url="foo">
+                    <input class="generic_work_based_near" value="" type="text" data-autocomplete="based_near" data-autocomplete-url="foo">'
 
       # run all Blacklight.onload functions
       Blacklight.activate()
@@ -136,42 +136,21 @@ describe "auto complete", ->
         # verify that the ajax call was made
         expect(@spy_on_json).toHaveBeenCalled()
 
-  describe "works", ->
+  describe "for works", ->
     beforeEach ->
-      # setup two inputs for us to attach  auto complete to
-      setFixtures  '<input class="generic_work_work"  value="" id="generic_work_based_near" type="text" data-autocomplete="work" data-autocomplete-url="foo">
-                    <input class="generic_work_work"  value="" type="text" data-autocomplete="work" data-autocomplete-url="foo">'
+      # setup two inputs for us to attach auto complete to
+      setFixtures  '<input class="generic_work_work" value="" id="generic_work_based_near" type="text" data-autocomplete="work" data-autocomplete-url="foo">
+                    <input class="generic_work_work" value="" type="text" data-autocomplete="work" data-autocomplete-url="foo">'
 
       # run all Blacklight.onload functions
       Blacklight.activate()
 
-    describe "first input", ->
-
-      # field triggers auto complete
-      it "auto completes on typing", ->
-        # send a key stroke to the target input to activate the auto complete
+    describe "the first input", ->
+      it "initializes using select2", ->
         target = $($("input.generic_work_work")[0])
-        target.val('fre')
-        target.trigger(@typeEvent)
-
-        # move time along so that events have a chance to happen
-        jasmine.clock().tick(800)
-
-        # verify that the ajax call was made
-        expect(@spy_on_json).toHaveBeenCalled()
+        expect(target.select2('open')).toBe(true)
 
-
-    describe "second input", ->
-
-      # field triggers auto complete
-      it "auto completes on typing", ->
-        # send a key stroke to the target input to activate the auto complete
+    describe "the second input", ->
+      it "initializes using select2", ->
         target = $($("input.generic_work_work")[1])
-        target.val('fre')
-        target.trigger(@typeEvent)
-
-        # move time along so that events have a chance to happen
-        jasmine.clock().tick(800)
-
-        # verify that the ajax call was made
-        expect(@spy_on_json).toHaveBeenCalled()
+        expect(target.select2('open')).toBe(true)

data/spec/javascripts/helpers/test_fixtures.js.coffee

@@ -5,5 +5,14 @@ window.TestFixtures = {
   }
 }
 
-window.TestFixtures.relationships_table["html"] = "<form action='/concern/generic_works/#{TestFixtures.relationships_table.child_id}'><table class='table table-striped related-files relationships-ajax-enabled' data-query-url='/concern/generic_works/$id'> <thead> <tr> <th>Parent Work</th> <th>Actions</th> </tr> </thead> <tbody> <tr class='new-row'> <td> <a href='' class='title hidden'></a> <input class='new-form-control string multi_value optional related_works_ids form-control multi-text-field' name='generic_work[in_works_ids][]' value='' aria-labelledby='generic_work_in_works_ids_label' type='text'> <div class='message has-warning hidden'></div> </td> <td> <div class='child-actions'> <a href='' class='edit hidden btn btn-default' target='_blank'>Edit</a> <a class='btn btn-danger btn-remove-row hidden'>Remove</a> <a class='btn btn-primary btn-add-row'>Add</a></div></td></tr></tbody></table></form>"
+window.TestFixtures.relationships_table["html"] =
+"<form action='/concern/generic_works/#{TestFixtures.relationships_table.child_id}'><table class='table table-striped related-files relationships-ajax-enabled'> <thead> <tr> <th>Parent Work</th> <th>Actions</th> </tr> </thead> <tbody> <tr class='new-row'> <td> <a href='' class='title hidden'></a>
+<input id=\"find_child_work\" name='find_child_work' value='' data-autocomplete=\"work\"> <div class='message has-warning hidden'></div> </td> <td> <div class='child-actions'> <a href='' class='edit hidden btn btn-default' target='_blank'>Edit</a> <a class='btn btn-danger btn-remove-row hidden'>Remove</a> <a class='btn btn-primary btn-add-row'>Add</a></div></td></tr></tbody></table></form>
 
+<script type=\"text/x-tmpl\" id=\"tmpl-child-work\">
+<tr>
+  <td>{%= o.title %}</td>
+  <td><button class=\"btn btn-danger\" data-behavior=\"remove-relationship\">Remove</button></td>
+</tr>
+</script>
+"

data/spec/javascripts/relationships_control_spec.js.coffee

@@ -0,0 +1,27 @@
+describe 'RelationshipsControl', ->
+  RelationshipsControl = require('sufia/relationships/control')
+  element = null
+  target = null
+  test_fixtures = TestFixtures
+
+  beforeEach ->
+    fixture = setFixtures(test_fixtures.relationships_table.html)
+    element = $("table")
+    target = new RelationshipsControl(element, 'work_members_attributes', 'tmpl-child-work')
+    jasmine.Ajax.install()
+
+  afterEach ->
+    jasmine.Ajax.uninstall()
+
+  describe 'attemptToAddRow', ->
+    it 'has errors when nothing is selected', ->
+      target.attemptToAddRow()
+      expect(target.errors).toEqual([ 'ID cannot be empty.' ])
+
+    it 'creates a row when something is selected', ->
+      spyOn(target.input, 'val').and.returnValue('123')
+      spyOn(target, 'searchData').and.returnValue({ id: '123', text: 'foo bar' })
+      expect(target.registry.nextIndex()).toEqual(0)
+      target.attemptToAddRow()
+      expect(target.errors).toBeNull()
+      expect(target.registry.nextIndex()).toEqual(1)

data/spec/javascripts/save_work_spec.js

@@ -1,5 +1,6 @@
 describe("SaveWorkControl", function() {
-  var control = require('sufia/save_work/save_work_control');
+  var SaveWorkControl = require('sufia/save_work/save_work_control');
+  var AdminSetWidget = require('sufia/editor/admin_set_widget');
 
   describe("validateMetadata", function() {
     var mockCheckbox = {
@@ -9,10 +10,12 @@ describe("SaveWorkControl", function() {
 
     beforeEach(function() {
       var fixture = setFixtures('<form id="edit_generic_work">' +
+        '<select><option></option></select>' +
         '<aside id="form-progress"><ul><li id="required-metadata"><li id="required-files"></ul>' +
         '<input type="checkbox" name="agreement" id="agreement" value="1" required="required" checked="checked" />' +
         '<input type="submit"></aside></form>');
-      target = new control.SaveWorkControl(fixture.find('#form-progress'));
+      admin_set = new AdminSetWidget(fixture.find('select'))
+      target = new SaveWorkControl(fixture.find('#form-progress'), admin_set);
       target.requiredMetadata = mockCheckbox;
       spyOn(mockCheckbox, 'check').and.stub();
       spyOn(mockCheckbox, 'uncheck').and.stub();
@@ -52,7 +55,7 @@ describe("SaveWorkControl", function() {
         '<aside id="form-progress"><ul><li id="required-metadata"><li id="required-files"></ul>' +
         '<input type="checkbox" name="agreement" id="agreement" value="1" required="required" checked="checked" />' +
         '<input type="submit"></aside></form>');
-      target = new control.SaveWorkControl(fixture.find('#form-progress'));
+      target = new SaveWorkControl(fixture.find('#form-progress'));
       target.activate()
     });
     it("forces user to agree if new files are added", function() {
@@ -84,7 +87,7 @@ describe("SaveWorkControl", function() {
         '<input type="checkbox" name="agreement" id="agreement" value="1" required="required" checked="checked" />' +
         '<input type="submit"></aside></form>')
       }
-      target = new control.SaveWorkControl(buildFixture(form_id).find('#form-progress'));
+      target = new SaveWorkControl(buildFixture(form_id).find('#form-progress'));
       target.requiredFiles = mockCheckbox;
       return target
     }
@@ -142,7 +145,7 @@ describe("SaveWorkControl", function() {
     var target;
     beforeEach(function() {
       var fixture = setFixtures('<form id="new_generic_work"><aside id="form-progress"><ul><li id="required-metadata"><li id="required-files"></ul><input type="submit"></aside></form>');
-      target = new control.SaveWorkControl(fixture.find('#form-progress'));
+      target = new SaveWorkControl(fixture.find('#form-progress'));
       target.activate()
     });
 
@@ -161,7 +164,7 @@ describe("SaveWorkControl", function() {
     var target;
     beforeEach(function() {
       var fixture = setFixtures('<form id="new_generic_work"><aside id="form-progress"><ul><li id="required-metadata"><li id="required-files"></ul><input type="submit"></aside></form>');
-      target = new control.SaveWorkControl(fixture.find('#form-progress'));
+      target = new SaveWorkControl(fixture.find('#form-progress'));
       target.activate()
     });
 

data/spec/javascripts/visibility_component_spec.js

@@ -1,12 +1,16 @@
 describe("VisibilityComponent", function() {
-  var control = require('sufia/save_work/visibility_component');
+  var VisibilityComponent = require('sufia/save_work/visibility_component');
+  var AdminSetWidget = require('sufia/editor/admin_set_widget');
+
   var target = null;
   var element = null;
+  var admin_set = null;
 
   beforeEach(function() {
     var fixture = setFixtures(visibilityForm(''));
     element = fixture.find('.visibility');
-    target = new control.VisibilityComponent(element);
+    admin_set = new AdminSetWidget(fixture.find('select'))
+    target = new VisibilityComponent(element, admin_set);
   });
 
   //limitByAdminSet() - Also tests restrictToVisibility(selected) which is where much of logic sits
@@ -24,7 +28,7 @@ describe("VisibilityComponent", function() {
       beforeEach(function() {
         var fixture = setFixtures(visibilityForm('<option selected="selected">No Restrictions AdminSet</option>'));
         element = fixture.find('.visibility');
-        target = new control.VisibilityComponent(element);
+        target = new VisibilityComponent(element, admin_set);
         spyOn(target, 'enableAllOptions');
       });
       it("enables all visibility options", function() {
@@ -36,7 +40,8 @@ describe("VisibilityComponent", function() {
       beforeEach(function() {
         var fixture = setFixtures(visibilityForm('<option data-visibility="authenticated" selected="selected">Institution-Only AdminSet</option>'));
         element = fixture.find('.visibility');
-        target = new control.VisibilityComponent(element);
+        admin_set = new AdminSetWidget(fixture.find('select'))
+        target = new VisibilityComponent(element, admin_set);
         spyOn(target, 'applyRestrictions');
       });
       it("calls applyRestrictions with specified visibility", function() {
@@ -48,7 +53,8 @@ describe("VisibilityComponent", function() {
       beforeEach(function() {
         var fixture = setFixtures(visibilityForm('<option data-release-date="' + target.getToday() + '" data-release-before-date="false" selected="selected">Release Immediately AdminSet</option>'));
         element = fixture.find('.visibility');
-        target = new control.VisibilityComponent(element);
+        admin_set = new AdminSetWidget(fixture.find('select'))
+        target = new VisibilityComponent(element, admin_set);
         spyOn(target, 'applyRestrictions');
       });
       it("calls applyRestrictions with specified date requirement", function() {
@@ -60,7 +66,8 @@ describe("VisibilityComponent", function() {
       beforeEach(function() {
         var fixture = setFixtures(visibilityForm('<option data-visibility="open" data-release-date="' + target.getToday() + '" data-release-before-date="false" selected="selected">Release Publicly Immediately AdminSet</option>'));
         element = fixture.find('.visibility');
-        target = new control.VisibilityComponent(element);
+        admin_set = new AdminSetWidget(fixture.find('select'))
+        target = new VisibilityComponent(element, admin_set);
         spyOn(target, 'applyRestrictions');
       });
       it("calls applyRestrictions with specified date and visibility requirement", function() {
@@ -72,7 +79,8 @@ describe("VisibilityComponent", function() {
       beforeEach(function() {
         var fixture = setFixtures(visibilityForm('<option data-release-date="' + getOneYearFromToday() + '" data-release-before-date="false" selected="selected">Release in One Year AdminSet</option>'));
         element = fixture.find('.visibility');
-        target = new control.VisibilityComponent(element);
+        admin_set = new AdminSetWidget(fixture.find('select'))
+        target = new VisibilityComponent(element, admin_set);
         spyOn(target, 'applyRestrictions');
       });
       it("calls applyRestrictions with specified date requirement", function() {
@@ -84,7 +92,8 @@ describe("VisibilityComponent", function() {
       beforeEach(function() {
         var fixture = setFixtures(visibilityForm('<option data-visibility="authenticated" data-release-date="' + getOneYearFromToday() + '" data-release-before-date="true" selected="selected">Release in One Year to Institution AdminSet</option>'));
         element = fixture.find('.visibility');
-        target = new control.VisibilityComponent(element);
+        admin_set = new AdminSetWidget(fixture.find('select'))
+        target = new VisibilityComponent(element, admin_set);
         spyOn(target, 'applyRestrictions');
       });
       it("calls applyRestrictions with specified date and visibility requirement", function() {

data/spec/models/admin_set_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+RSpec.describe AdminSet, type: :model do
+  let(:gf1) { create(:generic_work, user: user) }
+  let(:gf2) { create(:generic_work, user: user) }
+
+  let(:user) { create(:user) }
+
+  before do
+    subject.title = ['Some title']
+  end
+
+  describe "#default_set?" do
+    context "with default AdminSet ID" do
+      it "returns true" do
+        expect(AdminSet.default_set?(described_class::DEFAULT_ID)).to be true
+      end
+    end
+
+    context "with a non-default  ID" do
+      it "returns false" do
+        expect(AdminSet.default_set?('different-id')).to be false
+      end
+    end
+  end
+
+  describe "#destroy" do
+    context "with member works" do
+      before do
+        subject.members = [gf1, gf2]
+        subject.save!
+        subject.destroy
+      end
+
+      it "does not delete adminset or member works" do
+        expect(subject.errors.full_messages).to eq ["Administrative set cannot be deleted as it is not empty"]
+        expect(AdminSet.exists?(subject.id)).to be true
+        expect(GenericWork.exists?(gf1.id)).to be true
+        expect(GenericWork.exists?(gf2.id)).to be true
+      end
+    end
+
+    context "with no member works" do
+      before do
+        subject.members = []
+        subject.save!
+        subject.destroy
+      end
+
+      it "deletes the adminset" do
+        expect(AdminSet.exists?(subject.id)).to be false
+      end
+    end
+
+    context "is default adminset" do
+      before do
+        subject.members = []
+        subject.id = described_class::DEFAULT_ID
+        subject.save!
+        subject.destroy
+      end
+
+      it "does not delete the adminset" do
+        expect(subject.errors.full_messages).to eq ["Administrative set cannot be deleted as it is the default set"]
+        expect(AdminSet.exists?(described_class::DEFAULT_ID)).to be true
+      end
+    end
+  end
+end