hyrax 2.0.3 → 2.1.0.beta1

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

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+RSpec.describe 'hyrax/dashboard/collections/_work_action_menu.html.erb', type: :view do
+  let(:item) { stub_model(GenericWork) }
+  let(:collection) { stub_model(Collection) }
+
+  before do
+    allow(view).to receive(:display_trophy_link)
+    assign(:collection, collection)
+    render 'hyrax/dashboard/collections/work_action_menu', document: item
+  end
+
+  it "generates a form that can remove the item" do
+    expect(rendered).to have_selector("form[action=\"#{hyrax.dashboard_collection_path(collection)}\"]")
+    expect(rendered).to have_selector('input#collection_members[type="hidden"][value="remove"]', visible: false)
+    expect(rendered).to have_selector("input[type='hidden'][name='batch_document_ids[]'][value='#{item.id}']", visible: false)
+  end
+end

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

@@ -1,26 +1,18 @@
 RSpec.describe 'hyrax/dashboard/collections/edit.html.erb', type: :view do
-  let(:collection) { stub_model(Collection, id: 'xyz123z4', title: ["Make Collections Great Again"]) }
+  let(:collection) { build(:collection, id: 'xyz123z4', title: ["Make Collections Great Again"]) }
   let(:form) { Hyrax::Forms::CollectionForm.new(collection, double, double) }
-  let(:solr_response) { double(response: { 'numFound' => 0 }) }
 
   before do
-    allow(view).to receive(:has_collection_search_parameters?).and_return(false)
-    allow(controller).to receive(:current_user).and_return(stub_model(User))
     assign(:collection, collection)
     assign(:form, form)
-    assign(:response, solr_response)
-    stub_template 'hyrax/collections/_search_form.html.erb' => 'search form'
-    stub_template 'hyrax/my/_did_you_mean.html.erb' => 'did you mean'
-    stub_template 'hyrax/collections/_sort_and_per_page.html.erb' => 'sort and per page'
-    stub_template '_document_list.html.erb' => 'document list'
-    stub_template 'hyrax/collections/_paginate.html.erb' => 'paginate'
-    stub_template '_form.html.erb' => 'form'
+    stub_template '_form.html.erb' => 'my-edit-form partial'
+    stub_template '_flash_msg.html.erb' => 'flash_msg partial'
 
     render
   end
 
   it 'displays the page' do
-    expect(rendered).to have_content 'Actions'
-    expect(rendered).to have_link 'Add works'
+    expect(rendered).to have_content 'my-edit-form partial'
+    expect(rendered).to have_content 'flash_msg partial'
   end
 end

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

@@ -5,33 +5,110 @@ RSpec.describe 'hyrax/dashboard/collections/show.html.erb', type: :view do
                      'rights_tesim' => ["http://creativecommons.org/licenses/by-sa/3.0/us/"])
   end
   let(:ability) { double }
+  let(:collection) { mock_model(Collection) }
   let(:presenter) { Hyrax::CollectionPresenter.new(document, ability) }
+  let(:collection_type) { double }
 
   before do
+    user = stub_model(User)
     allow(document).to receive(:hydra_model).and_return(::Collection)
-    allow(controller).to receive(:current_user).and_return(stub_model(User))
+    allow(view).to receive(:current_user).and_return(user)
     allow(view).to receive(:can?).with(:edit, document).and_return(true)
     allow(view).to receive(:can?).with(:destroy, document).and_return(true)
+    allow(view).to receive(:current_ability).and_return(ability)
+    allow(ability).to receive(:current_user).and_return(user)
+
+    allow(Collection).to receive(:find).with(document.id).and_return(collection)
+
     allow(presenter).to receive(:total_items).and_return(0)
-    assign(:presenter, presenter)
+    allow(presenter).to receive(:collection_type).and_return(collection_type)
+    allow(presenter).to receive(:subcollection_count).and_return(0)
+    assign(:parent_collection_count, 0)
+    assign(:members_count, 0)
+
+    allow(collection_type).to receive(:nestable?).and_return(true)
+    allow(collection_type).to receive(:title).and_return("User Collection")
 
+    assign(:presenter, presenter)
     # Stub route because view specs don't handle engine routes
     allow(view).to receive(:edit_dashboard_collection_path).and_return("/dashboard/collection/123/edit")
-    allow(view).to receive(:collection_path).and_return("/dashboard/collection/123")
+    allow(view).to receive(:dashboard_collection_path).and_return("/dashboard/collection/123")
+    allow(view).to receive(:collection_path).and_return("/collection/123")
 
-    stub_template 'hyrax/collections/_search_form.html.erb' => 'search form'
+    stub_template '_search_form.html.erb' => 'search form'
     stub_template 'hyrax/dashboard/collections/_sort_and_per_page.html.erb' => 'sort and per page'
     stub_template '_document_list.html.erb' => 'document list'
+    # This is tested ./spec/views/hyrax/dashboard/collections/_show_actions.html.erb_spec.rb
+    stub_template '_show_actions.html.erb' => '<div class="stubbed-actions">THE COLLECTION ACTIONS</div>'
+    stub_template '_show_subcollection_actions.html.erb' => '<div class="stubbed-actions">THE SUBCOLLECTION ACTIONS</div>'
+    stub_template '_show_add_items_actions.html.erb' => '<div class="stubbed-actions">THE ADD ITEMS ACTIONS</div>'
+    stub_template '_show_parent_collections.html.erb' => '<div class="stubbed-actions">THE PARENT COLLECTIONS LIST</div>'
     stub_template 'hyrax/collections/_paginate.html.erb' => 'paginate'
     stub_template 'hyrax/collections/_media_display.html.erb' => '<span class="fa fa-cubes collection-icon-search"></span>'
-    render
+    stub_template 'hyrax/my/collections/_modal_add_to_collection.html.erb' => 'modal add as subcollection'
+    stub_template 'hyrax/my/collections/_modal_add_subcollection.html.erb' => 'modal add as parent'
   end
 
   it 'draws the page' do
-    expect(rendered).to have_selector 'h2', text: 'Actions'
-    expect(rendered).to have_link 'Edit'
-    expect(rendered).to have_link 'Delete'
-    expect(rendered).to have_link 'Add works'
+    render
+    # Making sure that we are verifying that the _show_actions.html.erb is rendering
+    expect(rendered).to have_css('.stubbed-actions', text: 'THE COLLECTION ACTIONS')
+    expect(rendered).to have_css('.stubbed-actions', text: 'THE SUBCOLLECTION ACTIONS')
+    expect(rendered).to have_css('.stubbed-actions', text: 'THE ADD ITEMS ACTIONS')
     expect(rendered).to match '<span class="fa fa-cubes collection-icon-search"></span>'
+    expect(rendered).not_to have_text('Search Results within this Collection')
+  end
+
+  context 'with a not-nested collection_type' do
+    before do
+      allow(presenter).to receive(:subcollection_count).and_return(0)
+      render
+    end
+    it 'draws the page' do
+      allow(collection_type).to receive(:nestable?).and_return(false)
+      # Making sure that we are verifying that the _show_actions.html.erb is rendering
+      expect(rendered).to have_css('.stubbed-actions', text: 'THE COLLECTION ACTIONS')
+      expect(rendered).to have_css('.stubbed-actions', text: 'THE SUBCOLLECTION ACTIONS')
+      expect(rendered).to have_css('.stubbed-actions', text: 'THE ADD ITEMS ACTIONS')
+      expect(rendered).to match '<span class="fa fa-cubes collection-icon-search"></span>'
+      expect(rendered).not_to have_text('Search Results within this Collection')
+    end
+  end
+
+  context 'when search results exist' do
+    before do
+      # rubocop:disable RSpec/AnyInstance
+      allow_any_instance_of(Hyrax::CollectionsHelper).to receive(:has_collection_search_parameters?).and_return(true)
+      # rubocop:enable RSpec/AnyInstance
+    end
+
+    context 'and only works are in search results' do
+      before do
+        assign(:members_count, 1)
+        render
+      end
+
+      it 'shows results header' do
+        expect(rendered).to have_text('Search Results within this Collection')
+        expect(rendered).to have_css('.stubbed-actions', text: 'THE COLLECTION ACTIONS')
+        expect(rendered).not_to have_css('.stubbed-actions', text: 'THE SUBCOLLECTION ACTIONS')
+        expect(rendered).not_to have_css('.stubbed-actions', text: 'THE ADD ITEMS ACTIONS')
+      end
+    end
+
+    context ' and only subcollections are in search results' do
+      before do
+        allow(presenter).to receive(:subcollection_count).and_return(1)
+        assign(:members_count, 0)
+        render
+      end
+
+      it 'shows results header' do
+        expect(rendered).to have_text('Search Results within this Collection')
+        expect(rendered).to have_css('.stubbed-actions', text: 'THE COLLECTION ACTIONS')
+        expect(rendered).not_to have_css('.stubbed-actions', text: 'THE SUBCOLLECTION ACTIONS')
+        expect(rendered).not_to have_css('.stubbed-actions', text: 'THE ADD ITEMS ACTIONS')
+      end
+    end
   end
 end

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

@@ -23,7 +23,7 @@ RSpec.describe 'hyrax/file_sets/_show_actions.html.erb', type: :view do
   describe 'citations' do
     before do
       Hyrax.config.citations = citations
-      allow(controller).to receive(:can?).with(:edit, presenter).and_return(false)
+      allow(ability).to receive(:can?).with(:edit, solr_document).and_return(false)
       assign(:presenter, presenter)
       view.lookup_context.view_paths.push 'app/views/hyrax/base'
       render

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

@@ -24,7 +24,7 @@ RSpec.describe "hyrax/homepage/_featured_works.html.erb", type: :view do
 
     before do
       allow(view).to receive(:can?).with(:update, FeaturedWork).and_return(false)
-      allow(view).to receive(:render_thumbnail_tag).with(presenter, width: 90)
+      allow(view).to receive(:render_thumbnail_tag).with(presenter)
       allow(list).to receive(:empty?).and_return(false)
       allow(list).to receive(:featured_works).and_return([featured_work])
       allow(featured_work).to receive(:presenter).and_return(presenter)

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

@@ -1,14 +1,19 @@
 RSpec.describe "hyrax/homepage/index.html.erb", type: :view do
   let(:groups) { [] }
   let(:ability) { instance_double("Ability", can?: false) }
-  let(:presenter) { instance_double(Hyrax::HomepagePresenter) }
-  let(:type_presenter) { instance_double(Hyrax::SelectTypeListPresenter, many?: true) }
+  let(:presenter) do
+    instance_double(Hyrax::HomepagePresenter,
+                    create_work_presenter: type_presenter,
+                    create_many_work_types?: true,
+                    draw_select_work_modal?: true)
+  end
+  let(:type_presenter) { instance_double(Hyrax::SelectTypeListPresenter) }
 
   before do
-    allow(view).to receive(:create_work_presenter).and_return(type_presenter)
     allow(view).to receive(:signed_in?).and_return(signed_in)
     allow(controller).to receive(:current_ability).and_return(ability)
     assign(:presenter, presenter)
+    stub_template 'shared/_select_work_type_modal.html.erb' => 'modal'
     stub_template "hyrax/homepage/_marketing.html.erb" => "marketing"
     stub_template "hyrax/homepage/_home_content.html.erb" => "home content"
   end
@@ -97,8 +102,12 @@ RSpec.describe "hyrax/homepage/index.html.erb", type: :view do
         end
 
         context "and there is a single work type" do
-          let(:type_presenter) do
-            instance_double(Hyrax::SelectTypeListPresenter, many?: false, first_model: GenericWork)
+          let(:presenter) do
+            instance_double(Hyrax::HomepagePresenter,
+                            create_work_presenter: type_presenter,
+                            create_many_work_types?: false,
+                            draw_select_work_modal?: true,
+                            first_work_type: GenericWork)
           end
 
           it "displays a link to create that work type" do

data/spec/views/hyrax/my/_collection_action_menu.html.erb_spec.rb

@@ -0,0 +1,65 @@
+RSpec.describe 'hyrax/my/_collection_action_menu.html.erb' do
+  let(:id) { '123' }
+  let(:collection) { create(:collection, id: id) }
+  let(:collection_doc) { SolrDocument.new(id: id, has_model_ssim: 'Collection', collection_type_gid_ssim: collection.collection_type_gid) }
+  let(:collection_type) { create(:collection_type) }
+  let(:user_collection_type) { create(:user_collection_type) }
+  let(:user) { build(:user) }
+  let(:ability) { instance_double("Ability") }
+  let(:collection_presenter) { Hyrax::CollectionPresenter.new(collection_doc, ability, nil) }
+
+  before do
+    allow(view).to receive(:current_user).and_return(user)
+    allow(view).to receive(:collection_presenter).and_return(collection_presenter)
+    allow(collection_presenter).to receive(:id).and_return(id)
+    allow(collection_presenter).to receive(:solr_document).and_return(collection_doc)
+    allow(view).to receive(:can?).with(:read, collection_doc).and_return(true)
+    allow(view).to receive(:can?).with(:edit, collection_doc).and_return(true)
+  end
+
+  context "when user can edit" do
+    before do
+      allow(view).to receive(:can?).with(:edit, collection_doc).and_return(true)
+      render 'hyrax/my/collection_action_menu', collection: collection_doc
+    end
+
+    it "shows view, edit, and delete" do
+      expect(rendered).to have_link 'View collection', href: hyrax.dashboard_collection_path(id)
+      expect(rendered).to have_link 'Edit collection', href: hyrax.edit_dashboard_collection_path(id)
+      expect(rendered).to have_link 'Delete collection'
+    end
+  end
+
+  context "when user can not edit" do
+    before do
+      allow(view).to receive(:can?).with(:edit, collection_doc).and_return(false)
+      render 'hyrax/my/collection_action_menu', collection: collection_doc
+    end
+
+    it "shows view, delete and hide edit" do
+      expect(rendered).to have_link 'View collection', href: hyrax.dashboard_collection_path(id)
+      expect(rendered).not_to have_link 'Edit collection', href: hyrax.edit_dashboard_collection_path(id)
+      expect(rendered).to have_link 'Delete collection'
+    end
+  end
+
+  context "when any_nestable?" do
+    before do
+      allow(Hyrax::CollectionType).to receive(:any_nestable?).and_return(true)
+      render 'hyrax/my/collection_action_menu', collection: collection_doc
+    end
+    it "shows add to collection action " do
+      expect(rendered).to have_link 'Add to collection'
+    end
+  end
+
+  context "when not any_nestable?" do
+    before do
+      allow(Hyrax::CollectionType).to receive(:any_nestable?).and_return(false)
+      render 'hyrax/my/collection_action_menu', collection: collection_doc
+    end
+    it "hides add to collection action " do
+      expect(rendered).not_to have_link 'Add to collection'
+    end
+  end
+end

data/spec/views/hyrax/my/_search_header.html.erb_spec.rb

@@ -12,23 +12,23 @@ RSpec.describe 'hyrax/my/_search_header.html.erb', type: :view do
 
   context "on my works page" do
     before do
-      allow(view).to receive(:on_my_works?).and_return(true)
+      view.lookup_context.prefixes.push "hyrax/my/works"
       render 'hyrax/my/search_header', current_tab: 'works'
     end
     it "has buttons" do
-      expect(rendered).to have_selector('button', text: 'Add to Collection')
+      expect(rendered).to have_selector('input[value="Delete Selected"]')
+      expect(rendered).to have_selector('button', text: 'Add to collection')
       expect(rendered).to have_selector('input[value="Edit Selected"]')
     end
   end
 
-  context "not on my works page (i.e. Works shared with me)" do
+  context "on my collections page" do
     before do
-      allow(view).to receive(:on_my_works?).and_return(false)
+      view.lookup_context.prefixes.push "hyrax/my/collections"
       render 'hyrax/my/search_header', current_tab: 'shared'
     end
     it "has buttons" do
-      expect(rendered).not_to have_selector('button', text: 'Add to Collection')
-      expect(rendered).to have_selector('input[value="Edit Selected"]')
+      expect(rendered).to have_selector('button', text: 'Delete collections')
     end
   end
 end

data/spec/views/hyrax/my/_work_action_menu.html.erb_spec.rb

@@ -8,9 +8,10 @@ RSpec.describe 'hyrax/my/_work_action_menu.html.erb' do
     allow(view).to receive(:display_trophy_link).and_return("Highlight Work on Profile")
   end
 
-  context "When the user can transfer works" do
+  context "When the user can transfer and edit works" do
     before do
       allow(view).to receive(:can?).with(:transfer, id).and_return(true)
+      allow(view).to receive(:can?).with(:edit, id).and_return(true)
       render 'hyrax/my/work_action_menu', document: document
     end
 
@@ -22,16 +23,17 @@ RSpec.describe 'hyrax/my/_work_action_menu.html.erb' do
     end
   end
 
-  context "when the user can't transfer works" do
+  context "when the user can't transfer or edit works" do
     before do
       allow(view).to receive(:can?).with(:transfer, id).and_return(false)
+      allow(view).to receive(:can?).with(:edit, id).and_return(false)
       render 'hyrax/my/work_action_menu', document: document
     end
 
     it "draws the page" do
       expect(rendered).not_to have_link "Transfer Ownership of Work"
-      expect(rendered).to have_link 'Edit Work', href: edit_hyrax_generic_work_path(id)
-      expect(rendered).to have_link 'Delete Work', href: hyrax_generic_work_path(id)
+      expect(rendered).not_to have_link 'Edit Work', href: edit_hyrax_generic_work_path(id)
+      expect(rendered).not_to have_link 'Delete Work', href: hyrax_generic_work_path(id)
       expect(rendered).to have_content 'Highlight Work on Profile'
     end
   end

data/spec/views/hyrax/my/collections/_list_collections.html.erb_spec.rb

@@ -1,32 +1,100 @@
 RSpec.describe 'hyrax/my/collections/_list_collections.html.erb', type: :view do
   let(:id) { "3197z511f" }
-  let(:attributes) do
-    {
-      id: id,
-      "has_model_ssim" => ["Collection"],
-      "title_tesim" => ["Collection Title"],
-      "description_tesim" => ["Collection Description"]
-    }
+  let(:modified_date) {  DateTime.new(2014, 1, 1).iso8601 }
+
+  def check_tr_data_attributes
+    expect(rendered).to have_selector('tr[data-source="my"]')
+    expect(rendered).to have_selector("tr[data-id='#{id}']")
+    expect(rendered).to have_selector("tr[data-colls-hash]")
+    expect(rendered).to have_selector("tr[data-post-url='/dashboard/collections/#{id}/within']")
   end
 
-  let(:doc) { SolrDocument.new(attributes) }
-  let(:collection) { mock_model(Collection) }
+  context "check for collections" do
+    let(:attributes) do
+      {
+        id: id,
+        "has_model_ssim" => ["Collection"],
+        "title_tesim" => ["Collection Title"],
+        "description_tesim" => ["Collection Description"],
+        "collection_type_gid_ssim" => [collection_type.gid],
+        "system_modified_dtsi" => modified_date
+      }
+    end
+
+    let(:doc) { SolrDocument.new(attributes) }
+    let(:collection) { mock_model(Collection) }
+    let(:collection_type) { create(:collection_type) }
+    let(:collection_presenter) { Hyrax::CollectionPresenter.new(doc, Ability.new(build(:user)), nil) }
 
-  before do
-    allow(view).to receive(:current_user).and_return(stub_model(User))
-    allow(doc).to receive(:to_model).and_return(stub_model(Collection, id: id))
-    view.lookup_context.prefixes.push 'hyrax/my'
+    before do
+      allow(view).to receive(:current_user).and_return(stub_model(User))
+      allow(view).to receive(:can?).with(:edit, doc).and_return(true)
+      allow(view).to receive(:can?).with(:read, doc).and_return(true)
+      allow(doc).to receive(:to_model).and_return(stub_model(Collection, id: id))
+      allow(Collection).to receive(:find).with(id).and_return(collection)
+      allow(collection).to receive(:id).and_return(id)
+      allow(collection).to receive(:member_of_collection_ids).and_return(["abc", "123"])
+      allow(collection_presenter).to receive(:collection_type_badge).and_return("User Collection")
+      view.lookup_context.prefixes.push 'hyrax/my'
+      render 'hyrax/my/collections/list_collections', collection_presenter: collection_presenter, is_admin_set: doc.admin_set?
+    end
 
-    render 'hyrax/my/collections/list_collections', document: doc
+    it 'the line item displays the collection and its actions' do
+      expect(rendered).to have_selector("tr#document_#{id}")
+      check_tr_data_attributes
+      expect(rendered).to have_selector("tr[data-post-delete-url='/dashboard/collections/#{id}']")
+      expect(rendered).to have_link 'Collection Title', href: hyrax.dashboard_collection_path(id)
+      expect(rendered).to have_link 'Edit collection', href: hyrax.edit_dashboard_collection_path(id)
+      expect(rendered).to have_link 'Delete collection'
+      expect(rendered).to have_link 'Add to collection'
+      expect(rendered).to have_css '.collection_type', text: 'User Collection'
+      expect(rendered).to have_selector '.expanded-details', text: 'Collection Description'
+      expect(rendered).not_to include '<span class="fa fa-cubes collection-icon-small"></span></a>'
+      expect(rendered).to include Date.parse(modified_date).to_formatted_s(:standard)
+    end
   end
 
-  it 'the line item displays the work and its actions' do
-    expect(rendered).to have_selector("tr#document_#{id}")
-    expect(rendered).to have_link 'Collection Title', href: hyrax.dashboard_collection_path(id)
-    expect(rendered).to have_link 'Edit Collection', href: hyrax.edit_dashboard_collection_path(id)
-    expect(rendered).to have_link 'Delete Collection', href: hyrax.dashboard_collection_path(id)
-    expect(rendered).to have_css 'a.visibility-link', text: 'Private'
-    expect(rendered).to have_selector '.expanded-details dd', text: 'Collection Description'
-    expect(rendered).not_to include '<span class="fa fa-cubes collection-icon-small pull-left"></span></a>'
+  context "check for admin set" do
+    let(:attributes) do
+      {
+        id: id,
+        "has_model_ssim" => ["AdminSet"],
+        "title_tesim" => ["AdminSet Title"],
+        "description_tesim" => ["Admin Description"],
+        "collection_type_gid_ssim" => [collection_type.gid],
+        "system_modified_dtsi" => modified_date
+      }
+    end
+
+    let(:doc) { SolrDocument.new(attributes) }
+    let(:admin_set) { mock_model(AdminSet) }
+    let(:collection_type) { create(:admin_set_collection_type) }
+    let(:collection_presenter) { Hyrax::AdminSetPresenter.new(doc, Ability.new(build(:user)), nil) }
+
+    before do
+      allow(view).to receive(:current_user).and_return(stub_model(User))
+      allow(view).to receive(:can?).with(:edit, doc).and_return(true)
+      allow(doc).to receive(:to_model).and_return(stub_model(AdminSet, id: id))
+      allow(collection_presenter).to receive(:collection_type_badge).and_return("Admin Set")
+      view.lookup_context.prefixes.push 'hyrax/my'
+
+      render 'hyrax/my/collections/list_collections', collection_presenter: collection_presenter, is_admin_set: doc.admin_set?
+    end
+
+    it 'the line item displays the work and its actions' do
+      expect(rendered).to include 'title="Delete collection" data-totalitems="0" data-membership="true" data-hasaccess="true"'
+      expect(rendered).to have_selector("tr#document_#{id}")
+      check_tr_data_attributes
+      expect(rendered).to have_selector("tr[data-post-delete-url='/admin/admin_sets/#{id}']")
+      expect(rendered).to have_link 'AdminSet Title', href: '#'
+      expect(rendered).to have_link 'View collection', href: hyrax.admin_admin_set_path(id)
+      expect(rendered).to have_link 'Edit collection', href: hyrax.edit_admin_admin_set_path(id)
+      expect(rendered).to have_link 'Delete collection'
+      expect(rendered).to have_link 'Add to collection' if Hyrax::CollectionType.any_nestable?
+      expect(rendered).to have_css '.collection_type', text: 'Admin Set'
+      expect(rendered).to have_selector '.expanded-details', text: 'Admin Description'
+      expect(rendered).not_to include '<span class="fa fa-cubes collection-icon-small"></span></a>'
+      expect(rendered).to include Date.parse(modified_date).to_formatted_s(:standard)
+    end
   end
 end