hyrax 2.0.3 → 2.1.0.beta1

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

@@ -0,0 +1,60 @@
+RSpec.describe 'hyrax/collections/_sort_and_per_page.html.erb', type: :view do
+  let(:subject) { 'hyrax/collections/sort_and_per_page.html.erb' }
+  let(:collection) { instance_double(Collection) }
+
+  before do
+    allow(view).to receive(:show_sort_and_per_page?).and_return(true)
+    allow(view).to receive(:collection_path).and_return("collection/path")
+    stub_template('_view_type_group.erb' => "")
+  end
+
+  context "when there are multiple sort fields" do
+    let(:active_sort_fields) do
+      {
+        "sort field value 1" => Blacklight::Configuration::SortField.new(label: "sort field label 1"),
+        "sort field value 2" => Blacklight::Configuration::SortField.new(label: "sort field label 2")
+      }
+    end
+
+    it "renders the sort options without any selected when no sort param given" do
+      render(subject, collection: collection, active_sort_fields: active_sort_fields)
+      expect(rendered).to have_select('sort', options: ["sort field label 1", "sort field label 2"], with_selected: [])
+    end
+
+    it "renders the sort options with the correct option selected when a valid sort param given" do
+      allow(view).to receive(:params).and_return(sort: "sort field value 1")
+      render(subject, collection: collection, active_sort_fields: active_sort_fields)
+      expect(rendered).to have_select('sort', options: ["sort field label 1", "sort field label 2"], with_selected: ["sort field label 1"])
+    end
+
+    it "renders the sort options without any selected when an invalid sort param given" do
+      allow(view).to receive(:params).and_return(sort: "sort field value DNE")
+      render(subject, collection: collection, active_sort_fields: active_sort_fields)
+      expect(rendered).to have_select('sort', options: ["sort field label 1", "sort field label 2"], with_selected: [])
+    end
+  end
+
+  context "when there is only one sort field" do
+    let(:active_sort_fields) do
+      {
+        "sort field value 1" => Blacklight::Configuration::SortField.new(label: "sort field label 1")
+      }
+    end
+
+    it "does not render sort options" do
+      render(subject, collection: collection, active_sort_fields: active_sort_fields)
+      expect(rendered).not_to have_select('sort')
+    end
+  end
+
+  context "when there are no sort fields" do
+    let(:active_sort_fields) do
+      {}
+    end
+
+    it "does not render sort options" do
+      render(subject, collection: collection, active_sort_fields: active_sort_fields)
+      expect(rendered).not_to have_select('sort')
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+RSpec.describe 'hyrax/collections/_subcollection_list.html.erb', type: :view do
+  let(:subject) { render('subcollection_list.html.erb', collection: subcollection) }
+  let(:collection) { build(:named_collection, id: '123') }
+
+  context 'when subcollection list is empty' do
+    let(:subcollection) { nil }
+
+    before do
+      assign(:subcollection_docs, subcollection)
+    end
+
+    it "posts a warning message" do
+      render('subcollection_list.html.erb', collection: subcollection)
+      expect(rendered).to have_text("There are no visible subcollections.")
+    end
+  end
+
+  context 'when subcollection list is not empty' do
+    let(:subcollection) { [collection] }
+
+    before do
+      assign(:subcollection_docs, subcollection)
+      assign(:document, collection)
+      allow(collection).to receive(:title_or_label).and_return(collection.title)
+      # make the collection "persisted" so the route returned is valid for show
+      allow(collection).to receive(:persisted?).and_return true
+      stub_template "hyrax/collections/_paginate" => "<div>paginate</div>"
+    end
+
+    it "posts the collection's title with a link to the collection" do
+      subject
+      expect(rendered).to have_link(collection.title.to_s)
+    end
+
+    it 'renders pagination' do
+      expect(subject).to render_template("hyrax/collections/_paginate")
+    end
+  end
+end

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

@@ -1,50 +1,47 @@
 RSpec.describe 'hyrax/collections/show.html.erb', type: :view do
   let(:document) do
     SolrDocument.new(id: 'xyz123z4',
+                     'collection_type_gid_ssim' => [collection_type.gid],
                      'title_tesim' => ['Make Collections Great Again'],
                      'rights_tesim' => ["http://creativecommons.org/licenses/by-sa/3.0/us/"])
   end
   let(:ability) { double }
+  let(:collection_type) { create(:collection_type) }
   let(:presenter) { Hyrax::CollectionPresenter.new(document, ability) }
 
   before do
     allow(document).to receive(:hydra_model).and_return(::Collection)
     allow(controller).to receive(:current_user).and_return(stub_model(User))
+    allow(view).to receive(:can?).with(:edit, document).and_return(false)
+    allow(view).to receive(:can?).with(:destroy, document).and_return(false)
+    allow(presenter).to receive(:collection_type_is_nestable?).and_return(true)
     allow(presenter).to receive(:total_items).and_return(0)
+    assign(:subcollection_count, 0)
+    assign(:parent_collection_count, 0)
+    assign(:members_count, 0)
+    allow(presenter).to receive(:banner_file).and_return("banner.gif")
+    allow(presenter).to receive(:logo_record).and_return([{ linkurl: "logo link url", alttext: "logo alt text", file_location: "logo.gif" }])
+    allow(ability).to receive(:user_groups).and_return([])
+    allow(ability).to receive(:current_user).and_return(build(:user, id: nil, email: ""))
     assign(:presenter, presenter)
 
     # Stub route because view specs don't handle engine routes
     allow(view).to receive(:collection_path).and_return("/collection/123")
-    allow(view).to receive(:edit_dashboard_collection_path).and_return("/dashboard/collection/123/edit")
 
     stub_template '_search_form.html.erb' => 'search form'
     stub_template 'hyrax/collections/_sort_and_per_page.html.erb' => 'sort and per page'
     stub_template 'hyrax/collections/_document_list.html.erb' => 'document list'
     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
   end
 
-  describe 'as normal user' do
-    it 'draws the page' do
-      allow(view).to receive(:can?).with(:edit, document).and_return(false)
-      allow(view).to receive(:can?).with(:destroy, document).and_return(false)
-      render
-
-      expect(rendered).to match '<span class="fa fa-cubes collection-icon-search"></span>'
-    end
-  end
-
-  describe 'as editor' do
-    it 'includes edit actions' do
-      allow(view).to receive(:can?).with(:edit, document).and_return(true)
-      allow(view).to receive(:can?).with(:destroy, document).and_return(true)
-      render
-
-      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'
-      expect(rendered).to match '<span class="fa fa-cubes collection-icon-search"></span>'
-    end
+  it 'draws the page' do
+    expect(rendered).to have_content('Make Collections Great Again')
+    expect(rendered).to have_content('Collection Details')
+    expect(rendered).to have_css('header.hyc-banner')
+    expect(rendered).to have_css('div.hyc-description')
+    expect(rendered).to have_css('div.hyc-metadata')
+    expect(rendered).to have_css('div.hyc-logos')
   end
 end

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

@@ -7,6 +7,7 @@ RSpec.describe 'hyrax/dashboard/_sidebar.html.erb', type: :view do
   let(:update_appearance) { false }
   let(:manage_feature) { false }
   let(:manage_workflow) { false }
+  let(:manage_collection_types) { false }
 
   before do
     allow(view).to receive(:signed_in?).and_return(true)
@@ -19,6 +20,7 @@ RSpec.describe 'hyrax/dashboard/_sidebar.html.erb', type: :view do
     allow(view).to receive(:can?).with(:update, :appearance).and_return(update_appearance)
     allow(view).to receive(:can?).with(:manage, Hyrax::Feature).and_return(manage_feature)
     allow(view).to receive(:can?).with(:manage, Sipity::WorkflowResponsibility).and_return(manage_workflow)
+    allow(view).to receive(:can?).with(:manage, :collection_types).and_return(manage_collection_types)
   end
 
   context 'with any user' do
@@ -42,15 +44,8 @@ RSpec.describe 'hyrax/dashboard/_sidebar.html.erb', type: :view do
     subject { rendered }
 
     it { is_expected.to have_link t('hyrax.admin.sidebar.statistics') }
-  end
-
-  context 'with a user who can manage any admin set' do
-    let(:manage_any_admin_set) { true }
-
-    before { render }
-    subject { rendered }
-
-    it { is_expected.to have_link t('hyrax.admin.sidebar.admin_sets') }
+    it { is_expected.to have_link t('hyrax.embargoes.index.manage_embargoes') }
+    it { is_expected.to have_link t('hyrax.leases.index.manage_leases') }
   end
 
   context 'with a user who can review submissions' do
@@ -102,4 +97,14 @@ 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.workflow_roles') }
   end
+
+  context 'with a user who can manage collection types' do
+    let(:manage_collection_types) { true }
+
+    before { render }
+    subject { rendered }
+
+    it { is_expected.to have_content t('hyrax.admin.sidebar.configuration') }
+    it { is_expected.to have_link t('hyrax.admin.sidebar.collection_types') }
+  end
 end

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

@@ -1,6 +1,8 @@
 RSpec.describe 'hyrax/dashboard/collections/_form.html.erb', type: :view do
   let(:collection) { Collection.new }
   let(:collection_form) { Hyrax::Forms::CollectionForm.new(collection, double, double) }
+  let(:banner_info) { { file: "banner.gif", alttext: "Banner alt text" } }
+  let(:logo_info) { [{ file: "logo.gif", alttext: "Logo alt text", linkurl: "http://abc.com" }] }
 
   before do
     allow(collection).to receive(:open_access?).and_return(true)
@@ -9,11 +11,13 @@ RSpec.describe 'hyrax/dashboard/collections/_form.html.erb', type: :view do
     controller.request.path_parameters[:id] = 'j12345'
     assign(:form, collection_form)
     assign(:collection, collection)
+    assign(:banner_info, banner_info)
+    assign(:logo_info, logo_info)
     # Stub route because view specs don't handle engine routes
     allow(view).to receive(:collections_path).and_return("/collections")
     allow(controller).to receive(:current_user).and_return(stub_model(User))
     allow(collection_form).to receive(:display_additional_fields?).and_return(additional_fields)
-    allow(collection_form).to receive(:permissions).and_return([])
+    allow(collection_form).to receive(:discovery).and_return([])
   end
 
   context 'with secondary terms' do

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

@@ -0,0 +1,23 @@
+RSpec.describe 'hyrax/dashboard/collections/_form_branding.html.erb', type: :view do
+  let(:banner_info) { { file: "banner.gif" } }
+  let(:logo_info) { [{ file: "logo.gif", alttext: "Logo alt text", linkurl: "http://abc.com" }] }
+
+  let(:form_builder) { double("FormBuilder", object: form) }
+  let(:form) do
+    instance_double(Hyrax::Forms::CollectionForm,
+                    banner_info: banner_info,
+                    logo_info: logo_info)
+  end
+
+  before do
+    assign(:form, form)
+    render 'hyrax/dashboard/collections/form_branding', f: form_builder
+  end
+
+  it "displays branding information for a collection" do
+    expect(rendered).to include('banner.gif')
+    expect(rendered).to include('logo.gif')
+    expect(rendered).to include('Logo alt text')
+    expect(rendered).to include('http://abc.com')
+  end
+end

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

@@ -0,0 +1,67 @@
+RSpec.describe 'hyrax/dashboard/collections/_form_discovery.html.erb', type: :view do
+  let(:collection) { Collection.new }
+  let(:collection_form) { Hyrax::Forms::CollectionForm.new(collection, double, double) }
+
+  let(:form) do
+    view.simple_form_for(collection, url: '/update') do |fs_form|
+      return fs_form
+    end
+  end
+
+  context "collection has open access" do
+    before do
+      allow(collection).to receive(:open_access?).and_return(true)
+      allow(collection).to receive(:authenticated_only_access?).and_return(false)
+      allow(collection).to receive(:private_access?).and_return(false)
+      controller.request.path_parameters[:id] = 'j12345'
+      assign(:form, collection_form)
+      assign(:collection, collection)
+      allow(view).to receive(:f).and_return(form)
+      render
+    end
+
+    it "check open access is set" do
+      expect(rendered).to have_selector('input[type=radio][name="collection[visibility]"][value=open][checked=true]')
+      expect(rendered).to have_selector('input[type=radio][name="collection[visibility]"][value=authenticated]')
+      expect(rendered).to have_selector('input[type=radio][name="collection[visibility]"][value=restricted]')
+    end
+  end
+
+  context "collection has authenticated access" do
+    before do
+      allow(collection).to receive(:open_access?).and_return(false)
+      allow(collection).to receive(:authenticated_only_access?).and_return(true)
+      allow(collection).to receive(:private_access?).and_return(false)
+      controller.request.path_parameters[:id] = 'j12345'
+      assign(:form, collection_form)
+      assign(:collection, collection)
+      allow(view).to receive(:f).and_return(form)
+      render
+    end
+
+    it "check authenticated access is set" do
+      expect(rendered).to have_selector('input[type=radio][name="collection[visibility]"][value=open]')
+      expect(rendered).to have_selector('input[type=radio][name="collection[visibility]"][value=authenticated][checked=true]')
+      expect(rendered).to have_selector('input[type=radio][name="collection[visibility]"][value=restricted]')
+    end
+  end
+
+  context "collection has restricted access" do
+    before do
+      allow(collection).to receive(:open_access?).and_return(false)
+      allow(collection).to receive(:authenticated_only_access?).and_return(false)
+      allow(collection).to receive(:private_access?).and_return(true)
+      controller.request.path_parameters[:id] = 'j12345'
+      assign(:form, collection_form)
+      assign(:collection, collection)
+      allow(view).to receive(:f).and_return(form)
+      render
+    end
+
+    it "check restricted access is set" do
+      expect(rendered).to have_selector('input[type=radio][name="collection[visibility]"][value=open]')
+      expect(rendered).to have_selector('input[type=radio][name="collection[visibility]"][value=authenticated]')
+      expect(rendered).to have_selector('input[type=radio][name="collection[visibility]"][value=restricted][checked=true]')
+    end
+  end
+end

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

@@ -1,42 +1,21 @@
 RSpec.describe 'hyrax/dashboard/collections/_form_share.html.erb', type: :view do
-  let(:collection) do
-    stub_model(Collection, id: '123', depositor: 'bob')
-  end
-
-  let(:form) do
-    view.simple_form_for(collection, url: '/update') do |fs_form|
-      return fs_form
-    end
+  let(:template) { stub_model(Hyrax::PermissionTemplate) }
+  let(:pt_form) do
+    instance_double(Hyrax::Forms::PermissionTemplateForm,
+                    model_name: template.model_name,
+                    to_key: template.to_key,
+                    access_grants: template.access_grants)
   end
+  let(:collection) { create(:collection, collection_type_settings: :sharable_no_work_permissions) }
 
   before do
-    allow(controller).to receive(:current_user).and_return(stub_model(User))
-    allow(collection).to receive(:permissions).and_return(permissions)
-    allow(view).to receive(:f).and_return(form)
-    view.lookup_context.prefixes.push 'hyrax/base'
-    view.extend Hyrax::PermissionsHelper
+    assign(:collection, collection)
+    @form = instance_double(Hyrax::Forms::CollectionForm,
+                            to_model: collection,
+                            permission_template: pt_form)
     render
   end
-
-  context "without additional users" do
-    let(:permissions) { [] }
-
-    it "draws the permissions form without error" do
-      expect(rendered).to have_css("input#new_user_name_skel")
-      expect(rendered).not_to have_css("button.remove_perm")
-    end
-  end
-
-  context "with additional users" do
-    let(:depositor_permission) { Hydra::AccessControls::Permission.new(id: '123', name: 'bob', type: 'person', access: 'edit') }
-    let(:public_permission) { Hydra::AccessControls::Permission.new(id: '124', name: 'public', type: 'group', access: 'read') }
-    let(:other_permission) { Hydra::AccessControls::Permission.new(id: '125', name: 'joe@example.com', type: 'person', access: 'edit') }
-    let(:permissions) { [depositor_permission, public_permission, other_permission] }
-
-    it "draws the permissions form without error" do
-      expect(rendered).to have_css("input#new_user_name_skel")
-      expect(rendered).to have_css("button.remove_perm", count: 1) # depositor and public should be filtered out
-      expect(rendered).to have_css("button.remove_perm[data-index='2']")
-    end
+  it "has the required selectors" do
+    expect(rendered).to have_selector('#participants #user-participants-form input[type=text]')
   end
 end

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

@@ -0,0 +1,108 @@
+RSpec.describe 'hyrax/dashboard/collections/_form_share_table.html.erb', type: :view do
+  let(:template) { stub_model(Hyrax::PermissionTemplate) }
+  let(:user) { create(:user) }
+  let(:access_grant) { stub_model(Hyrax::PermissionTemplateAccess) }
+  let(:collection) { create(:collection, collection_type_settings: :sharable_no_work_permissions) }
+  let(:pt_form) do
+    instance_double(Hyrax::Forms::PermissionTemplateForm,
+                    model_name: template.model_name,
+                    to_key: template.to_key,
+                    access_grants: [access_grant])
+  end
+
+  before do
+    assign(:collection, collection)
+    @form = instance_double(Hyrax::Forms::CollectionForm,
+                            to_model: stub_model(Collection),
+                            permission_template: pt_form)
+    # Ignore the delete button link
+    allow(view).to receive(:admin_permission_template_access_path).and_return("/admin/permission_template_accesses/123")
+  end
+
+  describe "Manager shares table" do
+    before do
+      render 'form_share_table', access: "managers", filter: :manage?
+    end
+
+    context "managers exist" do
+      let(:access_grant) do
+        stub_model(Hyrax::PermissionTemplateAccess,
+                   agent_type: 'user',
+                   agent_id: user.user_key,
+                   access: 'manage')
+      end
+
+      it "lists the managers in the table" do
+        expect(rendered).to have_selector("h3", text: "Managers")
+        expect(rendered).to have_selector("table tbody", text: user.user_key)
+      end
+    end
+    context "no managers exist" do
+      let(:access_grant) { stub_model(Hyrax::PermissionTemplateAccess) }
+
+      it "displays a message and no table" do
+        expect(rendered).to have_selector("h3", text: "Managers")
+        expect(rendered).not_to have_selector("table")
+        expect(rendered).to have_content("No managers have been added to this collection.")
+      end
+    end
+  end
+
+  describe "Viewer shares table" do
+    before do
+      render 'form_share_table', access: "viewers", filter: :view?
+    end
+
+    context "viewers exist" do
+      let(:access_grant) do
+        stub_model(Hyrax::PermissionTemplateAccess,
+                   agent_type: 'user',
+                   agent_id: user.user_key,
+                   access: 'view')
+      end
+
+      it "lists the viewers in the table" do
+        expect(rendered).to have_selector("h3", text: "Viewers")
+        expect(rendered).to have_selector("table tbody", text: user.user_key)
+      end
+    end
+    context "no viewers exist" do
+      let(:access_grant) { stub_model(Hyrax::PermissionTemplateAccess) }
+
+      it "displays a message and no table" do
+        expect(rendered).to have_selector("h3", text: "Viewers")
+        expect(rendered).not_to have_selector("table")
+        expect(rendered).to have_content("No viewers have been added to this collection.")
+      end
+    end
+  end
+
+  describe "Depositor shares table" do
+    before do
+      render 'form_share_table', access: "depositors", filter: :deposit?
+    end
+
+    context "depositors exist" do
+      let(:access_grant) do
+        stub_model(Hyrax::PermissionTemplateAccess,
+                   agent_type: 'user',
+                   agent_id: user.user_key,
+                   access: 'deposit')
+      end
+
+      it "lists the depositors in the table" do
+        expect(rendered).to have_selector("h3", text: "Depositors")
+        expect(rendered).to have_selector("table tbody", text: user.user_key)
+      end
+    end
+    context "no depositors exist" do
+      let(:access_grant) { stub_model(Hyrax::PermissionTemplateAccess) }
+
+      it "displays a message and no table" do
+        expect(rendered).to have_selector("h3", text: "Depositors")
+        expect(rendered).not_to have_selector("table")
+        expect(rendered).to have_content("No depositors have been added to this collection.")
+      end
+    end
+  end
+end