hyrax 1.0.0.rc1 → 1.0.0.rc2

data/spec/search_builders/hyrax/active_works_search_builder_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+RSpec.describe Hyrax::ActiveWorksSearchBuilder do
+  let(:me) { create(:user) }
+  let(:config) { CatalogController.blacklight_config }
+  let(:scope) do
+    double('The scope',
+           blacklight_config: config,
+           params: {},
+           current_ability: Ability.new(me),
+           current_user: me)
+  end
+  let(:builder) { described_class.new(scope) }
+
+  describe "#to_hash" do
+    before do
+      # This prevents any generated classes from interfering with this test:
+      allow(builder).to receive(:work_classes).and_return([GenericWork])
+
+      allow(builder).to receive(:gated_discovery_filters)
+        .and_return(["depositor"])
+    end
+
+    subject { builder.to_hash['fq'] }
+
+    it "filters works that we are the depositor of" do
+      expect(subject).to match_array ["{!terms f=has_model_ssim}GenericWork",
+                                      "-suppressed_bsi:true",
+                                      "depositor"]
+    end
+  end
+
+  describe ".default_processor_chain" do
+    subject { described_class.default_processor_chain }
+    let(:expected_filters) do
+      [
+        :default_solr_parameters,
+        :add_query_to_solr,
+        :add_facet_fq_to_solr,
+        :add_facetting_to_solr,
+        :add_solr_fields_to_query,
+        :add_paging_to_solr,
+        :add_sorting_to_solr,
+        :add_group_config_to_solr,
+        :add_facet_paging_to_solr,
+        :add_access_controls_to_solr_params,
+        :filter_models,
+        :only_active_works
+      ]
+    end
+    it { is_expected.to eq expected_filters }
+  end
+end

data/spec/search_builders/hyrax/works_search_builder_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+RSpec.describe Hyrax::WorksSearchBuilder do
+  describe "::default_processor_chain" do
+    subject { described_class.default_processor_chain }
+    let(:blacklight_filters) do
+      # These filters are in Blacklight::Solr::SearchBuilderBehavior
+      [
+        :default_solr_parameters,
+        :add_query_to_solr,
+        :add_facet_fq_to_solr,
+        :add_facetting_to_solr,
+        :add_solr_fields_to_query,
+        :add_paging_to_solr,
+        :add_sorting_to_solr,
+        :add_group_config_to_solr,
+        :add_facet_paging_to_solr,
+        :add_access_controls_to_solr_params
+      ]
+    end
+
+    it { is_expected.to eq blacklight_filters + [:filter_models] }
+  end
+end

data/spec/services/hyrax/admin_set_create_service_spec.rb

@@ -1,63 +1,92 @@
 require 'spec_helper'
 
 RSpec.describe Hyrax::AdminSetCreateService do
-  let(:admin_set) { AdminSet.new(title: ['test']) }
-  let(:workflow_importer) { double(call: true) }
-  let(:service) { described_class.new(admin_set: admin_set, creating_user: user, workflow_importer: workflow_importer) }
-  let(:user) { instance_double(User, user_key: 'user-1234') }
-
-  subject { service }
-  its(:default_workflow_importer) { is_expected.to respond_to(:call) }
+  let(:user) { create(:user) }
 
   describe '.create_default_admin_set' do
+    let(:admin_set) { AdminSet.find(AdminSet::DEFAULT_ID) }
+    let(:responsibilities) { Sipity::WorkflowResponsibility.where(workflow_role: admin_set.active_workflow.workflow_roles) }
     # It is important to test the side-effects as a default admin set is a fundamental assumption for Hyrax.
     it 'creates AdminSet, Hyrax::PermissionTemplate, Sipity::Workflow(s), and activates a Workflow', slow: true do
       described_class.create_default_admin_set(admin_set_id: AdminSet::DEFAULT_ID, title: AdminSet::DEFAULT_TITLE)
-      admin_set = AdminSet.find(AdminSet::DEFAULT_ID)
       expect(admin_set.permission_template).to be_persisted
       expect(admin_set.active_workflow).to be_persisted
+      expect(responsibilities.count).to eq 1
+      expect(responsibilities.first.agent.proxy_for_id).to eq "registered"
+      expect(responsibilities.first.agent.proxy_for_type).to eq "Hyrax::Group"
     end
   end
 
   describe ".call" do
-    it 'will raise ActiveFedora::IllegalOperation if you attempt to a default admin set' do
-      expect { described_class.call(admin_set: AdminSet.new(id: AdminSet::DEFAULT_ID), creating_user: user) }.to raise_error(RuntimeError)
+    subject { described_class.call(admin_set: admin_set, creating_user: user) }
+
+    let(:admin_set) { AdminSet.new(title: ['test']) }
+
+    context "when using the default admin set" do
+      let(:admin_set) { AdminSet.new(id: AdminSet::DEFAULT_ID) }
+
+      it 'will raise ActiveFedora::IllegalOperation if you attempt to a default admin set' do
+        expect { subject }.to raise_error(RuntimeError)
+      end
     end
 
     it "is a convenience method for .new#create" do
       service = instance_double(described_class)
       expect(described_class).to receive(:new).and_return(service)
       expect(service).to receive(:create)
-      described_class.call(admin_set: admin_set, creating_user: user)
+      subject
     end
   end
 
-  describe "#create" do
-    subject { service.create }
-
-    context "when the admin_set is valid" do
-      let(:permission_template) { Hyrax::PermissionTemplate.find_by(admin_set_id: admin_set.id) }
-      let(:grant) { permission_template.access_grants.first }
-      it "creates an AdminSet, PermissionTemplate, Workflows, activates the default workflow, and sets access" do
-        expect(Sipity::Workflow).to receive(:activate!).with(permission_template: kind_of(Hyrax::PermissionTemplate), workflow_name: Hyrax.config.default_active_workflow_name)
-        expect do
-          expect(subject).to be true
-        end.to change { admin_set.persisted? }.from(false).to(true)
-        expect(admin_set.read_groups).to eq ['public']
-        expect(admin_set.edit_groups).to eq ['admin']
-        expect(grant.agent_id).to eq user.user_key
-        expect(grant.access).to eq 'manage'
-        expect(admin_set.creator).to eq [user.user_key]
-        expect(workflow_importer).to have_received(:call).with(permission_template: permission_template)
-        expect(permission_template).to be_persisted
+  describe "an instance" do
+    subject { service }
+
+    let(:workflow_importer) { double(call: true) }
+    let(:admin_set) { AdminSet.new(title: ['test']) }
+    let(:service) { described_class.new(admin_set: admin_set, creating_user: user, workflow_importer: workflow_importer) }
+
+    its(:default_workflow_importer) { is_expected.to respond_to(:call) }
+
+    describe "#create" do
+      subject { service.create }
+
+      context "when the admin_set is valid" do
+        let(:permission_template) { Hyrax::PermissionTemplate.find_by(admin_set_id: admin_set.id) }
+        let(:grant) { permission_template.access_grants.first }
+        let!(:role1) { Sipity::Role.create(name: 'testing') }
+        let!(:role2) { Sipity::Role.create(name: 'breaking') }
+        let!(:role3) { Sipity::Role.create(name: 'fixing') }
+        let(:available_workflows) { [create(:workflow), create(:workflow)] }
+
+        # rubocop:disable RSpec/AnyInstance
+        before do
+          allow_any_instance_of(Hyrax::PermissionTemplate).to receive(:available_workflows).and_return(available_workflows)
+        end
+        # rubocop:enable RSpec/AnyInstance
+
+        it "creates an AdminSet, PermissionTemplate, Workflows, activates the default workflow, and sets access" do
+          expect(Sipity::Workflow).to receive(:activate!).with(permission_template: kind_of(Hyrax::PermissionTemplate), workflow_name: Hyrax.config.default_active_workflow_name)
+          expect do
+            expect(subject).to be true
+          end.to change { admin_set.persisted? }.from(false).to(true)
+            .and change { Sipity::WorkflowResponsibility.count }.by(6)
+          expect(admin_set.read_groups).to eq ['public']
+          expect(admin_set.edit_groups).to eq ['admin']
+          expect(grant.agent_id).to eq user.user_key
+          expect(grant.access).to eq 'manage'
+          expect(admin_set.creator).to eq [user.user_key]
+          expect(workflow_importer).to have_received(:call).with(permission_template: permission_template)
+          expect(permission_template).to be_persisted
+        end
       end
-    end
 
-    context "when the admin_set is invalid" do
-      let(:admin_set) { AdminSet.new } # Missing title
-      it { is_expected.to be false }
-      it 'will not call the workflow_importer' do
-        expect(workflow_importer).not_to have_received(:call)
+      context "when the admin_set is invalid" do
+        let(:admin_set) { AdminSet.new } # Missing title
+
+        it { is_expected.to be false }
+        it 'will not call the workflow_importer' do
+          expect(workflow_importer).not_to have_received(:call)
+        end
       end
     end
   end

data/spec/services/hyrax/persist_directly_contained_output_file_service_spec.rb

@@ -1,14 +1,18 @@
 require 'spec_helper'
 
-describe Hyrax::PersistDirectlyContainedOutputFileService do
-  let(:object)            { FileSet.create! { |fs| fs.apply_depositor_metadata('justin') } }
-  let(:file_path)         { File.join(fixture_path, 'test.tif') }
-  let(:file)              { File.new(file_path) }
-  let(:destination_name)  { 'the_derivative_name' }
-  let(:stream) { StringIO.new("fake file content") }
+RSpec.describe Hyrax::PersistDirectlyContainedOutputFileService do
+  # PersistDirectlyContainedOutputFileService is used by FullTextExtract.output_file_service
+  let(:object) { FileSet.create! { |fs| fs.apply_depositor_metadata('justin') } }
+  let(:stream) { "fake file content" }
+  subject(:call) do
+    described_class.call(stream,
+                         format: 'txt',
+                         url: object.uri,
+                         container: 'extracted_text')
+  end
 
   it "persists the file to the specified destination on the given object" do
-    described_class.call(stream, format: 'txt', url: object.uri, container: 'extracted_text')
+    expect(call).to be true
     expect(object.reload.extracted_text.content).to eq("fake file content")
   end
 end

data/spec/services/hyrax/workflow/activate_object_spec.rb

@@ -1,9 +1,13 @@
 require 'spec_helper'
+require 'hyrax/specs/shared_specs'
 
 RSpec.describe Hyrax::Workflow::ActivateObject do
   let(:work) { create(:generic_work) }
   let(:user) { create(:user) }
 
+  let(:workflow_method) { described_class }
+  it_behaves_like "a Hyrax workflow method"
+
   describe ".call" do
     it "makes it active" do
       if RDF::VERSION.to_s < '2.0'

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

@@ -16,7 +16,7 @@ RSpec.describe Hyrax::Workflow::ChangesRequiredNotification do
         .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
+              anything).exactly(3).times.and_call_original
 
       expect { described_class.send_notification(entity: entity, user: approver, comment: comment, recipients: recipients) }
         .to change { depositor.mailbox.inbox.count }.by(1)
@@ -26,7 +26,7 @@ RSpec.describe Hyrax::Workflow::ChangesRequiredNotification do
     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(approver).to receive(:send_message).exactly(2).times.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)

data/spec/services/hyrax/workflow/deactivate_object_spec.rb

@@ -1,9 +1,13 @@
 require 'spec_helper'
+require 'hyrax/specs/shared_specs'
 
 RSpec.describe Hyrax::Workflow::DeactivateObject do
   let(:work) { create(:generic_work) }
   let(:user) { create(:user) }
 
+  let(:workflow_method) { described_class }
+  it_behaves_like "a Hyrax workflow method"
+
   describe ".call" do
     it "makes it inactive" do
       if RDF::VERSION.to_s < '2.0'

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

@@ -16,7 +16,7 @@ RSpec.describe Hyrax::Workflow::DepositedNotification do
         .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
+              anything).exactly(3).times.and_call_original
 
       expect { described_class.send_notification(entity: entity, user: approver, comment: comment, recipients: recipients) }
         .to change { depositor.mailbox.inbox.count }.by(1)
@@ -26,7 +26,7 @@ RSpec.describe Hyrax::Workflow::DepositedNotification do
     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(approver).to receive(:send_message).exactly(2).times.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)

data/spec/services/hyrax/workflow/grant_edit_to_depositor_spec.rb

@@ -1,9 +1,13 @@
 require 'spec_helper'
+require 'hyrax/specs/shared_specs'
 
 RSpec.describe Hyrax::Workflow::GrantEditToDepositor do
   let(:depositor) { create(:user) }
   let(:user) { User.new }
 
+  let(:workflow_method) { described_class }
+  it_behaves_like 'a Hyrax workflow method'
+
   describe ".call" do
     subject do
       described_class.call(target: work,

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

@@ -15,7 +15,7 @@ RSpec.describe Hyrax::Workflow::PendingReviewNotification do
         .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
+              anything).exactly(3).times.and_call_original
 
       expect { described_class.send_notification(entity: entity, user: depositor, comment: comment, recipients: recipients) }
         .to change { depositor.mailbox.inbox.count }.by(1)
@@ -25,7 +25,7 @@ RSpec.describe Hyrax::Workflow::PendingReviewNotification do
     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(depositor).to receive(:send_message).exactly(2).times.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)

data/spec/services/hyrax/workflow/revoke_edit_from_depositor_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+require 'hyrax/specs/shared_specs'
+
+RSpec.describe Hyrax::Workflow::RevokeEditFromDepositor do
+  let(:depositor) { create(:user) }
+  let(:user) { User.new }
+
+  let(:workflow_method) { described_class }
+  it_behaves_like 'a Hyrax workflow method'
+
+  describe ".call" do
+    subject do
+      described_class.call(target: work,
+                           comment: "A pleasant read",
+                           user: user)
+    end
+
+    context "with no additional editors" do
+      let(:work) { create(:work_without_access, depositor: depositor.user_key, edit_users: [depositor.user_key]) }
+      it "adds edit access" do
+        expect { subject }.to change { work.edit_users }.from([depositor.user_key]).to([])
+        expect(work).to be_valid
+      end
+    end
+
+    context "with an additional editor" do
+      let(:editor) { create(:user) }
+      let(:work) { create(:work_without_access, depositor: depositor.user_key, edit_users: [depositor.user_key, editor.user_key]) }
+      it "adds edit access" do
+        expect { subject }.to change { work.edit_users }.from([depositor.user_key, editor.user_key]).to([editor.user_key])
+        expect(work).to be_valid
+      end
+    end
+  end
+end

data/spec/support/controller_level_helpers.rb

@@ -4,7 +4,7 @@ module ControllerLevelHelpers
   # These are normally provided by the controller.
   module ControllerViewHelpers
     def search_state
-      @search_state ||= Hyrax::SearchState.new(self)
+      @search_state ||= CatalogController.search_state_class.new(params, blacklight_config, controller)
     end
 
     # This allows you to set the configuration

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

@@ -10,9 +10,17 @@ class TestAppGenerator < Rails::Generators::Base
   def create_generic_work
     generate 'hyrax:work GenericWork'
   end
-  
+
   def create_atlas_work
-    generate 'hyrax:work Atlas'
+    # ActiveSupport interprets "atlas" as plural which causes
+    # counter-intuitive route paths. Add an inflection to correct
+    # these paths
+    append_file 'config/initializers/inflections.rb' do
+      "ActiveSupport::Inflector.inflections(:en) do |inflect|\n" \
+      "  inflect.irregular 'atlas', 'atlases'\n" \
+      "end\n"
+    end
+    generate 'hyrax:work RareBooks/Atlas'
   end
 
   def comment_out_web_console

data/spec/views/catalog/_index_list_default.html.erb_spec.rb

@@ -1,5 +1,4 @@
-
-describe 'catalog/_index_list_default', type: :view do
+RSpec.describe 'catalog/_index_list_default', type: :view do
   let(:attributes) do
     { 'creator_tesim'        => [''],
       'depositor_tesim'      => [''],

data/spec/views/hyrax/admin/workflow_roles/index.html.erb_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe 'hyrax/admin/workflow_roles/index.html.erb', type: :view do
+RSpec.describe 'hyrax/admin/workflow_roles/index.html.erb', type: :view do
   let!(:user1) { create(:user) }
   let!(:user2) { create(:user) }
   let(:presenter) do
-    Hyrax::Admin::WorkflowRolePresenter.new
+    Hyrax::Admin::WorkflowRolesPresenter.new
   end
 
   before do

data/spec/views/hyrax/homepage/index.html.erb_spec.rb

@@ -2,9 +2,11 @@ describe "hyrax/homepage/index.html.erb", type: :view do
   let(:groups) { [] }
   let(:ability) { instance_double("Ability", can?: false) }
   let(:presenter) { Hyrax::HomepagePresenter.new(ability) }
+  let(:type_presenter) { instance_double(Hyrax::SelectTypeListPresenter, many?: true) }
 
   describe "share your work button" do
     before do
+      allow(view).to receive(:create_work_presenter).and_return(type_presenter)
       allow(view).to receive(:signed_in?).and_return(signed_in)
       assign(:presenter, presenter)
       allow(controller).to receive(:current_ability).and_return(ability)
@@ -32,14 +34,32 @@ describe "hyrax/homepage/index.html.erb", type: :view do
 
     context "when signed in" do
       let(:signed_in) { true }
+
       context "when the button always displays" do
         let(:display_share_button) { true }
-        it "displays" do
-          expect(rendered).to have_content t("hyrax.share_button")
+
+        context "and there are multiple work types" do
+          it "displays a button that pops up the modal" do
+            expect(rendered).to have_selector('a[data-behavior="select-work"][href="#"]',
+                                              text: t("hyrax.share_button"))
+          end
+        end
+
+        context "and there is a single work type" do
+          let(:type_presenter) do
+            instance_double(Hyrax::SelectTypeListPresenter, many?: false, first_model: GenericWork)
+          end
+
+          it "displays a link to create that work type" do
+            expect(rendered).to have_selector('a:not([data-behavior])[href="/concern/generic_works/new"]',
+                                              text: t("hyrax.share_button"))
+          end
         end
       end
+
       context "when the button displays for users with rights" do
         let(:display_share_button) { false }
+
         it "does not display" do
           expect(rendered).not_to have_content t("hyrax.share_button")
         end