hyrax 2.1.0.rc1 → 2.1.0.rc2

data/spec/features/dashboard/all_works.rb

@@ -1,4 +1,4 @@
-RSpec.describe "As an admin user I should be able to see all works" do
+RSpec.describe "As an admin user I should be able to see all works", :clean_repo do
   let!(:work1) { create(:work, title: ['Testing #1'], admin_set: adminset, member_of_collections: [collection]) }
   let!(:work2) { create(:work, title: ['Testing #2'], admin_set: adminset, member_of_collections: [collection]) }
   let(:collection) { build(:collection_lw, with_solr_document: true) }
@@ -18,5 +18,6 @@ RSpec.describe "As an admin user I should be able to see all works" do
     expect(page).to have_link(collection.title.first, class: 'facet_select')
     expect(page).to have_button('Admin Set')
     expect(page).to have_link(adminset.title.first, class: 'facet_select')
+    expect(page).to have_content("2 works in the repository")
   end
 end

data/spec/features/dashboard/collection_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
         visit '/dashboard/my/collections'
       end
 
-      it "has page title, does not have tabs, and lists only user's collections" do
+      it "has page title, does not have tabs, lists only user's collections, and displays number of collections in the respository" do
         expect(page).to have_content 'Collections'
         expect(page).not_to have_link 'All Collections'
         within('section.tabs-row') do
@@ -47,6 +47,7 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
         expect(page).to have_link(admin_set_b.title.first)
         expect(page).not_to have_link(collection3.title.first)
         expect(page).not_to have_link(admin_set_a.title.first)
+        expect(page).to have_content("3 collections you own in the repository")
       end
 
       it "has collection type and visibility filters" do
@@ -256,6 +257,11 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
         expect(page).to have_content title
         expect(page).to have_content description
       end
+
+      it "has properly formed collection type buttons" do
+        expect(page).not_to have_selector("input[data-path$='collections/new&collection_type_id=1']")
+        expect(page).to have_selector("input[data-path$='collections/new?locale=en&collection_type_id=1']")
+      end
     end
 
     context 'when user can create collections of one type' do
@@ -357,7 +363,9 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
 
       context 'and collection is empty' do
         it 'and user confirms delete, deletes the collection', :js do
-          expect(page).to have_content(empty_collection.title.first)
+          within("table#collections-list-table") do
+            expect(page).to have_content(empty_collection.title.first)
+          end
           check_tr_data_attributes(empty_collection.id, 'collection')
           # check that modal data attributes haven't been added yet
           expect(page).not_to have_selector("div[data-id='#{empty_collection.id}']")
@@ -370,11 +378,15 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
           within("div#collection-empty-to-delete-modal") do
             click_button('Delete')
           end
-          expect(page).not_to have_content(empty_collection.title.first)
+          within("table#collections-list-table") do
+            expect(page).not_to have_content(empty_collection.title.first)
+          end
         end
 
         it 'and user cancels, does NOT delete the collection', :js do
-          expect(page).to have_content(empty_collection.title.first)
+          within("table#collections-list-table") do
+            expect(page).to have_content(collection.title.first)
+          end
           check_tr_data_attributes(empty_collection.id, 'collection')
           # check that modal data attributes haven't been added yet
           expect(page).not_to have_selector("div[data-id='#{empty_collection.id}']")
@@ -388,13 +400,17 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
           within("div#collection-empty-to-delete-modal") do
             click_button('Cancel')
           end
-          expect(page).to have_content(empty_collection.title.first)
+          within("table#collections-list-table") do
+            expect(page).to have_content(collection.title.first)
+          end
         end
       end
 
       context 'and collection is not empty' do
         it 'and user confirms delete, deletes the collection', :js do
-          expect(page).to have_content(collection.title.first)
+          within("table#collections-list-table") do
+            expect(page).to have_content(collection.title.first)
+          end
           check_tr_data_attributes(collection.id, 'collection')
           within("#document_#{collection.id}") do
             first('button.dropdown-toggle').click
@@ -405,11 +421,15 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
           within("div#collection-to-delete-modal") do
             find('button.modal-delete-button').click
           end
-          expect(page).not_to have_content(collection.title.first)
+          within("table#collections-list-table") do
+            expect(page).not_to have_content(collection.title.first)
+          end
         end
 
         it 'and user cancels, does NOT delete the collection', :js do
-          expect(page).to have_content(collection.title.first)
+          within("table#collections-list-table") do
+            expect(page).to have_content(collection.title.first)
+          end
           within("#document_#{collection.id}") do
             first('button.dropdown-toggle').click
             first('.itemtrash').click
@@ -419,7 +439,9 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
           within("div#collection-to-delete-modal") do
             click_button('Cancel')
           end
-          expect(page).to have_content(collection.title.first)
+          within("table#collections-list-table") do
+            expect(page).to have_content(collection.title.first)
+          end
         end
       end
     end
@@ -611,15 +633,15 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
         click_link 'Add existing works'
         first('input#check_all').click
         click_button "Add to collection"
-        expect(page).to have_css("input#id_#{collection1.id}[checked='checked']")
-        expect(page).not_to have_css("input#id_#{collection2.id}[checked='checked']")
+        expect(page).to have_selector "#member_of_collection_ids[value=\"#{collection1.id}\"]", visible: false
+        expect(page).to have_selector "#member_of_collection_label[value=\"#{collection1.title.first}\"]"
 
         visit "/dashboard/collections/#{collection2.id}"
         click_link 'Add existing works'
         first('input#check_all').click
         click_button "Add to collection"
-        expect(page).not_to have_css("input#id_#{collection1.id}[checked='checked']")
-        expect(page).to have_css("input#id_#{collection2.id}[checked='checked']")
+        expect(page).to have_selector "#member_of_collection_ids[value=\"#{collection2.id}\"]", visible: false
+        expect(page).to have_selector "#member_of_collection_label[value=\"#{collection2.title.first}\"]"
 
         click_button "Save changes"
         expect(page).to have_content(work1.title.first)

data/spec/features/work_show_spec.rb

@@ -1,4 +1,6 @@
 RSpec.describe "display a work as its owner" do
+  include Selectors::Dashboard
+
   let(:work_path) { "/concern/generic_works/#{work.id}" }
 
   before do
@@ -44,13 +46,11 @@ RSpec.describe "display a work as its owner" do
       expect(find('div.viewer:first')['data-uri']).to eq "/concern/generic_works/#{work.id}/manifest"
     end
 
-    it "add work to a collection", js: true do
+    it "add work to a collection", clean_repo: true, js: true do
+      optional 'ability to get capybara to find css select2-result (see Issue #3038)' if ENV['TRAVIS']
       click_button "Add to collection" # opens the modal
-      # since there is only one collection, it's not necessary to choose a radio button
-      within('div#collection-list-container') do
-        choose collection.title.first # selects the collection
-        click_button 'Save changes'
-      end
+      select_member_of_collection(collection)
+      click_button 'Save changes'
 
       # forwards to collection show page
       expect(page).to have_content collection.title.first

data/spec/helpers/hyrax/collections_helper_spec.rb

@@ -98,4 +98,20 @@ RSpec.describe Hyrax::CollectionsHelper do
       end
     end
   end
+
+  describe '#append_collection_type_url' do
+    let(:url) { "http://example.com" }
+    context "when a provided url has no querystring" do
+      it 'returns the url with added collection_type_id' do
+        expect(append_collection_type_url(url, '1')).to eq "#{url}?collection_type_id=1"
+      end
+    end
+
+    context "when a provided url has an existing querystring" do
+      let(:url) { "http://example.com?bob=ross" }
+      it 'return the url with added collection_type_id' do
+        expect(append_collection_type_url(url, '1')).to eq "#{url}&collection_type_id=1"
+      end
+    end
+  end
 end

data/spec/models/sipity/workflow_spec.rb

@@ -22,6 +22,15 @@ module Sipity
       let!(:other_permission_template) { create(:permission_template) }
       let!(:active_workflow) { create(:workflow, active: true, permission_template_id: permission_template.id) }
 
+      context 'selecting already active workflow' do
+        it 'makes no change' do
+          inactive_workflow = create(:workflow, permission_template_id: permission_template.id)
+          described_class.activate!(permission_template: permission_template, workflow_id: active_workflow.id)
+          expect(active_workflow.reload).to be_active
+          expect(inactive_workflow.reload).not_to be_active
+        end
+      end
+
       it 'raises an exception if you do not pass a workflow_id nor workflow_name' do
         expect do
           described_class.activate!(permission_template: other_permission_template)

data/spec/presenters/hyrax/work_show_presenter_spec.rb

@@ -47,7 +47,7 @@ RSpec.describe Hyrax::WorkShowPresenter do
     let(:id_present) { false }
     let(:representative_presenter) { double('representative', present?: false) }
     let(:image_boolean) { false }
-    let(:iiif_enabled) { false }
+    let(:iiif_enabled) { true }
     let(:file_set_presenter) { Hyrax::FileSetPresenter.new(solr_document, ability) }
     let(:file_set_presenters) { [file_set_presenter] }
     let(:read_permission) { true }
@@ -77,7 +77,7 @@ RSpec.describe Hyrax::WorkShowPresenter do
     context 'with non-image representative_presenter' do
       let(:id_present) { true }
       let(:representative_presenter) { double('representative', present?: true) }
-      let(:image_boolean) { true }
+      let(:image_boolean) { false }
 
       it { is_expected.to be false }
     end

data/spec/services/hyrax/adapters/nesting_index_adapter_spec.rb

@@ -38,12 +38,16 @@ RSpec.describe Hyrax::Adapters::NestingIndexAdapter do
   describe '.find_index_document_by' do
     subject { described_class.find_index_document_by(id: id) }
 
-    context 'with a not found id ' do
+    context 'with id not in solr, it builds from Fedora' do
       let(:id) { 'so-very-missing-no-document-here' }
+      let(:document) { double("Document", id: id, fetch: nil) }
+      let(:object) { double("Object_to_reindex", id: id, to_solr: document) }
 
-      it 'raises RuntimeError' do
-        expect { subject }.to raise_error(RuntimeError)
+      before do
+        allow(ActiveFedora::Base).to receive(:find).with(id).and_return(object)
       end
+
+      it { is_expected.to be_a(Samvera::NestingIndexer::Documents::IndexDocument) }
     end
 
     context 'with a found id' do

data/spec/services/hyrax/collection_types/create_service_spec.rb

@@ -43,7 +43,7 @@ RSpec.describe Hyrax::CollectionTypes::CreateService do
       expect(ct.machine_id).to eq(Hyrax::CollectionType::ADMIN_SET_MACHINE_ID)
       expect(ct.title).to eq(Hyrax::CollectionType::ADMIN_SET_DEFAULT_TITLE)
       expect(ct.description).to eq('An aggregation of works that is intended to help with administrative control. Admin Sets provide a way of defining behaviors and policies around a set of works.')
-      expect(ct.badge_color).to eq('#663333')
+      expect(ct.badge_color).to eq('#405060')
       expect(ct).not_to be_nestable
       expect(ct).not_to be_brandable
       expect(ct).not_to be_discoverable
@@ -63,7 +63,7 @@ RSpec.describe Hyrax::CollectionTypes::CreateService do
       expect(ct.machine_id).to eq(Hyrax::CollectionType::USER_COLLECTION_MACHINE_ID)
       expect(ct.title).to eq(Hyrax::CollectionType::USER_COLLECTION_DEFAULT_TITLE)
       expect(ct.description).to eq('A User Collection can be created by any user to organize their works.')
-      expect(ct.badge_color).to eq('#663333')
+      expect(ct.badge_color).to eq('#705070')
       expect(ct).to be_nestable
       expect(ct).to be_brandable
       expect(ct).to be_discoverable

data/spec/services/hyrax/collections_service_spec.rb

@@ -38,7 +38,7 @@ RSpec.describe Hyrax::CollectionsService do
     context "with read access" do
       let(:access) { :read }
 
-      it "returns three collections" do
+      it "returns four collections" do
         expect(subject.map(&:id)).to match_array [collection1.id, collection2.id, collection3.id, collection4.id]
       end
     end

data/spec/services/hyrax/file_set_fixity_check_service_spec.rb

@@ -49,6 +49,19 @@ RSpec.describe Hyrax::FileSetFixityCheckService do
       specify 'returns a single result' do
         expect(subject.length).to eq(1)
       end
+      describe 'non-versioned file with latest version only' do
+        let(:service_by_object) { described_class.new(f, async_jobs: false, latest_version_only: true) }
+
+        before do
+          allow(f.original_file).to receive(:has_versions?).and_return(false)
+        end
+
+        subject { service_by_object.send(:fixity_check_file, f.original_file) }
+
+        specify 'returns a single result' do
+          expect(subject.length).to eq(1)
+        end
+      end
     end
 
     describe '#fixity_check_file_version' do

data/spec/spec_helper.rb

@@ -226,6 +226,7 @@ RSpec.configure do |config|
   config.include Capybara::RSpecMatchers, type: :input
   config.include InputSupport, type: :input
   config.include FactoryBot::Syntax::Methods
+  config.include OptionalExample
 
   config.infer_spec_type_from_file_location!
 

data/spec/support/optional_example.rb

@@ -0,0 +1,16 @@
+module OptionalExample
+  RSpec.configure do |config|
+    config.after do |example|
+      if example.metadata[:optional] && (RSpec::Core::Pending::PendingExampleFixedError === example.display_exception) # rubocop:disable Style/CaseEquality
+        ex = example.display_exception
+        example.display_exception = nil
+        example.execution_result.pending_exception = ex
+      end
+    end
+  end
+
+  def optional(message)
+    RSpec.current_example.metadata[:optional] = true
+    pending(message)
+  end
+end

data/spec/support/selectors.rb

@@ -21,7 +21,8 @@ module Selectors
       end
     end
 
-    # For use with javascript collection selector that allows for searching for an existing collection.
+    # For use with javascript collection selector that allows for searching for an existing collection from works relationship tab.
+    # Adds the collection and validates that the collection is listed in the Collection Relationship table once added.
     # @param [Collection] collection to select
     def select_collection(collection)
       first('a.select2-choice').click
@@ -35,6 +36,19 @@ module Selectors
         end
       end
     end
+
+    # For use with javascript collection selector that allows for searching for an existing collection from add to collection modal.
+    # Does not save the selection.  The calling test is expected to click Save and validate the collection membership was added to the work.
+    # @param [Collection] collection to select
+    def select_member_of_collection(collection)
+      find('#s2id_member_of_collection_ids').click
+      find('.select2-input').set(collection.title.first)
+      sleep 10
+      expect(page).to have_css('.select2-result')
+      within ".select2-result" do
+        find("span", text: collection.title.first).click
+      end
+    end
   end
 
   module NewTransfers

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

@@ -17,7 +17,7 @@ RSpec.describe 'hyrax/dashboard/collections/_form_for_select_collection.html.erb
     end
   end
 
-  let(:doc) { Nokogiri::HTML(rendered) }
+  let(:page) { Capybara::Node::Simple.new(rendered) }
 
   before do
     # Stub route because view specs don't handle engine routes
@@ -27,29 +27,21 @@ RSpec.describe 'hyrax/dashboard/collections/_form_for_select_collection.html.erb
     allow(view).to receive(:user_collections).and_return(solr_collections)
   end
 
-  it "sorts the collections" do
+  it "uses autocomplete" do
     render
-    collection_ids = doc.xpath("//input[@class='collection-selector']/@id").map(&:to_s)
-    expect(collection_ids).to eql(["id_1237", "id_1234", "id_1235", "id_1236"])
-    expect(rendered).to have_selector("label", text: 'Title 1')
-    expect(rendered).not_to have_selector("label", text: "[\"Title 1\"]")
+    expect(page).to have_selector('input[data-autocomplete-url="/authorities/search/collections?access=deposit"]')
   end
 
-  it "selects the right collection when instructed to do so" do
-    assign(:add_works_to_collection, collections[2][:id])
-    render
-    expect(rendered).not_to have_selector "#id_#{collections[0][:id]}[checked='checked']"
-    expect(rendered).not_to have_selector "#id_#{collections[1][:id]}[checked='checked']"
-    expect(rendered).not_to have_selector "#id_#{collections[3][:id]}[checked='checked']"
-    expect(rendered).to have_selector "#id_#{collections[2][:id]}[checked='checked']"
-  end
+  context 'when a collection is specified' do
+    let(:collection_id) { collections[2][:id] }
+    let(:collection_label) { collections[2]["title_tesim"] }
 
-  it "selects the first collection when nothing else specified" do
-    # first when sorted by create date, so not index 0
-    render
-    expect(rendered).not_to have_selector "#id_#{collections[0][:id]}[checked='checked']"
-    expect(rendered).not_to have_selector "#id_#{collections[1][:id]}[checked='checked']"
-    expect(rendered).not_to have_selector "#id_#{collections[2][:id]}[checked='checked']"
-    expect(rendered).to have_selector "#id_#{collections[3][:id]}[checked='checked']"
+    it "selects the right collection when instructed to do so" do
+      assign(:add_works_to_collection, collection_id)
+      assign(:add_works_to_collection_label, collection_label)
+      render
+      expect(page).to have_selector "#member_of_collection_ids[value=\"#{collection_id}\"]", visible: false
+      expect(page).to have_selector "#member_of_collection_label", text: collection_label
+    end
   end
 end

data/spec/views/hyrax/dashboard/collections/_show_add_items_actions.html.erb_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe 'hyrax/dashboard/collections/_show_add_items_actions.html.erb', type: :view do
-  let(:presenter) { double('Hyrax::CollectionPresenter', solr_document: solr_document, id: '123') }
+  let(:presenter) { double('Hyrax::CollectionPresenter', solr_document: solr_document, id: '123', title: 'Collection 1') }
   let(:solr_document) { double('Solr Document') }
   let(:can_deposit) { true }
 
@@ -14,7 +14,8 @@ RSpec.describe 'hyrax/dashboard/collections/_show_add_items_actions.html.erb', t
 
     it 'renders add_existing_works_to_collection link' do
       render
-      expect(rendered).to have_css(".btn[href='#{hyrax.my_works_path(add_works_to_collection: presenter.id)}']")
+      expect(rendered).to have_css(".btn[href='#{hyrax.my_works_path(add_works_to_collection: presenter.id,
+                                                                     add_works_to_collection_label: presenter.title)}']")
     end
     it 'renders add_new_work_to_collection link' do
       render
@@ -26,7 +27,8 @@ RSpec.describe 'hyrax/dashboard/collections/_show_add_items_actions.html.erb', t
 
     it 'does not render add_works_to_collection link' do
       render
-      expect(rendered).not_to have_css(".actions-controls-collections .btn[href='#{hyrax.my_works_path(add_works_to_collection: presenter.id)}']")
+      expect(rendered).not_to have_css(".actions-controls-collections .btn[href='#{hyrax.my_works_path(add_works_to_collection: presenter.id,
+                                                                                                       add_works_to_collection_label: presenter.title)}']")
     end
   end
 

data/spec/views/hyrax/dashboard/collections/_show_parent_collection_row.html.erb_spec.rb

@@ -9,33 +9,53 @@ RSpec.describe 'hyrax/dashboard/collections/_show_parent_collection_row.html.erb
   let(:document) { SolrDocument.new(parent_collection_doc) }
   let(:subject) { render('show_parent_collection_row.html.erb', id: child_collection.id, document: document) }
 
-  context 'when user can edit the parent collection' do
+  context 'when user cannot edit the child collection' do
     before do
+      allow(view).to receive(:can?).with(:edit, child_collection.id).and_return(false)
       allow(view).to receive(:can?).with(:edit, document.id).and_return(true)
     end
 
-    it 'shows link to collection title and active remove button' do
+    it 'does shows link to collection title but not the remove button' do
       subject
       expect(rendered).to have_link(document.title.first)
-      expect(rendered).to have_button("Remove")
-    end
-
-    it "renders the proper data attributes on list element" do
-      expect(subject).to have_selector(:css, 'li[data-post-url="/dashboard/collections/123/remove_parent/999"]')
-      expect(subject).to have_selector(:css, 'li[data-id="123"]')
-      expect(subject).to have_selector(:css, 'li[data-parent-id="999"]')
+      expect(rendered).not_to have_button("Remove")
+      expect(rendered).not_to have_link("Remove")
     end
   end
 
-  context 'disable button if no edit permission' do
+  context 'when user can edit the child collection' do
     before do
-      allow(view).to receive(:can?).with(:edit, document.id).and_return(false)
+      allow(view).to receive(:can?).with(:edit, child_collection.id).and_return(true)
     end
 
-    it 'shows link to collection title and disabled remove button' do
-      subject
-      expect(rendered).to have_link(document.title.first)
-      expect(rendered).to have_button("Remove", disabled: true)
+    context 'and user can edit the parent collection' do
+      before do
+        allow(view).to receive(:can?).with(:edit, document.id).and_return(true)
+      end
+
+      it 'shows link to collection title and active remove button' do
+        subject
+        expect(rendered).to have_link(document.title.first)
+        expect(rendered).to have_button("Remove")
+      end
+
+      it "renders the proper data attributes on list element" do
+        expect(subject).to have_selector(:css, 'li[data-post-url="/dashboard/collections/123/remove_parent/999"]')
+        expect(subject).to have_selector(:css, 'li[data-id="123"]')
+        expect(subject).to have_selector(:css, 'li[data-parent-id="999"]')
+      end
+    end
+
+    context 'and user cannot edit the parent collection' do
+      before do
+        allow(view).to receive(:can?).with(:edit, document.id).and_return(false)
+      end
+
+      it 'shows link to collection title and active remove link' do
+        subject
+        expect(rendered).to have_link(document.title.first)
+        expect(rendered).to have_link("Remove")
+      end
     end
   end
 end