sufia 7.2.0 → 7.3.0.rc1

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

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+RSpec.describe Sufia::Workflow::ChangesRequiredNotification do
+  let(:approver) { create(:user) }
+  let(:depositor) { create(:user) }
+  let(:to_user) { create(:user) }
+  let(:cc_user) { create(:user) }
+  let(:work) { create(:generic_work, user: depositor) }
+  let(:entity) { create(:sipity_entity, proxy_for_global_id: work.to_global_id.to_s) }
+  let(:comment) { double("comment", comment: 'A pleasant read') }
+  let(:recipients) { { 'to' => [to_user], 'cc' => [cc_user] } }
+
+  describe ".send_notification" do
+    it 'sends a message to all users' do
+      expect(approver).to receive(:send_message).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)
+        .and change { to_user.mailbox.inbox.count }.by(1)
+        .and change { cc_user.mailbox.inbox.count }.by(1)
+    end
+    context 'without carbon-copied users' do
+      let(:recipients) { { 'to' => [to_user] } }
+      it 'sends a message to the to user(s)' do
+        expect(approver).to receive(:send_message).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)
+          .and change { to_user.mailbox.inbox.count }.by(1)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+RSpec.describe Sufia::Workflow::CompleteNotification do
+  let(:approver) { create(:user) }
+  let(:depositor) { create(:user) }
+  let(:to_user) { create(:user) }
+  let(:cc_user) { create(:user) }
+  let(:work) { create(:generic_work, user: depositor) }
+  let(:entity) { create(:sipity_entity, proxy_for_global_id: work.to_global_id.to_s) }
+  let(:comment) { double("comment", comment: 'A pleasant read') }
+  let(:recipients) { { 'to' => [to_user], 'cc' => [cc_user] } }
+
+  describe ".send_notification" do
+    it 'sends a message to all users' do
+      expect(approver).to receive(:send_message).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)
+        .and change { to_user.mailbox.inbox.count }.by(1)
+        .and change { cc_user.mailbox.inbox.count }.by(1)
+    end
+    context 'without carbon-copied users' do
+      let(:recipients) { { 'to' => [to_user] } }
+      it 'sends a message to the to user(s)' do
+        expect(approver).to receive(:send_message).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)
+          .and change { to_user.mailbox.inbox.count }.by(1)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+RSpec.describe Sufia::Workflow::PendingReviewNotification do
+  let(:depositor) { create(:user) }
+  let(:to_user) { create(:user) }
+  let(:cc_user) { create(:user) }
+  let(:work) { create(:generic_work, user: depositor) }
+  let(:entity) { create(:sipity_entity, proxy_for_global_id: work.to_global_id.to_s) }
+  let(:comment) { double("comment", comment: 'A pleasant read') }
+  let(:recipients) { { 'to' => [to_user], 'cc' => [cc_user] } }
+
+  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 { described_class.send_notification(entity: entity, user: depositor, comment: comment, recipients: recipients) }
+        .to change { depositor.mailbox.inbox.count }.by(1)
+        .and change { to_user.mailbox.inbox.count }.by(1)
+        .and change { cc_user.mailbox.inbox.count }.by(1)
+    end
+    context 'without carbon-copied users' do
+      let(:recipients) { { 'to' => [to_user] } }
+      it 'sends a message to the to user(s)' do
+        expect(depositor).to receive(:send_message).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)
+          .and change { to_user.mailbox.inbox.count }.by(1)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+describe Sufia::Workflow::WorkflowByAdminSetStrategy, :no_clean do
+  context "when using default workflow strategy" do
+    let(:workflow_strategy) { described_class.new(nil, {}) }
+
+    describe '#workflow_name' do
+      subject { workflow_strategy.workflow_name }
+      it { is_expected.to eq 'default' }
+    end
+  end
+
+  context "when using a non-default workflow strategy" do
+    let!(:admin_set) { AdminSet.create(title: ["test"]) }
+    let!(:permission_template) { Sufia::PermissionTemplate.create(workflow_name: workflow_name, admin_set_id: admin_set.id) }
+    let(:workflow_name) { 'work' }
+    let(:workflow_strategy) { described_class.new(nil, admin_set_id: admin_set.id) }
+
+    describe '#workflow_name' do
+      subject { workflow_strategy.workflow_name }
+      it { is_expected.to eq workflow_name }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,3 @@
-require 'coveralls'
-Coveralls.wear!
-
 ENV["RAILS_ENV"] ||= 'test'
 require "bundler/setup"
 
@@ -11,12 +8,16 @@ end
 
 if coverage_needed?
   require 'simplecov'
+  require 'coveralls'
   SimpleCov.root(File.expand_path('../..', __FILE__))
   SimpleCov.formatter = Coveralls::SimpleCov::Formatter
   SimpleCov.start('rails') do
     add_filter '/.internal_test_app'
     add_filter '/lib/generators'
     add_filter '/spec'
+    add_filter '/tasks'
+    add_filter '/lib/sufia/version.rb'
+    add_filter '/lib/sufia/engine.rb'
   end
   SimpleCov.command_name 'spec'
 end
@@ -47,6 +48,21 @@ require 'byebug' unless ENV['TRAVIS']
 Capybara.default_driver = :rack_test      # This is a faster driver
 Capybara.javascript_driver = :poltergeist # This is slower
 Capybara.default_max_wait_time = ENV['TRAVIS'] ? 30 : 15
+# Adding the below to deal with random Capybara-related timeouts in CI.
+# Found in this thread: https://github.com/teampoltergeist/poltergeist/issues/375
+poltergeist_options = {
+  js_errors: true,
+  timeout: 30,
+  logger: nil,
+  phantomjs_logger: StringIO.new,
+  phantomjs_options: [
+    '--load-images=no',
+    '--ignore-ssl-errors=yes'
+  ]
+}
+Capybara.register_driver(:poltergeist) do |app|
+  Capybara::Poltergeist::Driver.new(app, poltergeist_options)
+end
 
 ActiveJob::Base.queue_adapter = :inline
 
@@ -170,7 +186,6 @@ RSpec.configure do |config|
   config.include Shoulda::Matchers::Independent
 
   if Devise::VERSION >= '4.2'
-    # This is for an unreleased version of Devise (will either be 4.2 or 5.0)
     config.include Devise::Test::ControllerHelpers, type: :controller
   else
     config.include Devise::TestHelpers, type: :controller
@@ -182,7 +197,11 @@ RSpec.configure do |config|
 
   config.include EngineRoutes, type: :controller
   config.include Warden::Test::Helpers, type: :feature
-  config.after(:each, type: :feature) { Warden.test_reset! }
+  config.after(:each, type: :feature) do
+    Warden.test_reset!
+    Capybara.reset_sessions!
+    page.driver.reset!
+  end
 
   config.include Capybara::RSpecMatchers, type: :input
   config.include FactoryGirl::Syntax::Methods

data/spec/support/proxies.rb

@@ -1,7 +1,7 @@
 module ProxiesHelper
   def create_proxy_using_partial(*users)
     users.each do |user|
-      sleep(1)
+      sleep(0.5)
       first('a.select2-choice').click
       find(".select2-input").set(user.user_key)
       expect(page).to have_css("div.select2-result-label")

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -10,6 +10,10 @@ class TestAppGenerator < Rails::Generators::Base
   def create_generic_work
     generate 'sufia:work GenericWork'
   end
+  
+  def create_atlas_work
+    generate 'sufia:work Atlas'
+  end
 
   def comment_out_web_console
     gsub_file "Gemfile",

data/spec/views/_toolbar.html.erb_spec.rb

@@ -1,5 +1,7 @@
 describe '/_toolbar.html.erb', type: :view do
+  let(:presenter) { instance_double(Sufia::SelectTypeListPresenter, many?: false, first_model: GenericWork) }
   before do
+    allow(view).to receive(:create_work_presenter).and_return(presenter)
     allow(view).to receive(:user_signed_in?).and_return(true)
     allow(controller).to receive(:current_user).and_return(stub_model(User, user_key: 'userX'))
     allow(view).to receive(:can?).and_call_original
@@ -38,25 +40,40 @@ describe '/_toolbar.html.erb', type: :view do
     expect(rendered).to have_link 'Shares', href: sufia.dashboard_shares_path
   end
 
-  describe "New Work button" do
-    context "when the user can create file sets" do
+  describe "New Work link" do
+    context "when the user can create multiple work types" do
+      let(:presenter) { instance_double(Sufia::SelectTypeListPresenter, many?: true) }
+      it "has a link to upload" do
+        render
+        expect(rendered).to have_selector 'a[data-behavior="select-work"][data-target="#worktypes-to-create"][data-create-type="single"]'
+        expect(rendered).to have_link('New Work', href: '#')
+
+        expect(rendered).to have_selector 'a[data-behavior="select-work"][data-target="#worktypes-to-create"][data-create-type="batch"]'
+        expect(rendered).to have_link('Batch Create', href: '#')
+      end
+    end
+
+    context "when the user can create a single work type" do
+      let(:presenter) { instance_double(Sufia::SelectTypeListPresenter, many?: false, first_model: GenericWork) }
       it "has a link to upload" do
-        allow(view).to receive(:can?).with(:create, GenericWork).and_return(true)
         render
         expect(rendered).to have_link('New Work', href: new_curation_concerns_generic_work_path)
+        expect(rendered).to have_link('Batch Create', href: sufia.new_batch_upload_path(payload_concern: 'GenericWork'))
       end
     end
 
-    context "when the user can't create file sets" do
+    context "when the user can't create any work types" do
+      before do
+        allow(view).to receive(:can_ever_create_works?).and_return(false)
+      end
       it "does not have a link to upload" do
-        allow(view).to receive(:can?).with(:create, GenericWork).and_return(false)
         render
         expect(rendered).not_to have_link('New Work')
       end
     end
   end
 
-  describe "New Collection button" do
+  describe "New Collection link" do
     context "when the user can create collections" do
       it "has a link to upload" do
         allow(view).to receive(:can?).with(:create, Collection).and_return(true)

data/spec/views/batch_edits/edit.html.erb_spec.rb

@@ -17,8 +17,14 @@ describe 'batch_edits/edit.html.erb', type: :view do
     render
   end
 
-  it "draws help for description" do
+  it "draws the page" do
     expect(rendered).to have_selector 'form[data-model="generic_work"]'
+    # Help for the description
     expect(rendered).to have_selector ".generic_work_description p.help-block"
+
+    # param key for the permissions javascript
+    expect(rendered).to have_selector 'form#form_permissions[data-param-key="generic_work"]'
+    # batch ids for the permissions update form
+    expect(rendered).to have_selector "input[name=\"batch_document_ids[]\"]", visible: false
   end
 end

data/spec/views/collections/_form_for_select_collection.html.erb_spec.rb

@@ -9,9 +9,7 @@ describe 'collections/_form_for_select_collection.html.erb', type: :view do
   end
   let(:solr_collections) do
     collections.map do |c|
-      SolrDocument.new(c.to_solr).tap do |sd|
-        sd['system_create_dtsi'] = c.create_date.to_s
-      end
+      SolrDocument.new(c.to_solr.merge('system_create_dtsi' => c.create_date.to_s))
     end
   end
 

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

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+RSpec.describe 'curation_concerns/base/_find_work_widget.html.erb', type: :view do
+  let(:work) { stub_model(GenericWork) }
+  let(:form) do
+    view.simple_form_for(work, url: '/update') do |work_form|
+      return work_form
+    end
+  end
+  before do
+    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',
+           user_email: 'foo@bar.com',
+           id: '999'
+  end
+  it "has a widget" do
+    expect(rendered).to have_selector('input[data-autocomplete-url="/authorities/search/find_works"]')
+  end
+end

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

@@ -68,6 +68,10 @@ describe 'curation_concerns/base/_form.html.erb', type: :view do
   end
 
   context "for a persisted object" do
+    before do
+      # Add an error to the work
+      work.errors.add :base, 'broken'
+    end
     it "draws the page" do
       expect(page).to have_selector("form[action='/concern/generic_works/456']")
       expect(page).to have_selector("select#generic_work_resource_type", count: 1)
@@ -75,6 +79,9 @@ describe 'curation_concerns/base/_form.html.erb', type: :view do
       expect(page).to have_selector("select#generic_work_representative_id", count: 1)
       expect(page).not_to have_link('Batch upload', href: '/batch_uploads')
       expect(page).to have_link("Cancel", href: "/dashboard")
+
+      # It diplays form errors
+      expect(page).to have_content("broken")
     end
   end
 end

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

@@ -29,6 +29,7 @@ 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=''/>"
     assign(:form, form)
   end
 

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

@@ -0,0 +1,114 @@
+require 'spec_helper'
+
+describe "curation_concerns/base/_form_parent_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: ["Parent Work"])
+  end
+
+  let(:ability) { double }
+
+  let(:form) do
+    Sufia::Forms::WorkForm.new(work, ability)
+  end
+
+  let(:f) { double }
+
+  let(:page) do
+    render
+    Capybara::Node::Simple.new(rendered)
+  end
+
+  before do
+    view.lookup_context.view_paths.push 'app/views/curation_concerns'
+    allow(view).to receive(:params).and_return(id: work.id)
+    allow(view).to receive(:curation_concern).and_return(work)
+    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=''/>"
+    assign(:form, form)
+  end
+
+  context "When editing a work" do
+    context "and no parent works are present" do
+      before do
+        allow(work).to receive(:in_works).and_return([])
+      end
+      it "has 1 empty parent work input" do
+        expect(page).to have_selector("input[value='']", count: 1)
+      end
+
+      it "will not display the remove button in the actions" do
+        expect(page).to have_selector(".btn-remove-row", visible: false)
+      end
+
+      it "will display the add button in the actions" do
+        expect(page).to have_selector(".btn-add-row", visible: true, count: 1)
+      end
+    end
+    context "When 1 parent work is present" do
+      let(:work_2) do
+        stub_model(GenericWork, id: '567', title: ["Test Parent Work"])
+      end
+
+      before do
+        allow(work).to receive(:in_works).and_return([work_2])
+      end
+      it "has 1 empty parent 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 parent id" do
+        expect(page).to have_selector("input[value='#{work_2.id}']", count: 1)
+      end
+
+      it "generates a link for the parents first title" do
+        expect(page).to have_link("Test Parent Work")
+      end
+
+      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 parent works are present" do
+      let(:work_2) do
+        stub_model(GenericWork, id: '567', title: ["Test Parent Work"])
+      end
+      let(:work_3) do
+        stub_model(GenericWork, id: '789', title: ["Test Parent Work 2"])
+      end
+      before do
+        allow(work).to receive(:in_works).and_return([work_2, work_3])
+      end
+      it "has 1 empty parent 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 parent 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 parents first title" do
+        expect(page).to have_link("Test Parent Work")
+        expect(page).to have_link("Test Parent 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)
+        end
+      end
+    end
+  end
+end