hyrax 2.1.0.beta1 → 2.1.0.beta2

data/spec/services/hyrax/collections/collection_member_service_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe Hyrax::Collections::CollectionMemberService, clean_repo: true, with_nested_reindexing: true do
+RSpec.describe Hyrax::Collections::CollectionMemberService, clean_repo: true do
   let(:blacklight_config) { CatalogController.blacklight_config }
   let(:repository) { Blacklight::Solr::Repository.new(blacklight_config) }
   let(:current_ability) { instance_double(Ability, admin?: true) }

data/spec/services/hyrax/qa_select_service_spec.rb

@@ -1,7 +1,6 @@
 RSpec.describe Hyrax::QaSelectService do
   let(:authority) do
     # Implementing an ActiveRecord interface as required for this spec
-    # rubocop:disable RSpec/InstanceVariable
     Class.new do
       def initialize(map)
         @map = map

data/spec/support/selectors.rb

@@ -5,6 +5,21 @@ module Selectors
         find '.dropdown-toggle'
       end
     end
+
+    # For use with javascript user selector that allows for searching for an existing user
+    # and granting them permission to an object.
+    # @param [User] user to select
+    # @param [String] role granting the user permission (e.g. 'Manager' | 'Depositor' | 'Viewer')
+    def select_user(user, role = 'Depositor')
+      first('a.select2-choice').click
+      find('.select2-input').set(user.user_key)
+      sleep 1
+      first('div.select2-result-label').click
+      within('div.add-users') do
+        select(role)
+        find('input.edit-collection-add-sharing-button').click
+      end
+    end
   end
 
   module NewTransfers

data/spec/views/hyrax/admin/admin_sets/_show_document_list_row.html.erb_spec.rb

@@ -1,5 +1,6 @@
 RSpec.describe 'hyrax/admin/admin_sets/_show_document_list_row.html.erb', type: :view do
   let(:user) { create(:user, groups: 'admin') }
+  let(:ability) { Ability.new(user) }
 
   let(:work) do
     create(:work, user: user, creator: ["ggm"], title: ['One Hundred Years of Solitude'])
@@ -7,6 +8,7 @@ RSpec.describe 'hyrax/admin/admin_sets/_show_document_list_row.html.erb', type:
 
   before do
     view.blacklight_config = Blacklight::Configuration.new
+    allow(controller).to receive(:current_ability).and_return(ability)
     allow(view).to receive(:current_user).and_return(user)
     allow(work).to receive(:title_or_label).and_return("One Hundred Years of Solitude")
     allow(work).to receive(:edit_groups).and_return([user])

data/spec/views/hyrax/admin/collection_types/_form_settings.html.erb_spec.rb

@@ -6,6 +6,7 @@ RSpec.describe 'hyrax/admin/collection_types/_form_settings.html.erb', type: :vi
 
   INPUT_IDS = %w[
     collection_type_nestable
+    collection_type_brandable
     collection_type_discoverable
     collection_type_sharable
     collection_type_share_applies_to_new_works

data/spec/views/hyrax/admin/stats/show.html.erb_spec.rb

@@ -10,6 +10,15 @@ RSpec.describe "hyrax/admin/stats/show.html.erb", type: :view do
     allow(presenter).to receive(:depositors).and_return([])
   end
 
+  context 'locales' do
+    before do
+      render
+    end
+    it 'includes a default locale hidden input' do
+      expect(rendered).to have_selector 'input', exact: 'en'
+    end
+  end
+
   context "default depositors" do
     let(:top_5_active_users) do
       (1..5).map { |i| double(label: i.to_s, value: i) }

data/spec/views/hyrax/base/_attributes.html.erb_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe 'hyrax/base/_attributes.html.erb' do
       description_tesim: description
     }
   end
-  let(:ability) { nil }
+  let(:ability) { double(admin?: true) }
   let(:presenter) do
     Hyrax::WorkShowPresenter.new(solr_document, ability)
   end

data/spec/views/hyrax/base/_relationships.html.erb_spec.rb

@@ -1,5 +1,6 @@
 RSpec.describe 'hyrax/base/relationships', type: :view do
-  let(:ability) { double }
+  let(:user) { create(:user, groups: 'admin') }
+  let(:ability) { Ability.new(user) }
   let(:solr_doc) { instance_double(SolrDocument, id: '123', human_readable_type: 'Work', admin_set: nil) }
   let(:presenter) { Hyrax::WorkShowPresenter.new(solr_doc, ability) }
   let(:generic_work) do
@@ -29,6 +30,7 @@ RSpec.describe 'hyrax/base/relationships', type: :view do
     let(:member_of_collection_presenters) { [collection] }
 
     before do
+      allow(controller).to receive(:current_user).and_return user
       allow(view).to receive(:contextual_path).and_return("/collections/456")
       allow(presenter).to receive(:member_of_collection_presenters).and_return(member_of_collection_presenters)
       render 'hyrax/base/relationships', presenter: presenter
@@ -44,6 +46,7 @@ RSpec.describe 'hyrax/base/relationships', type: :view do
     let(:member_of_collection_presenters) { [generic_work] }
 
     before do
+      allow(controller).to receive(:current_user).and_return user
       allow(view).to receive(:contextual_path).and_return("/concern/generic_works/456")
       allow(presenter).to receive(:member_of_collection_presenters).and_return(member_of_collection_presenters)
       render 'hyrax/base/relationships', presenter: presenter
@@ -59,6 +62,7 @@ RSpec.describe 'hyrax/base/relationships', type: :view do
     let(:member_of_collection_presenters) { [generic_work, collection] }
 
     before do
+      allow(controller).to receive(:current_user).and_return user
       allow(view).to receive(:contextual_path).and_return("/concern/generic_works/456")
       allow(presenter).to receive(:member_of_collection_presenters).and_return(member_of_collection_presenters)
       render 'hyrax/base/relationships', presenter: presenter
@@ -71,9 +75,17 @@ RSpec.describe 'hyrax/base/relationships', type: :view do
 
   context "with admin sets" do
     it "renders using attribute_to_html" do
+      allow(controller).to receive(:current_user).and_return(user)
       allow(solr_doc).to receive(:member_of_collection_ids).and_return([])
       expect(presenter).to receive(:attribute_to_html).with(:admin_set, render_as: :faceted)
       render 'hyrax/base/relationships', presenter: presenter
     end
+
+    it "skips admin sets if user not logged in" do
+      allow(controller).to receive(:current_user).and_return(nil)
+      allow(solr_doc).to receive(:member_of_collection_ids).and_return([])
+      expect(presenter).not_to receive(:attribute_to_html).with(:admin_set, render_as: :faceted)
+      render 'hyrax/base/relationships', presenter: presenter
+    end
   end
 end

data/spec/views/hyrax/base/_show_actions.html.erb_spec.rb

@@ -62,5 +62,15 @@ RSpec.describe 'hyrax/base/_show_actions.html.erb', type: :view do
         expect(rendered).to have_link 'File Manager'
       end
     end
+
+    context "when there are valid_child_concerns" do
+      before do
+        allow(presenter).to receive(:member_presenters).and_return([])
+        render 'hyrax/base/show_actions.html.erb', presenter: presenter
+      end
+      it "creates a link to add child work" do
+        expect(rendered).to have_link 'Attach Generic Work', href: "/concern/parent/#{presenter.id}/generic_works/new"
+      end
+    end
   end
 end

data/spec/views/hyrax/base/show.html.erb_spec.rb

@@ -47,6 +47,7 @@ RSpec.describe 'hyrax/base/show.html.erb', type: :view do
     allow(presenter).to receive(:representative_presenter).and_return(representative_presenter)
     allow(presenter).to receive(:representative_id).and_return('123')
     allow(presenter).to receive(:tweeter).and_return("@#{depositor.twitter_handle}")
+    allow(presenter).to receive(:human_readable_type).and_return("Work")
     allow(controller).to receive(:current_user).and_return(depositor)
     allow(User).to receive(:find_by_user_key).and_return(depositor.user_key)
     allow(view).to receive(:blacklight_config).and_return(Blacklight::Configuration.new)
@@ -91,6 +92,13 @@ RSpec.describe 'hyrax/base/show.html.erb', type: :view do
     end
   end
 
+  describe 'head tag page title' do
+    it 'appears in head tags' do
+      head_tag = Nokogiri::HTML(rendered).xpath("//head/title")
+      expect(head_tag.text).to eq("Work | My Title | ID: 999 | Hyrax")
+    end
+  end
+
   describe 'google scholar' do
     it 'appears in meta tags' do
       gscholar_meta_tags = Nokogiri::HTML(rendered).xpath("//meta[contains(@name, 'citation_')]")

data/spec/views/hyrax/collections/_show_parent_collections.html.erb_spec.rb

@@ -55,27 +55,7 @@ RSpec.describe 'hyrax/collections/_show_parent_collections.html.erb', type: :vie
     end
   end
 
-  context 'when parent collection list is not empty, but small' do
-    let(:parent_docs) { [collection1, collection2, collection3] }
-
-    it "posts the collection's title with a link to the collection" do
-      subject
-      expect(rendered).to have_link(collection1.title.first, visible: true)
-      expect(rendered).to have_link(collection2.title.first, visible: true)
-      expect(rendered).to have_link(collection3.title.first, visible: true)
-      expect(rendered).not_to have_button('show more...')
-    end
-
-    xit 'includes a count of the parent collections' do
-      # TODO: add test when actual count is added to page
-    end
-
-    it 'does not render pagination' do
-      expect(subject).not_to render_template("hyrax/collections/_paginate")
-    end
-  end
-
-  context 'when parent collection list exceeds parents_to_show' do
+  context 'when parent collection list is not empty' do
     let(:parent_docs) { [collection1, collection2, collection3, collection4, collection5] }
 
     it "posts the collection's title with a link to the collection" do
@@ -83,38 +63,8 @@ RSpec.describe 'hyrax/collections/_show_parent_collections.html.erb', type: :vie
       expect(rendered).to have_link(collection1.title.first, visible: true)
       expect(rendered).to have_link(collection2.title.first, visible: true)
       expect(rendered).to have_link(collection3.title.first, visible: true)
-      expect(rendered).to have_link(collection4.title.first, visible: false)
-      expect(rendered).to have_link(collection5.title.first, visible: false)
-      expect(rendered).to have_button('show more...', visible: true)
-      expect(rendered).to have_button('...show less', visible: false)
-    end
-
-    it 'renders pagination' do
-      expect(subject).not_to render_template("hyrax/collections/_paginate")
-    end
-  end
-
-  context 'when parent collection list has multiple pages' do
-    let(:parent_docs) { [collection1, collection2, collection3, collection4, collection5] }
-    let(:parent_collections) { double(Object, documents: parent_docs, response: { "numFound" => parent_docs.size }, total_pages: 2) }
-
-    before do
-      stub_template "hyrax/collections/_paginate" => "paginate"
-    end
-
-    it "renders a link to all collections" do
-      subject
-      expect(rendered).to have_link(collection1.title.first, visible: true)
-      expect(rendered).to have_link(collection2.title.first, visible: true)
-      expect(rendered).to have_link(collection3.title.first, visible: true)
-      expect(rendered).to have_link(collection4.title.first, visible: false)
-      expect(rendered).to have_link(collection5.title.first, visible: false)
-    end
-
-    it "does not render the more/less buttons" do
-      subject
-      expect(rendered).not_to have_button('show more...', visible: true)
-      expect(rendered).not_to have_button('...show less', visible: false)
+      expect(rendered).to have_link(collection4.title.first, visible: true)
+      expect(rendered).to have_link(collection5.title.first, visible: true)
     end
 
     it 'renders pagination' do

data/spec/views/hyrax/dashboard/_sidebar.html.erb_spec.rb

@@ -107,4 +107,26 @@ RSpec.describe 'hyrax/dashboard/_sidebar.html.erb', type: :view do
     it { is_expected.to have_content t('hyrax.admin.sidebar.configuration') }
     it { is_expected.to have_link t('hyrax.admin.sidebar.collection_types') }
   end
+
+  context 'when proxy deposits are enabled' do
+    before do
+      allow(Flipflop).to receive(:proxy_deposit?).and_return(true)
+      render
+    end
+
+    subject { rendered }
+
+    it { is_expected.to have_link t('hyrax.dashboard.manage_proxies') }
+  end
+
+  context 'when proxy deposits are disabled' do
+    before do
+      allow(Flipflop).to receive(:proxy_deposit?).and_return(false)
+      render
+    end
+
+    subject { rendered }
+
+    it { is_expected.not_to have_link t('hyrax.dashboard.manage_proxies') }
+  end
 end

data/spec/views/hyrax/dashboard/collections/_form_share.erb_spec.rb

@@ -12,7 +12,8 @@ RSpec.describe 'hyrax/dashboard/collections/_form_share.html.erb', type: :view d
     assign(:collection, collection)
     @form = instance_double(Hyrax::Forms::CollectionForm,
                             to_model: collection,
-                            permission_template: pt_form)
+                            permission_template: pt_form,
+                            id: '1234xyz')
     render
   end
   it "has the required selectors" do

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

@@ -35,10 +35,23 @@ RSpec.describe 'hyrax/dashboard/collections/_show_actions.html.erb', type: :view
     context 'with nestable collection' do
       it 'renders add parent collection link' do
         allow(presenter).to receive(:collection_type_is_nestable?).and_return true
+        allow(presenter).to receive(:user_can_nest_collection?).and_return true
+
         render
         expect(rendered).to have_button('Add existing collections to this collection')
       end
     end
+
+    context 'with nestable collection but without permissions' do
+      it 'does not render add parent collection link' do
+        allow(presenter).to receive(:collection_type_is_nestable?).and_return true
+        allow(presenter).to receive(:user_can_nest_collection?).and_return false
+
+        render
+        expect(rendered).not_to have_button('Add existing collections to this collection')
+      end
+    end
+
     context 'with non-nestable collection' do
       it 'does not render add parent collection link' do
         render

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

@@ -9,15 +9,33 @@ 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) }
 
-  before do
-    stub_template "_modal_remove_from_collection.html.erb" => 'modal'
-    allow(view).to receive(:can?).with(:edit, document.id).and_return(true)
+  context 'when 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
 
-  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")
-    expect(subject).to render_template("_modal_remove_from_collection")
+  context 'disable button if no edit permission' do
+    before do
+      allow(view).to receive(:can?).with(:edit, document.id).and_return(false)
+    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)
+    end
   end
 end

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

@@ -58,61 +58,25 @@ RSpec.describe 'hyrax/dashboard/collections/_show_parent_collections.html.erb',
     end
   end
 
-  context 'when parent collection list is not empty, but small' do
-    let(:parent_docs) { [collection1, collection2, collection3] }
-
-    it "posts the collection's title with a link to the collection" do
-      assign(:events, parent_docs)
-      subject
-
-      expect(subject).to render_template("_show_parent_collection_row")
-      expect(view).to render_template(partial: "_show_parent_collection_row", count: 3)
-      expect(rendered).not_to have_button('show more...')
-    end
+  context 'when parent collection list is not empty' do
+    let(:parent_docs) { [collection1, collection2, collection3, collection4, collection5] }
 
-    it 'does not render pagination' do
-      expect(subject).not_to render_template("hyrax/collections/_paginate")
+    before do
+      stub_template "_modal_remove_from_collection.html.erb" => 'modal'
     end
-  end
-
-  context 'when parent collection list exceeds parents_to_show' do
-    let(:parent_docs) { [collection1, collection2, collection3, collection4, collection5] }
 
     it "posts the collection's title with a link to the collection" do
       assign(:events, parent_docs)
       subject
       expect(view).to render_template(partial: "_show_parent_collection_row", count: 5)
-      expect(rendered).to have_button('show more...', visible: true)
-      expect(rendered).to have_button('...show less', visible: false)
     end
 
     it 'renders pagination' do
-      expect(subject).not_to render_template("hyrax/collections/_paginate")
-    end
-  end
-
-  context 'when parent collection list has multiple pages' do
-    let(:parent_docs) { [collection1, collection2, collection3, collection4, collection5] }
-    let(:parent_collections) { double(Object, documents: parent_docs, response: { "numFound" => parent_docs.size }, total_pages: 2) }
-
-    before do
-      stub_template "hyrax/collections/_paginate.html.erb" => "paginate"
-      assign(:events, parent_docs)
-    end
-
-    it "renders a row for each collection" do
-      subject
-      expect(view).to render_template(partial: "_show_parent_collection_row", count: 5)
-    end
-
-    it "does not render the more/less buttons" do
-      subject
-      expect(rendered).not_to have_button('show more...', visible: true)
-      expect(rendered).not_to have_button('...show less', visible: false)
+      expect(subject).to render_template("hyrax/collections/_paginate")
     end
 
-    it 'renders pagination' do
-      expect(subject).to render_template("hyrax/collections/_paginate")
+    it 'renders the remove from list modal' do
+      expect(subject).to render_template("_modal_remove_from_collection")
     end
   end
 end

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

@@ -1,7 +1,15 @@
 RSpec.describe 'hyrax/dashboard/collections/_subcollection_list.html.erb', type: :view do
+  let(:user) { create :user }
+  let(:ability) { instance_double("Ability") }
   let(:collection) { build(:named_collection, id: '123') }
   let(:subject) { render('subcollection_list.html.erb', id: collection.id, collection: subcollection) }
 
+  before do
+    allow(view).to receive(:id).and_return(collection.id)
+    allow(view).to receive(:current_ability).and_return(ability)
+    allow(controller).to receive(:can?).with(:edit, collection.id).and_return true
+  end
+
   context 'when subcollection list is empty' do
     let(:subcollection) { nil }
 
@@ -19,7 +27,6 @@ RSpec.describe 'hyrax/dashboard/collections/_subcollection_list.html.erb', type:
     let(:subcollection) { [collection] }
 
     before do
-      stub_template '_modal_remove_sub_collection.html.erb' => 'Remove button'
       assign(:subcollection_docs, subcollection)
       assign(:document, collection)
       allow(collection).to receive(:title_or_label).and_return(collection.title)
@@ -39,6 +46,11 @@ RSpec.describe 'hyrax/dashboard/collections/_subcollection_list.html.erb', type:
         expect(subject).to render_template('_modal_remove_sub_collection')
       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_child/123"]')
+        expect(subject).to have_selector(:css, 'li[data-id="123"]')
+      end
+
       it 'renders pagination' do
         expect(subject).to render_template("hyrax/collections/_paginate")
       end