hyrax 2.0.3 → 2.1.0.beta1

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

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+RSpec.describe 'hyrax/admin/collection_types/index.html.erb', type: :view, clean_repo: true do
+  before do
+    assign(:collection_types, [
+             create(:user_collection_type),
+             create(:admin_set_collection_type),
+             FactoryBot.create(:collection_type, title: 'Test Title 1'),
+             FactoryBot.create(:collection_type, title: 'Test Title 2')
+           ])
+    render
+  end
+
+  it 'lists all the collection_types' do
+    expect(rendered).to have_content('Admin Set')
+    expect(rendered).to have_content('User Collection')
+    expect(rendered).to have_content('Test Title 1')
+    expect(rendered).to have_content('Test Title 2')
+  end
+
+  it 'displays the collection type count correctly' do
+    expect(rendered).to have_content '4 collection types in this repository'
+  end
+
+  it 'has edit buttons for custom and predefined collection types' do
+    expect(rendered).to have_link('Edit', count: 4)
+  end
+
+  it 'has delete buttons for custom collection types' do
+    # 2 delete buttons for the custom collection types and 1 for the delete modal
+    expect(rendered).to have_button('Delete', count: 3)
+  end
+
+  it 'has delete buttons with attribute for link to faceted index page' do
+    expect(rendered).to have_selector(:css, 'button[data-collection-type-index]', count: 2)
+  end
+
+  it 'has view collections buttons for collection types with existing collections' do
+    expect(rendered).to have_link('View collections of this type', count: 1)
+  end
+end

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

@@ -3,7 +3,7 @@ RSpec.describe 'hyrax/admin/users/index.html.erb', type: :view do
   let(:users) { [] }
 
   before do
-    (1..4).each { |i| users << FactoryBot.build(:user, display_name: "user#{i}", email: "email#{i}@example.com", last_sign_in_at: Time.zone.now - 15.minutes, created_at: Time.zone.now - 3.days) }
+    (1..4).each { |i| users << build(:user, display_name: "user#{i}", email: "email#{i}@example.com", last_sign_in_at: Time.zone.now - 15.minutes, created_at: Time.zone.now - 3.days) }
     allow(presenter).to receive(:users).and_return(users)
     assign(:presenter, presenter)
   end

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

@@ -8,10 +8,6 @@ RSpec.describe 'hyrax/base/_form.html.erb', type: :view do
     Hyrax::GenericWorkForm.new(work, ability, controller)
   end
   let(:options_presenter) { double(select_options: []) }
-  let(:page) do
-    render
-    Capybara::Node::Simple.new(rendered)
-  end
 
   before do
     allow(Hyrax::AdminSetOptionsPresenter).to receive(:new).and_return(options_presenter)
@@ -26,8 +22,10 @@ RSpec.describe 'hyrax/base/_form.html.erb', type: :view do
     allow(controller).to receive(:action_name).and_return('new')
     allow(controller).to receive(:repository).and_return(Hyrax::GenericWorksController.new.repository)
     allow(controller).to receive(:blacklight_config).and_return(Hyrax::GenericWorksController.new.blacklight_config)
-    allow(form).to receive(:collections_for_select).and_return([])
+
     allow(form).to receive(:permissions).and_return([])
+    allow(form).to receive(:visibility).and_return('public')
+    stub_template 'hyrax/base/_form_files.html.erb' => 'files'
   end
 
   context "for a new object" do
@@ -36,46 +34,23 @@ RSpec.describe 'hyrax/base/_form.html.erb', type: :view do
     context 'with batch_upload on' do
       before do
         allow(Flipflop).to receive(:batch_upload?).and_return(true)
+        render
       end
       it 'shows batch uploads' do
-        expect(page).to have_link('Batch upload')
+        expect(rendered).to have_link('Batch upload')
+        expect(rendered).to have_selector("form[action='/concern/generic_works'][data-param-key='generic_work']")
+        # Draws the "Share" tab, with data for the javascript.
+        expect(rendered).to have_selector('#share[data-param-key="generic_work"]')
       end
     end
+
     context 'with batch_upload off' do
       before do
         allow(Flipflop).to receive(:batch_upload?).and_return(false)
+        render
       end
       it 'hides batch uploads' do
-        expect(page).not_to have_link('Batch upload')
-      end
-    end
-    context 'with browse-everything disabled (default)' do
-      before do
-        allow(Hyrax.config).to receive(:browse_everything?) { nil }
-      end
-      it "draws the page" do
-        expect(page).to have_selector("form[action='/concern/generic_works'][data-param-key='generic_work']")
-        expect(page).to have_link('Batch upload')
-        # does not render the BE upload widget
-        expect(page).not_to have_selector('button#browse-btn')
-
-        # Draws the "Share" tab, with data for the javascript.
-        expect(page).to have_selector('#share[data-param-key="generic_work"]')
-      end
-    end
-
-    context 'with browse-everything enabled' do
-      before do
-        allow(Hyrax.config).to receive(:browse_everything?) { 'not nil' }
-      end
-      it 'renders the BE upload widget' do
-        expect(page).to have_selector('button#browse-btn')
-      end
-    end
-
-    describe 'uploading a folder' do
-      it 'renders the add folder button' do
-        expect(page).to have_content('Add folder...')
+        expect(rendered).not_to have_link('Batch upload')
       end
     end
   end
@@ -88,17 +63,18 @@ RSpec.describe 'hyrax/base/_form.html.erb', type: :view do
       work.errors.add :base, 'broken'
       work.errors.add :visibility, 'visibility_error'
       allow(form).to receive(:select_files).and_return([])
+      render
     end
 
     it "draws the page" do
-      expect(page).to have_selector("form[action='/concern/generic_works/456']")
-      expect(page).to have_selector("select#generic_work_resource_type", count: 1)
-      expect(page).to have_selector("select#generic_work_thumbnail_id", count: 1)
-      expect(page).to have_selector("select#generic_work_representative_id", count: 1)
+      expect(rendered).to have_selector("form[action='/concern/generic_works/456']")
+      expect(rendered).to have_selector("select#generic_work_resource_type", count: 1)
+      expect(rendered).to have_selector("select#generic_work_thumbnail_id", count: 1)
+      expect(rendered).to have_selector("select#generic_work_representative_id", count: 1)
 
       # It diplays form errors
-      expect(page).to have_content("broken")
-      expect(page).to have_content("visibility_error")
+      expect(rendered).to have_content("broken")
+      expect(rendered).to have_content("visibility_error")
     end
   end
 end

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

@@ -15,11 +15,6 @@ RSpec.describe "hyrax/base/_form_child_work_relationships.html.erb", type: :view
     end
   end
 
-  let(:page) do
-    render
-    Capybara::Node::Simple.new(rendered)
-  end
-
   before do
     # TODO: stub_model is not stubbing new_record? correctly on ActiveFedora models.
     allow(work).to receive(:new_record?).and_return(false)
@@ -29,7 +24,6 @@ RSpec.describe "hyrax/base/_form_child_work_relationships.html.erb", type: :view
     allow(view).to receive(:f).and_return(f)
     allow(f).to receive(:object).and_return(form)
     allow(controller).to receive(:current_user).and_return(stub_model(User))
-    stub_template '_find_work_widget.html.erb' => "<input class='finder'/>"
     assign(:form, form)
   end
 
@@ -37,41 +31,36 @@ RSpec.describe "hyrax/base/_form_child_work_relationships.html.erb", type: :view
     context "and no children works are present" do
       before do
         allow(form).to receive(:work_members).and_return([])
+        render
       end
 
       it "draws the page" do
         # remove button is not present
-        expect(page).not_to have_selector("[data-behavior='remove-relationship']")
+        expect(rendered).not_to have_selector("[data-behavior='remove-relationship']")
 
         # input with add button
-        expect(page).to have_selector("input.finder")
-        expect(page).to have_selector("[data-behavior='add-relationship']")
+        expect(rendered).to have_selector('input[data-autocomplete-url="/authorities/search/find_works"]')
+        expect(rendered).to have_selector("[data-behavior='add-relationship']")
       end
     end
 
     context "and child works are present" do
-      let(:work_2) do
-        stub_model(GenericWork, id: '567', title: ["Test Child Work"])
-      end
-
       before do
-        allow(form).to receive(:work_members).and_return([work_2])
+        allow(form).to receive(:work_members_json).and_return('stub-data')
+        render
       end
 
       it "draws the page" do
         # input with add button
-        expect(page).to have_selector("input.finder")
-        expect(page).to have_selector("[data-behavior='add-relationship']")
-
-        # an input box that is filled in with the child id
-        expect(page).to have_selector("input[value='#{work_2.id}']", visible: false)
+        expect(rendered).to have_selector('input[data-autocomplete-url="/authorities/search/find_works"]')
+        expect(rendered).to have_selector("[data-behavior='add-relationship']")
 
-        # generate a link for the child work's title
-        expect(page).to have_link("Test Child Work")
+        # generate the json to drive the script
+        expect(rendered).to have_selector('div[data-members="stub-data"]')
 
         # a remove button
         within "tr" do
-          expect(page).to have_selector("[data-behavior='remove-relationship']")
+          expect(rendered).to have_selector("[data-behavior='remove-relationship']")
         end
       end
     end

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

@@ -0,0 +1,38 @@
+RSpec.describe 'hyrax/base/_form_files.html.erb', type: :view do
+  let(:model) { stub_model(GenericWork) }
+  let(:form) { Hyrax::GenericWorkForm.new(model, double, controller) }
+  let(:f) { double(object: form) }
+
+  before do
+    stub_template 'hyrax/uploads/_js_templates.html.erb' => 'templates'
+    # TODO: stub_model is not stubbing new_record? correctly on ActiveFedora models.
+    allow(model).to receive(:new_record?).and_return(false)
+  end
+
+  context "without browse_everything" do
+    before do
+      allow(Hyrax.config).to receive(:browse_everything?).and_return(false)
+      render 'hyrax/base/form_files', f: f
+    end
+
+    it 'shows a message and buttons' do
+      expect(rendered).to have_content 'You can add one or more files to associate with this work.'
+      expect(rendered).to have_content('Add folder...')
+
+      expect(rendered).not_to have_content 'cloud provider'
+      expect(rendered).not_to have_selector('button#browse-btn')
+    end
+  end
+
+  context "with browse_everything" do
+    before do
+      allow(Hyrax.config).to receive(:browse_everything?).and_return(true)
+      render 'hyrax/base/form_files', f: f
+    end
+
+    it 'shows user timing warning' do
+      expect(rendered).to have_content 'Note that if you use a cloud provider to upload a large number of files'
+      expect(rendered).to have_selector("button[id='browse-btn'][data-target='#edit_generic_work_#{form.model.id}']")
+    end
+  end
+end

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

@@ -115,7 +115,7 @@ RSpec.describe 'hyrax/base/_form_progress.html.erb', type: :view do
     it "renders the deposit agreement already checked and the version" do
       expect(page).to have_selector("#agreement[checked]")
       expect(page).to have_selector("input#generic_work_version[value=\"123456\"]", visible: false)
-      expect(page).to have_link("Cancel", href: "/dashboard")
+      expect(page).to have_link("Cancel", href: polymorphic_path([main_app, work]))
     end
   end
 end

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

@@ -21,7 +21,6 @@ RSpec.describe 'hyrax/base/_form_relationships.html.erb', type: :view do
   end
 
   before do
-    allow(form).to receive(:collections_for_select).and_return([])
     allow(view).to receive(:action_name).and_return('new')
     allow(Hyrax::AdminSetService).to receive(:new).with(controller).and_return(service)
     allow(Hyrax::AdminSetOptionsPresenter).to receive(:new).with(service).and_return(presenter)
@@ -33,7 +32,7 @@ RSpec.describe 'hyrax/base/_form_relationships.html.erb', type: :view do
     end
 
     it "draws the page" do
-      expect(page).to have_content('Add as member of administrative set')
+      expect(page).to have_content('Administrative Set')
       expect(page).to have_selector('select#generic_work_admin_set_id')
     end
   end

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

@@ -0,0 +1,18 @@
+RSpec.describe 'hyrax/base/_form_rendering.html.erb', type: :view do
+  let(:ability) { double }
+  let(:work) { create(:work_with_one_file) }
+  let(:form) do
+    Hyrax::GenericWorkForm.new(work, ability, controller)
+  end
+
+  let(:page) do
+    view.simple_form_for form do |f|
+      render 'hyrax/base/form_rendering', f: f
+    end
+    Capybara::Node::Simple.new(rendered)
+  end
+
+  it 'has a rendering_ids field' do
+    expect(page).to have_selector("select#generic_work_rendering_ids", count: 1)
+  end
+end

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

@@ -22,7 +22,7 @@ RSpec.describe "hyrax/base/file_manager.html.erb" do
       )
     )
   end
-  let(:resource) { FactoryBot.build(:file_set) }
+  let(:resource) { build(:file_set) }
 
   let(:parent) { build(:generic_work) }
 

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

@@ -45,6 +45,7 @@ RSpec.describe 'hyrax/base/show.html.erb', type: :view do
   before do
     allow(presenter).to receive(:workflow).and_return(workflow_presenter)
     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(controller).to receive(:current_user).and_return(depositor)
     allow(User).to receive(:find_by_user_key).and_return(depositor.user_key)
@@ -54,7 +55,6 @@ RSpec.describe 'hyrax/base/show.html.erb', type: :view do
     stub_template 'hyrax/base/_metadata.html.erb' => ''
     stub_template 'hyrax/base/_relationships.html.erb' => ''
     stub_template 'hyrax/base/_show_actions.html.erb' => ''
-    stub_template 'hyrax/base/_representative_media.html.erb' => ''
     stub_template 'hyrax/base/_social_media.html.erb' => ''
     stub_template 'hyrax/base/_citations.html.erb' => ''
     stub_template 'hyrax/base/_items.html.erb' => ''
@@ -64,14 +64,33 @@ RSpec.describe 'hyrax/base/show.html.erb', type: :view do
     render template: 'hyrax/base/show.html.erb', layout: 'layouts/hyrax/1_column'
   end
 
-  it 'shows last saved' do
-    expect(page).to have_content 'Last modified: 04/01/2011'
-  end
-
   it 'shows workflow badge' do
     expect(page).to have_content 'Foobar'
   end
 
+  describe 'UniversalViewer integration' do
+    before do
+      allow(presenter).to receive(:universal_viewer?).and_return(viewer_enabled)
+      render template: 'hyrax/base/show.html.erb'
+    end
+
+    context 'when presenter says it is enabled' do
+      let(:viewer_enabled) { true }
+
+      it 'renders the UniversalViewer' do
+        expect(page).to have_selector 'div.viewer'
+      end
+    end
+
+    context 'when presenter says it is disabled' do
+      let(:viewer_enabled) { false }
+
+      it 'omits the UniversalViewer' do
+        expect(page).not_to have_selector 'div.viewer'
+      end
+    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_descriptions.html.erb_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe 'hyrax/collections/_show_descriptions.html.erb', type: :view do
       render
       expect(rendered).to have_content 'Date Created'
       expect(rendered).to include('itemprop="dateCreated"')
-      expect(rendered).to have_content 'Total works'
+      expect(rendered).to have_content 'Total items'
       expect(rendered).to have_content '2'
       expect(rendered).to have_content 'Size'
       expect(rendered).to have_content '118 MB'

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

@@ -0,0 +1,124 @@
+RSpec.describe 'hyrax/collections/_show_parent_collections.html.erb', type: :view do
+  let(:collection_doc) do
+    {
+      id: '999',
+      "has_model_ssim" => ["Collection"],
+      "title_tesim" => ["Title 1"],
+      'date_created_tesim' => '2000-01-01'
+    }
+  end
+  let(:subject) { render('show_parent_collections.html.erb', presenter: presenter) }
+  let(:ability) { double }
+  let(:solr_document) { SolrDocument.new(collection_doc) }
+  let(:presenter) { Hyrax::CollectionPresenter.new(solr_document, ability) }
+  let(:collection1) { build(:collection, id: 'col1', title: ['col1']) }
+  let(:collection2) { build(:collection, id: 'col2', title: ['col2']) }
+  let(:collection3) { build(:collection, id: 'col3', title: ['col3']) }
+  let(:collection4) { build(:collection, id: 'col4', title: ['col4']) }
+  let(:collection5) { build(:collection, id: 'col5', title: ['col5']) }
+  let(:parent_collections) { double(Object, documents: parent_docs, response: { "numFound" => parent_docs.size }, total_pages: 1) }
+
+  before do
+    assign(:presenter, presenter)
+    presenter.parent_collections = parent_collections
+
+    allow(collection1).to receive(:persisted?).and_return true
+    allow(collection2).to receive(:persisted?).and_return true
+    allow(collection3).to receive(:persisted?).and_return true
+    allow(collection4).to receive(:persisted?).and_return true
+    allow(collection5).to receive(:persisted?).and_return true
+  end
+
+  context 'when parent collections are nil' do
+    let(:parent_collections) { nil }
+
+    it "posts a warning message" do
+      subject
+      expect(rendered).to have_text("There are no visible parent collections.")
+    end
+
+    it 'does not render pagination' do
+      expect(subject).not_to render_template("hyrax/collections/_paginate")
+    end
+  end
+
+  context 'when parent collection list is empty' do
+    let(:parent_docs) { [] }
+
+    it "posts a warning message" do
+      subject
+      expect(rendered).to have_text("There are no visible parent collections.")
+    end
+
+    it 'does not render pagination' do
+      expect(subject).not_to render_template("hyrax/collections/_paginate")
+    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
+    let(:parent_docs) { [collection1, collection2, collection3, collection4, collection5] }
+
+    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).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)
+    end
+
+    it 'renders pagination' do
+      expect(subject).to render_template("hyrax/collections/_paginate")
+    end
+  end
+end