hyrax 2.1.0 → 2.2.0

data/spec/features/batch_create_spec.rb

@@ -39,7 +39,7 @@ RSpec.describe 'Batch creation of works', type: :feature do
     it "allows on-behalf-of batch deposit", :js do
       click_link "Files" # switch tab
       expect(page).to have_content "Add files"
-      within('span#addfiles') do
+      within('button#addfiles') do
         # two arbitrary files that aren't actually related, but should be
         # small enough to require minimal processessing.
         attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/small_file.txt", visible: false)

data/spec/features/create_work_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe 'Creating a new Work', :js, :workflow do
       click_link "Files" # switch tab
       expect(page).to have_content "Add files"
       expect(page).to have_content "Add folder"
-      within('span#addfiles') do
+      within('button#addfiles') do
         attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/image.jp2", visible: false)
         attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/jp2_fits.xml", visible: false)
       end
@@ -71,7 +71,7 @@ RSpec.describe 'Creating a new Work', :js, :workflow do
     it "allows on-behalf-of deposit" do
       click_link "Files" # switch tab
       expect(page).to have_content "Add files"
-      within('span#addfiles') do
+      within('button#addfiles') do
         attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/image.jp2", visible: false)
         attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/jp2_fits.xml", visible: false)
       end
@@ -101,4 +101,24 @@ RSpec.describe 'Creating a new Work', :js, :workflow do
       expect(page).to have_content "My Test Work"
     end
   end
+
+  context "when a file uploaded and then deleted" do
+    before do
+      sign_in user
+      click_link 'Works'
+      click_link "Add new work"
+      choose "payload_concern", option: "GenericWork"
+      click_button 'Create work'
+    end
+
+    it 'updates the required file check status' do
+      click_link "Files" # switch to the Files tab
+      within('button#addfiles') do
+        attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/image.jp2", visible: false)
+      end
+      expect(page).to have_css('ul li#required-files.complete', text: 'Add files')
+      click_button 'Delete' # delete the file
+      expect(page).to have_css('ul li#required-files.incomplete', text: 'Add files')
+    end
+  end
 end

data/spec/features/dashboard/collection_spec.rb

@@ -631,14 +631,14 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
       it "preselects the collection we are adding works to and adds the selected works" do
         visit "/dashboard/collections/#{collection1.id}"
         click_link 'Add existing works'
-        first('input#check_all').click
+        find('input#check_all').click
         click_button "Add to collection"
         expect(page).to have_selector "#member_of_collection_ids[value=\"#{collection1.id}\"]", visible: false
         expect(page).to have_selector "#member_of_collection_label[value=\"#{collection1.title.first}\"]"
 
         visit "/dashboard/collections/#{collection2.id}"
         click_link 'Add existing works'
-        first('input#check_all').click
+        find('input#check_all').click
         click_button "Add to collection"
         expect(page).to have_selector "#member_of_collection_ids[value=\"#{collection2.id}\"]", visible: false
         expect(page).to have_selector "#member_of_collection_label[value=\"#{collection2.title.first}\"]"
@@ -671,7 +671,7 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
 
         # add required file
         click_link "Files" # switch tab
-        within('span#addfiles') do
+        within('button#addfiles') do
           attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/image.jp2", visible: false)
         end
         # set required metadata

data/spec/features/homepage_spec.rb

@@ -1,5 +1,6 @@
-RSpec.describe "The homepage" do
-  let(:work1) { create(:work, :public, title: ['Work 1']) }
+RSpec.describe "The homepage", :clean_repo do
+  let(:work1) { create(:work, :public, title: ["Work 1"], date_uploaded: (DateTime.current - 1.day)) }
+  let(:work2) { create(:work, :public, title: ["Work 2"], date_uploaded: (DateTime.current - 1.year)) }
 
   before do
     create(:featured_work, work_id: work1.id)
@@ -7,7 +8,22 @@ RSpec.describe "The homepage" do
 
   it 'shows featured works' do
     visit root_path
-    expect(page).to have_link "Work 1"
+    expect(page).to have_link work1.title.first
+  end
+
+  it 'shows recently uploaded' do
+    visit root_path
+    click_link("Recently Uploaded")
+    within '#recently_uploaded' do
+      # Expect to see the one with "date uploaded" of yesterday
+      expect(page).to have_link work1.title.first
+      # Do not expect to see the one with "date uploaded" of last year.
+      expect(page).not_to have_link work2.title.first
+      # Expect the system create of work2 to be later than that of work1.
+      # This helps verify that 'recently uploaded' is looking at
+      # 'date_uploaded_dtsi'  and not 'system_create_dtsi'.
+      expect(DateTime.parse(work2.to_solr['system_create_dtsi']).getlocal).to be >= DateTime.parse(work1.to_solr['system_create_dtsi']).getlocal
+    end
   end
 
   context "as an admin" do
@@ -20,7 +36,7 @@ RSpec.describe "The homepage" do
     it 'shows featured works that I can sort' do
       visit root_path
       within '.dd-item' do
-        expect(page).to have_link "Work 1"
+        expect(page).to have_link work1.title.first
       end
     end
   end

data/spec/javascripts/save_work_spec.js

@@ -173,6 +173,56 @@ describe("SaveWorkControl", function() {
 
   });
 
+  describe('isSaveButtonEnabled helper method', function() {
+    const form_id = 'new_generic_work';
+    let buildTarget = function(form_id) {
+      let buildFixture = function(id) {
+        return setFixtures(
+          `<form id="${id}">
+            <aside id="form-progress">
+              <ul>
+                <li id="required-metadata"></li>
+                <li id="required-files"></li>
+                <li id="required-agreement"></li>
+              </ul>
+              <input type="checkbox" name="agreement" id="agreement" value="1" required="required" checked="checked" />
+              <input type="submit">
+            </aside>
+          </form>`
+        );
+      };
+      target = new SaveWorkControl(buildFixture(form_id).find('#form-progress'));
+      return target;
+    };
+
+    describe('returns a boolean value of', function() {
+      beforeEach(function() {
+        target = buildTarget(form_id);
+        target.uploads = {
+          hasFiles: true,
+          hasFileRequirement: true,
+          // mock current uploads getter value
+          inProgress: false
+        };
+      });
+
+      it('true when the form is valid and there are no in progress uploads', () => {
+        expect(target.isSaveButtonEnabled).toBeTruthy();
+      });
+      
+      it('false when required files have not been added to the form', () => {
+        target.uploads.hasFiles = false;
+        expect(target.isSaveButtonEnabled).toBeFalsy();
+      });
+
+      it('false when file uploads are still in progress', () => {
+        target.uploads.inProgress = true;
+        expect(target.isSaveButtonEnabled).toBeFalsy();
+      });
+    });
+  });
+
+
   describe("on submit", function() {
     var target;
     beforeEach(function() {

data/spec/jobs/import_url_job_spec.rb

@@ -20,10 +20,14 @@ RSpec.describe ImportUrlJob do
   before do
     allow(Hyrax::Actors::FileSetActor).to receive(:new).with(file_set, user).and_return(actor)
 
-    response_headers = { 'Content-Type' => 'image/png', 'Content-Length' => File.size(File.expand_path(file_path, __FILE__)) }
-
-    stub_request(:head, "http://example.org#{file_hash}").to_return(
-      body: "", status: 200, headers: response_headers
+    response_headers = {
+      'Content-Type' => 'image/png',
+      'Content-Length' => 1,
+      'Content-Range' => "0-0/#{File.size(File.expand_path(file_path, __FILE__))}"
+    }
+
+    stub_request(:get, "http://example.org#{file_hash}").with(headers: { 'Range' => 'bytes=0-0' }).to_return(
+      body: File.open(File.expand_path(file_path, __FILE__)).read(1), status: 206, headers: response_headers
     )
 
     stub_request(:get, "http://example.org#{file_hash}").to_return(
@@ -97,10 +101,8 @@ RSpec.describe ImportUrlJob do
 
   context 'when the remote file is unavailable' do
     before do
-      response_headers = { 'Content-Type' => 'image/png', 'Content-Length' => File.size(File.expand_path(file_path, __FILE__)) }
-
-      stub_request(:head, "http://example.org#{file_hash}").to_return(
-        body: "", status: 404, headers: response_headers
+      stub_request(:get, "http://example.org#{file_hash}").with(headers: { 'Range' => 'bytes=0-0' }).to_return(
+        body: '', status: 406, headers: {}
       )
     end
 

data/spec/lib/hyrax_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+RSpec.describe Hyrax do
+  describe '.logger' do
+    it 'is a Logger' do
+      expect(described_class.logger).to respond_to :log
+    end
+  end
+end

data/spec/models/flipflop_spec.rb

@@ -38,4 +38,12 @@ RSpec.describe Flipflop do
       is_expected.to be false
     end
   end
+
+  describe "hide_users_list?" do
+    subject { described_class.hide_users_list? }
+
+    it "defaults to true" do
+      is_expected.to be true
+    end
+  end
 end

data/spec/models/solr_document_spec.rb

@@ -31,7 +31,7 @@ RSpec.describe ::SolrDocument, type: :model do
       let(:attributes) { { 'date_uploaded_dtsi' => 'Test' } }
 
       it "logs parse errors" do
-        expect(ActiveFedora::Base.logger).to receive(:info).with(/Unable to parse date.*/)
+        expect(Hyrax.logger).to receive(:info).with(/Unable to parse date.*/)
         subject
       end
     end
@@ -59,7 +59,7 @@ RSpec.describe ::SolrDocument, type: :model do
       let(:attributes) { { 'system_create_dtsi' => 'Test' } }
 
       it "logs parse errors" do
-        expect(ActiveFedora::Base.logger).to receive(:info).with(/Unable to parse date.*/)
+        expect(Hyrax.logger).to receive(:info).with(/Unable to parse date.*/)
         subject
       end
     end

data/spec/presenters/hyrax/admin_stats_presenter_spec.rb

@@ -16,6 +16,20 @@ RSpec.describe Hyrax::AdminStatsPresenter do
       expect(Hyrax::Statistics::Works::ByDepositor).to receive(:query).with(limit: limit).and_return(:query_response)
       expect(service.active_users).to eq(:query_response)
     end
+
+    context 'with alternatate class' do
+      subject(:service) do
+        described_class.new(filters, limit, by_depositor: by_depositor_class)
+      end
+
+      let(:by_depositor_class) { spy('ByDepositor') }
+
+      it 'retrieves active_users from the class' do
+        service.active_users
+
+        expect(by_depositor_class).to have_received(:query).with(limit: limit)
+      end
+    end
   end
 
   describe "#top_formats" do
@@ -23,6 +37,20 @@ RSpec.describe Hyrax::AdminStatsPresenter do
       expect(Hyrax::Statistics::FileSets::ByFormat).to receive(:query).with(limit: limit).and_return(:query_response)
       expect(service.top_formats).to eq(:query_response)
     end
+
+    context 'with alternatate class' do
+      subject(:service) do
+        described_class.new(filters, limit, by_format: by_format)
+      end
+
+      let(:by_format) { spy('ByFormat') }
+
+      it 'retrieves formats from the class' do
+        service.top_formats
+
+        expect(by_format).to have_received(:query).with(limit: limit)
+      end
+    end
   end
 
   describe "#works_count" do
@@ -30,6 +58,19 @@ RSpec.describe Hyrax::AdminStatsPresenter do
       expect(Hyrax::Statistics::Works::Count).to receive(:by_permission).with(start_date: service.start_date, end_date: service.end_date).and_return(:query_response)
       expect(service.works_count).to eq(:query_response)
     end
+
+    context 'with alternatate class' do
+      subject(:service)   { described_class.new(filters, limit, works_counter: works_counter) }
+      let(:works_counter) { spy('Works::Count') }
+
+      it 'retrieves count from the class' do
+        service.works_count
+
+        expect(works_counter)
+          .to have_received(:by_permission)
+          .with(start_date: service.start_date, end_date: service.end_date)
+      end
+    end
   end
 
   describe "#depositors" do
@@ -37,6 +78,22 @@ RSpec.describe Hyrax::AdminStatsPresenter do
       expect(Hyrax::Statistics::Depositors::Summary).to receive(:depositors).with(start_date: service.start_date, end_date: service.end_date).and_return(:query_response)
       expect(service.depositors).to eq(:query_response)
     end
+
+    context 'with alternatate class' do
+      subject(:service) do
+        described_class.new(filters, limit, depositor_summary: summary_class)
+      end
+
+      let(:summary_class) { spy('depositor summary class') }
+
+      it 'retrieves depositors from the class' do
+        service.depositors
+
+        expect(summary_class)
+          .to have_received(:depositors)
+          .with(start_date: service.start_date, end_date: service.end_date)
+      end
+    end
   end
 
   describe "#recent_users" do
@@ -44,6 +101,22 @@ RSpec.describe Hyrax::AdminStatsPresenter do
       expect(Hyrax::Statistics::SystemStats).to receive(:recent_users).with(limit: limit, start_date: service.start_date, end_date: service.end_date).and_return(:query_response)
       expect(service.recent_users).to eq(:query_response)
     end
+
+    context 'with alternatate class' do
+      subject(:service) do
+        described_class.new(filters, limit, system_stats: system_stats)
+      end
+
+      let(:system_stats) { spy('SystemStats') }
+
+      it 'retrieves users from the class' do
+        service.recent_users
+
+        expect(system_stats)
+          .to have_received(:recent_users)
+          .with(limit: limit, start_date: service.start_date, end_date: service.end_date)
+      end
+    end
   end
 
   describe '#date_filter_string' do

data/spec/search_builders/hyrax/my/works_search_builder_spec.rb

@@ -24,7 +24,6 @@ RSpec.describe Hyrax::My::WorksSearchBuilder do
 
     it "filters works that we are the depositor of" do
       expect(subject).to eq ["{!terms f=has_model_ssim}GenericWork",
-                             "-suppressed_bsi:true",
                              "depositor"]
     end
   end
@@ -44,7 +43,6 @@ RSpec.describe Hyrax::My::WorksSearchBuilder do
         :add_group_config_to_solr,
         :add_facet_paging_to_solr,
         :filter_models,
-        :only_active_works,
         :show_only_resources_deposited_by_current_user
       ]
     end

data/spec/services/hyrax/graph_exporter_spec.rb

@@ -36,5 +36,23 @@ RSpec.describe Hyrax::GraphExporter do
         expect { subject }.to raise_error ActiveFedora::ObjectNotFoundError
       end
     end
+
+    context 'with a nested work' do
+      let(:work) do
+        NamespacedWorks::NestedWork
+          .create(title: ['Comet in Moominland'],
+                  created_attributes: [{ start: DateTime.now.utc - 1, finish: DateTime.now.utc },
+                                       { start: DateTime.now.utc - 2, finish: DateTime.now.utc }])
+      end
+
+      it 'includes each nested resources once' do
+        resource_fragments = work.created.map { |ts| ts.rdf_subject.fragment }
+        mapped_fragments   = subject.query(predicate: RDF.type, object: RDF::Vocab::EDM.TimeSpan)
+                                    .subjects
+                                    .map(&:fragment)
+
+        expect(mapped_fragments).to contain_exactly(*resource_fragments)
+      end
+    end
   end
 end

data/spec/services/hyrax/qa_select_service_spec.rb

@@ -1,21 +1,4 @@
 RSpec.describe Hyrax::QaSelectService do
-  let(:authority) do
-    # Implementing an ActiveRecord interface as required for this spec
-    Class.new do
-      def initialize(map)
-        @map = map
-      end
-
-      def all
-        @map
-      end
-
-      def find(id)
-        @map.detect { |item| item[:id] == id }
-      end
-    end
-    # rubocop:enable RSpec/InstanceVariable
-  end
   let(:authority_map) do
     [
       HashWithIndifferentAccess.new(term: 'Active Label', label: 'Active Label', id: 'active-id', active: true),
@@ -23,6 +6,8 @@ RSpec.describe Hyrax::QaSelectService do
       HashWithIndifferentAccess.new(label: 'Active No Term', id: 'active-no-term-id', active: true)
     ]
   end
+
+  let(:authority) { FakeAuthority }
   let(:authority_name) { 'respect_my' }
   let(:qa_select_service) { described_class.new(authority_name) }
 
@@ -44,6 +29,16 @@ RSpec.describe Hyrax::QaSelectService do
     it 'will be Array of Arrays<label, id>' do
       expect(subject).to eq([['Active Label', 'active-id'], ['Active No Term', 'active-no-term-id']])
     end
+
+    context 'when a key has no active property' do
+      let(:no_state) { HashWithIndifferentAccess.new(term: 'term', label: 'label', id: 'no-state') }
+
+      before { authority_map << no_state }
+
+      it 'raises KeyError' do
+        expect { subject }.to raise_error(KeyError)
+      end
+    end
   end
 
   describe '#label' do
@@ -83,4 +78,32 @@ RSpec.describe Hyrax::QaSelectService do
       end
     end
   end
+
+  describe '#include_current_value' do
+    let(:render_opts) { [] }
+    let(:html_opts)   { { class: 'moomin' } }
+
+    let(:authority_map) do
+      [
+        HashWithIndifferentAccess.new(term: 'Active Label', label: 'Active Label', id: 'active-id', active: true),
+        HashWithIndifferentAccess.new(term: 'Inactive Label', label: 'Inactive Label', id: 'inactive-id', active: false),
+        HashWithIndifferentAccess.new(label: 'Inactive No Term', id: 'inactive-no-term-id', active: false)
+      ]
+    end
+
+    it 'adds an inactive current value' do
+      expect(qa_select_service.include_current_value('inactive-id', :idx, render_opts, html_opts))
+        .to eq [[['Inactive Label', 'inactive-id']], { class: 'moomin force-select' }]
+    end
+
+    it 'adds an inactive current value with fallback label' do
+      expect(qa_select_service.include_current_value('inactive-no-term-id', :idx, render_opts, html_opts))
+        .to eq [[['inactive-no-term-id', 'inactive-no-term-id']], { class: 'moomin force-select' }]
+    end
+
+    it 'does not add an active current value' do
+      expect(qa_select_service.include_current_value('active-id', :idx, render_opts.dup, html_opts.dup))
+        .to eq [render_opts, html_opts]
+    end
+  end
 end