hyrax 1.1.1 → 2.0.0.beta1

data/spec/views/hyrax/base/show.json.jbuilder_spec.rb

@@ -1,7 +1,5 @@
-require 'spec_helper'
-
-describe 'hyrax/base/show.json.jbuilder' do
-  let(:curation_concern) { create(:generic_work) }
+RSpec.describe 'hyrax/base/show.json.jbuilder' do
+  let(:curation_concern) { build(:generic_work) }
 
   before do
     allow(curation_concern).to receive(:etag).and_return('W/"87f79d2244ded4239ad1f0e822c8429b1e72b66c"')
@@ -13,7 +11,7 @@ describe 'hyrax/base/show.json.jbuilder' do
     json = JSON.parse(rendered)
     expect(json['id']).to eq curation_concern.id
     expect(json['title']).to match_array curation_concern.title
-    expected_fields = curation_concern.class.fields.select { |f| ![:has_model, :create_date].include? f }
+    expected_fields = curation_concern.class.fields.reject { |f| [:has_model, :create_date].include? f }
     expected_fields << :date_created
     expected_fields.each do |field_symbol|
       expect(json).to have_key(field_symbol.to_s)

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

@@ -1,8 +1,7 @@
-require 'spec_helper'
-
-describe 'hyrax/base/unauthorized.html.erb' do
+RSpec.describe 'hyrax/base/unauthorized.html.erb' do
   context "when it responds to curation_concern" do
     let(:concern) { double(human_readable_type: 'Book', id: '777') }
+
     before do
       allow(view).to receive(:curation_concern).and_return(concern)
       render
@@ -13,6 +12,7 @@ describe 'hyrax/base/unauthorized.html.erb' do
 
     context "and the concern is nil" do
       let(:concern) { nil }
+
       it "shows a message to the user" do
         expect(rendered).to have_content "Unauthorized The page you have tried to access is private"
       end

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

@@ -1,19 +1,18 @@
-require 'spec_helper'
-
-describe 'hyrax/base/unavailable.html.erb', type: :view do
+RSpec.describe 'hyrax/base/unavailable.html.erb', type: :view do
   let(:model) do
     double('model',
            persisted?: true,
            to_param: '123',
            model_name: GenericWork.model_name)
   end
-  let(:workflow) do
-    double('workflow', state: 'deposited', state_label: 'really deposited')
+  let(:workflow_presenter) do
+    double('workflow_presenter',
+           badge: '<span class="label label-primary state state-deposited">really deposited</span>')
   end
   let(:presenter) do
     double('presenter',
            to_s: 'super cool',
-           workflow: workflow,
+           workflow: workflow_presenter,
            human_readable_type: 'Generic Work')
   end
   let(:parent_presenter) do
@@ -22,6 +21,7 @@ describe 'hyrax/base/unavailable.html.erb', type: :view do
            to_model: model,
            human_readable_type: 'Foo Bar')
   end
+
   before do
     assign(:presenter, presenter)
     assign(:parent_presenter, parent_presenter)

data/spec/views/hyrax/batch_edits/check_all_spec.rb

@@ -1,5 +1,5 @@
 
-describe 'hyrax/batch_edits/_check_all.html.erb', type: :view do
+RSpec.describe 'hyrax/batch_edits/_check_all.html.erb', type: :view do
   before do
     allow(controller).to receive(:controller_name).and_return('my')
     view.lookup_context.prefixes.push 'hyrax/my'

data/spec/views/hyrax/batch_edits/edit.html.erb_spec.rb

@@ -1,17 +1,21 @@
-describe 'hyrax/batch_edits/edit.html.erb', type: :view do
-  let(:generic_work) { stub_model(GenericWork, id: '999', depositor: 'bob', rights: ['']) }
+RSpec.describe 'hyrax/batch_edits/edit.html.erb', type: :view do
+  let(:generic_work) { stub_model(GenericWork, id: '999', depositor: 'bob', license: ['']) }
   let(:batch) { ['999'] }
   let(:form) { Hyrax::Forms::BatchEditForm.new(generic_work, nil, batch) }
 
   before do
     allow(ActiveFedora::Base).to receive(:find).and_return(generic_work)
-
+    # TODO: stub_model is not stubbing new_record? correctly on ActiveFedora models.
+    allow(generic_work).to receive(:new_record?).and_return(false)
     # this prevents AF from hitting Fedora (permissions is a related object)
     allow(generic_work).to receive(:permissions_attributes=)
     allow(controller).to receive(:current_user).and_return(stub_model(User))
     allow(form).to receive(:model).and_return(generic_work)
     allow(form).to receive(:names).and_return(['title 1', 'title 2'])
-    allow(form).to receive(:terms).and_return([:description, :rights])
+    allow(form).to receive(:terms).and_return([:description, :license])
+    allow(generic_work).to receive(:visibility).and_return('open')
+    allow(generic_work).to receive(:permissions).and_return([])
+
     assign :form, form
     view.extend Hyrax::PermissionsHelper
     view.lookup_context.prefixes.push "hyrax/base"

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

@@ -1,21 +1,18 @@
-require 'spec_helper'
-
-describe 'hyrax/batch_uploads/_form.html.erb', type: :view do
+RSpec.describe 'hyrax/batch_uploads/_form.html.erb', type: :view do
   let(:work) { GenericWork.new }
   let(:ability) { double('ability', current_user: user) }
   let(:form) { Hyrax::Forms::BatchUploadForm.new(work, ability, controller) }
   let(:user) { stub_model(User) }
+  let(:page) do
+    render
+    Capybara::Node::Simple.new(rendered)
+  end
 
   before do
     stub_template "hyrax/base/_guts4form.html.erb" => "Form guts"
     assign(:form, form)
   end
 
-  let(:page) do
-    render
-    Capybara::Node::Simple.new(rendered)
-  end
-
   it "draws the page" do
     expect(page).to have_selector("form[action='/batch_uploads']")
     expect(page).to have_selector("form[action='/batch_uploads'][data-behavior='work-form']")

data/spec/views/hyrax/citations/work.html.erb_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe 'hyrax/citations/work.html.erb', type: :view do
         creator_tesim: creator,
         license_tesim: ['http://creativecommons.org/licenses/by/3.0/us/'],
         title_tesim: ['the Roared about the Langs'],
-        based_near_tesim: ['London'],
+        based_near_label_tesim: ['London'],
         date_created_tesim: ['1969']
       )
     end

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

@@ -1,24 +1,29 @@
-
-describe 'hyrax/collections/_show_descriptions.html.erb', type: :view do
+RSpec.describe 'hyrax/collections/_show_descriptions.html.erb', type: :view do
   context 'displaying a custom collection' do
     let(:collection_size) { 123_456_678 }
-    let(:collection) { build(:collection, date_created: ['2000-01-01']) }
+    let(:collection) do
+      {
+        id: '999',
+        "has_model_ssim" => ["Collection"],
+        "title_tesim" => ["Title 1"],
+        'date_created_tesim' => '2000-01-01'
+      }
+    end
+    let(:ability) { double }
+    let(:solr_document) { SolrDocument.new(collection) }
+    let(:presenter) { Hyrax::CollectionPresenter.new(solr_document, ability) }
+
     before do
-      view.extend FileSetHelper
       allow(presenter).to receive(:total_items).and_return(2)
       allow(presenter).to receive(:size).and_return("118 MB")
       assign(:presenter, presenter)
     end
 
-    let(:ability) { double }
-    let(:solr_document) { SolrDocument.new(collection.to_solr) }
-    let(:presenter) { Hyrax::CollectionPresenter.new(solr_document, ability) }
-
     it "draws the metadata fields for collection" do
       render
       expect(rendered).to have_content 'Date Created'
       expect(rendered).to include('itemprop="dateCreated"')
-      expect(rendered).to have_content 'Total Items'
+      expect(rendered).to have_content 'Total works'
       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_document_list.html.erb_spec.rb

@@ -1,28 +1,24 @@
+RSpec.describe 'hyrax/collections/_show_document_list.html.erb', type: :view do
+  let(:documents) { ["Hello", "World"] }
 
-describe 'hyrax/collections/_show_document_list.html.erb', type: :view do
-  let(:user) { create(:user) }
-  let(:collection) { mock_model(Collection) }
-
-  let(:file) do
-    FileSet.create(creator: ["ggm"], title: ['One Hundred Years of Solitude']) do |fs|
-      fs.apply_depositor_metadata(user)
-    end
+  before do
+    stub_template('hyrax/collections/_show_document_list_row.html.erb' => "<%= document %>")
   end
-
-  let(:documents) { [file] }
-
   context 'when not logged in' do
-    before do
-      view.blacklight_config = Blacklight::Configuration.new
+    it "renders the documents without an Action section" do
       allow(view).to receive(:current_user).and_return(nil)
-      allow(file).to receive(:title_or_label).and_return("One Hundred Years of Solitude")
-      allow(file).to receive(:edit_people).and_return([])
+      render('hyrax/collections/show_document_list.html.erb', documents: documents)
+      expect(rendered).to have_css('tbody', text: documents.join)
+      expect(rendered).not_to have_css('th', text: 'Action')
     end
+  end
 
-    it "renders collection" do
+  context 'when logged in' do
+    it "renders the documents without an Action section" do
+      allow(view).to receive(:current_user).and_return(true)
       render('hyrax/collections/show_document_list.html.erb', documents: documents)
-      expect(rendered).to have_content 'One Hundred Years of Solitude'
-      expect(rendered).not_to have_content 'Action'
+      expect(rendered).to have_css('tbody', text: documents.join)
+      expect(rendered).not_to have_css('th', text: 'Action')
     end
   end
 end

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

@@ -1,5 +1,4 @@
-
-describe 'hyrax/collections/_show_document_list_row.html.erb', type: :view do
+RSpec.describe 'hyrax/collections/_show_document_list_row.html.erb', type: :view do
   let(:user) { create(:user) }
 
   let(:work) do

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

@@ -1,4 +1,4 @@
-describe 'hyrax/collections/show.html.erb', type: :view do
+RSpec.describe 'hyrax/collections/show.html.erb', type: :view do
   let(:document) do
     SolrDocument.new(id: 'xyz123z4',
                      'title_tesim' => ['Make Collections Great Again'],
@@ -8,15 +8,14 @@ describe 'hyrax/collections/show.html.erb', type: :view do
   let(:presenter) { Hyrax::CollectionPresenter.new(document, ability) }
 
   before do
-    view.extend FileSetHelper
     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(true)
     allow(view).to receive(:can?).with(:destroy, document).and_return(true)
+    allow(presenter).to receive(:total_items).and_return(0)
     assign(:presenter, presenter)
 
     # Stub route because view specs don't handle engine routes
-    allow(view).to receive(:edit_collection_path).and_return("/collection/123/edit")
     allow(view).to receive(:collection_path).and_return("/collection/123")
 
     stub_template '_search_form.html.erb' => 'search form'
@@ -28,10 +27,6 @@ describe 'hyrax/collections/show.html.erb', type: :view do
   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'
     expect(rendered).to match '<span class="fa fa-cubes collection-icon-search"></span>'
   end
 end

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

@@ -0,0 +1,105 @@
+RSpec.describe 'hyrax/dashboard/_sidebar.html.erb', type: :view do
+  let(:user) { stub_model(User, user_key: 'mjg', name: 'Foobar') }
+  let(:read_admin_dashboard) { false }
+  let(:manage_any_admin_set) { false }
+  let(:review_submissions) { false }
+  let(:manage_user) { false }
+  let(:update_appearance) { false }
+  let(:manage_feature) { false }
+  let(:manage_workflow) { false }
+
+  before do
+    allow(view).to receive(:signed_in?).and_return(true)
+    allow(view).to receive(:current_user).and_return(user)
+    assign(:user, user)
+    allow(view).to receive(:can?).with(:read, :admin_dashboard).and_return(read_admin_dashboard)
+    allow(view).to receive(:can?).with(:manage_any, AdminSet).and_return(manage_any_admin_set)
+    allow(view).to receive(:can?).with(:review, :submissions).and_return(review_submissions)
+    allow(view).to receive(:can?).with(:manage, User).and_return(manage_user)
+    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)
+  end
+
+  context 'with any user' do
+    before { render }
+    subject { rendered }
+
+    it { is_expected.to have_content 'Foobar' }
+    it { is_expected.to have_content t('hyrax.admin.sidebar.activity') }
+    it { is_expected.to have_content t('hyrax.admin.sidebar.user_activity') }
+    it { is_expected.to have_link t('hyrax.admin.sidebar.profile') }
+    it { is_expected.to have_link t('hyrax.admin.sidebar.notifications') }
+    it { is_expected.to have_link t('hyrax.admin.sidebar.transfers') }
+    it { is_expected.to have_link t('hyrax.admin.sidebar.collections') }
+    it { is_expected.to have_link t('hyrax.admin.sidebar.works') }
+  end
+
+  context 'with a user who can read the admin dash' do
+    let(:read_admin_dashboard) { true }
+
+    before { render }
+    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') }
+  end
+
+  context 'with a user who can review submissions' do
+    let(:review_submissions) { true }
+
+    before { render }
+    subject { rendered }
+
+    it { is_expected.to have_link t('hyrax.admin.sidebar.workflow_review') }
+  end
+
+  context 'with a user who can manage users' do
+    let(:manage_user) { true }
+
+    before { render }
+    subject { rendered }
+
+    it { is_expected.to have_link t('hyrax.admin.sidebar.users') }
+  end
+
+  context 'with a user who can update appearance' do
+    let(:update_appearance) { 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.appearance') }
+  end
+
+  context 'with a user who can manage features' do
+    let(:manage_feature) { 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.pages') }
+    it { is_expected.to have_link t('hyrax.admin.sidebar.content_blocks') }
+    it { is_expected.to have_link t('hyrax.admin.sidebar.technical') }
+  end
+
+  context 'with a user who can manage workflow' do
+    let(:manage_workflow) { 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.workflow_roles') }
+  end
+end

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

@@ -0,0 +1,56 @@
+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) }
+
+  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)
+    # 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([])
+  end
+
+  context 'with secondary terms' do
+    let(:additional_fields) { true }
+
+    before do
+      render
+    end
+    it "draws the metadata fields for collection" do
+      expect(rendered).to have_selector("input#collection_title")
+      expect(rendered).to have_selector("span.required-tag", text: "required")
+      expect(rendered).not_to have_selector("div#additional_title.multi_value")
+      expect(rendered).to have_selector("input#collection_creator.multi_value")
+      expect(rendered).to have_selector("textarea#collection_description")
+      expect(rendered).to have_selector("input#collection_contributor")
+      expect(rendered).to have_selector("input#collection_keyword")
+      expect(rendered).to have_selector("input#collection_subject")
+      expect(rendered).to have_selector("input#collection_publisher")
+      expect(rendered).to have_selector("input#collection_date_created")
+      expect(rendered).to have_selector("input#collection_language")
+      expect(rendered).to have_selector("input#collection_identifier")
+      expect(rendered).to have_selector("input#collection_based_near")
+      expect(rendered).to have_selector("input#collection_related_url")
+      expect(rendered).to have_selector("select#collection_license")
+      expect(rendered).to have_selector("select#collection_resource_type")
+      expect(rendered).not_to have_selector("input#collection_visibility")
+      expect(rendered).to have_content('Additional fields')
+    end
+  end
+  context 'with no secondary terms' do
+    let(:additional_fields) { false }
+
+    before do
+      render
+    end
+    it 'does not render additional fields button' do
+      expect(rendered).not_to have_content('Additional fields')
+    end
+  end
+end

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

@@ -0,0 +1,55 @@
+RSpec.describe 'hyrax/dashboard/collections/_form_for_select_collection.html.erb', type: :view do
+  let(:collections) do
+    [
+      { id: 1234, create_date: Time.zone.parse('Thu, 13 Aug 2015 14:20:22 +0100') },
+      { id: 1235, create_date: Time.zone.parse('Thu, 13 Aug 2015 14:18:22 +0100') },
+      { id: 1236, create_date: Time.zone.parse('Thu, 13 Aug 2015 14:16:22 +0100') },
+      { id: 1237, create_date: Time.zone.parse('Thu, 13 Aug 2015 14:29:22 +0100') }
+    ]
+  end
+  let(:solr_collections) do
+    collections.map do |c|
+      doc = { id: c[:id],
+              "has_model_ssim" => ["Collection"],
+              "title_tesim" => ["Title 1"],
+              "system_create_dtsi" => c[:create_date].to_s }
+      SolrDocument.new(doc)
+    end
+  end
+
+  let(:doc) { Nokogiri::HTML(rendered) }
+
+  before do
+    # Stub route because view specs don't handle engine routes
+    allow(view).to receive(:collection_path).and_return("/collection/123")
+    allow(view).to receive(:new_dashboard_collection_path).and_return("/collection/new")
+
+    allow(view).to receive(:user_collections).and_return(solr_collections)
+  end
+
+  it "sorts the collections" 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\"]")
+  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
+
+  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']"
+  end
+end