hyrax 3.0.0.pre.beta2 → 3.0.0.pre.beta3

data/spec/support/matchers/embargo.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+RSpec::Matchers.define :be_an_embargo_matching do |embargo_args|
+  match do |embargo|
+    (embargo.visibility_after_embargo == embargo_args[:after]) &&
+      (embargo.visibility_during_embargo == embargo_args[:during]) &&
+      embargo.embargo_release_date.to_s.start_with?(embargo_args[:release_date][0..9])
+  end
+end

data/spec/support/matchers/lease.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+RSpec::Matchers.define :be_a_lease_matching do |lease_args|
+  match do |lease|
+    (lease.visibility_after_lease == lease_args[:after]) &&
+      (lease.visibility_during_lease == lease_args[:during]) &&
+      lease.lease_expiration_date.to_s.start_with?(lease_args[:release_date][0..9])
+  end
+end

data/spec/support/matchers/match_valkyrie_ids_with_af_ids.rb

@@ -0,0 +1,11 @@
+module Hyrax::Matchers
+  class MatchValkyrieIdsWithActiveFedoraIds < RSpec::Matchers::BuiltIn::ContainExactly
+    def match_when_sorted?
+      values_match?(safe_sort(expected), safe_sort(actual.map(&:id)))
+    end
+  end
+
+  def match_valkyrie_ids_with_active_fedora_ids(expected_fedora_ids)
+    MatchValkyrieIdsWithActiveFedoraIds.new(expected_fedora_ids)
+  end
+end

data/spec/support/matchers/permission.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+RSpec::Matchers.define :grant_permission do |acl_type|
+  match do |permission|
+    access_match = permission.access == acl_type.to_s
+    agent_match =
+      if user_id
+        permission.type == 'person' &&
+          permission.agent.first.id.include?(user_id)
+      elsif group_id
+        permission.type == 'group' &&
+          permission.agent.first.id.include?(group_id)
+      else
+        true
+      end
+
+    return access_match && agent_match
+  end
+
+  chain :to_user,  :user_id
+  chain :to_group, :group_id
+end

data/spec/support/valkyrie_indexing.rb

@@ -0,0 +1 @@
+VALKYRIE_SOLR_TEST_URL = "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8984}/solr/valkyrie-test-core".freeze

data/spec/test_app_templates/Gemfile.extra

@@ -4,5 +4,3 @@ group :development do
   gem 'better_errors'
   gem 'binding_of_caller'
 end
-
-gem 'bootsnap', require: false

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -5,12 +5,6 @@ class TestAppGenerator < Rails::Generators::Base
   # so the following path gets us to /path/to/hyrax/spec/test_app_templates/
   source_root File.expand_path('../../../../spec/test_app_templates/', __FILE__)
 
-  def require_bootsnap
-    inject_into_file 'config/boot.rb', after: "require 'bundler/setup' # Set up gems listed in the Gemfile.\n" do
-      "require 'bootsnap/setup'\n"
-    end
-  end
-
   def install_engine
     generate 'hyrax:install', '-f'
   end
@@ -128,4 +122,9 @@ class TestAppGenerator < Rails::Generators::Base
               "development:\n  adapter: async",
               "development:\n  adapter: redis\n  url: redis://localhost:6379"
   end
+
+  def install_universal_viewer
+    system './bin/yarn install'
+  end
+
 end

data/spec/valkyrie/indexing/solr/indexing_adapter_spec.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+require 'spec_helper'
+require 'valkyrie/indexing/solr/indexing_adapter'
+
+RSpec.describe Valkyrie::Indexing::Solr::IndexingAdapter, :clean_index do
+  subject(:adapter) { Valkyrie::IndexingAdapter.find(:solr_index) }
+  let(:persister) { Wings::Valkyrie::Persister.new(adapter: metadata_adapter) }
+  let(:metadata_adapter) { Wings::Valkyrie::MetadataAdapter.new }
+  let(:resource) { FactoryBot.create_for_repository(:hyrax_resource) }
+  let(:resource2) { FactoryBot.create_for_repository(:hyrax_resource) }
+
+  describe "#connection" do
+    it "returns connection" do
+      expect(adapter.connection.uri.to_s).to include 'valkyrie-test'
+    end
+  end
+
+  it "can save a resource" do
+    adapter.save(resource: resource)
+    expect(Hyrax::SolrService.query("*:*", use_valkyrie: true).map(&:id)).to eq [resource.id.to_s]
+  end
+
+  it "can save multiple resources at once" do
+    adapter.save_all(resources: [resource, resource2])
+    expect(Hyrax::SolrService.query("*:*", use_valkyrie: true).map(&:id)).to contain_exactly resource.id.to_s, resource2.id.to_s
+  end
+
+  it "can delete an object" do
+    adapter.save(resource: resource)
+    expect(Hyrax::SolrService.query("*:*", use_valkyrie: true).count).to eq 1
+    adapter.delete(resource: resource)
+    expect(Hyrax::SolrService.query("*:*", use_valkyrie: true).count).to eq 0
+  end
+
+  it "can delete all objects" do
+    adapter.save_all(resources: [resource, resource2])
+    expect(Hyrax::SolrService.query("*:*", use_valkyrie: true).count).to eq 2
+    adapter.wipe!
+    expect(Hyrax::SolrService.query("*:*", use_valkyrie: true).count).to eq 0
+  end
+end

data/spec/valkyrie/indexing_adapter_spec.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+require 'valkyrie/indexing_adapter'
+
+RSpec.describe Valkyrie::IndexingAdapter do
+  let(:adapter) do
+    Class.new { ; }
+  end
+
+  describe ".register" do
+    it "registers an adapter to a short name" do
+      described_class.register adapter, :test_adapter
+
+      expect(described_class.find(:test_adapter)).to eq adapter
+    end
+  end
+
+  describe '.find' do
+    subject(:find) { described_class.find(:huh?) }
+    context 'when no adapter is registered' do
+      it 'raises an error' do
+        expect { find }.to raise_error "Unable to find unregistered adapter `huh?'"
+      end
+    end
+  end
+end

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

@@ -7,7 +7,7 @@ RSpec.describe 'hyrax/base/_attributes.html.erb' do
   let(:solr_document) { SolrDocument.new(attributes) }
   let(:attributes) do
     {
-      ActiveFedora.index_field_mapper.solr_name('has_model', :symbol) => ["GenericWork"],
+      has_model_ssim: ["GenericWork"],
       subject_tesim: subject,
       contributor_tesim: contributor,
       creator_tesim: creator,

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

@@ -10,7 +10,6 @@ RSpec.describe 'hyrax/base/_social_media.html.erb', type: :view do
     expect(page).to have_selector '.resp-sharing-button__link'
     expect(page).to have_link '', href: 'https://facebook.com/sharer/sharer.php?u=http%3A%2F%2Fexample.com%2F'
     expect(page).to have_link '', href: 'https://twitter.com/intent/tweet/?text=Example&url=http%3A%2F%2Fexample.com%2F'
-    expect(page).to have_link '', href: 'https://plus.google.com/share?url=http%3A%2F%2Fexample.com%2F'
     expect(page).to have_link '', href: 'https://www.tumblr.com/widgets/share/tool?canonicalUrl=http%3A%2F%2Fexample.com%2F&posttype=link&shareSource=tumblr_share_button'
   end
 end

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

@@ -80,7 +80,7 @@ RSpec.describe 'hyrax/base/show.html.erb', type: :view do
       let(:viewer_enabled) { true }
 
       it 'renders the UniversalViewer' do
-        expect(page).to have_selector 'div.viewer'
+        expect(page).to have_selector 'div.viewer-wrapper'
       end
     end
 
@@ -88,7 +88,7 @@ RSpec.describe 'hyrax/base/show.html.erb', type: :view do
       let(:viewer_enabled) { false }
 
       it 'omits the UniversalViewer' do
-        expect(page).not_to have_selector 'div.viewer'
+        expect(page).not_to have_selector 'div.viewer-wrapper'
       end
     end
   end

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

@@ -1,5 +1,5 @@
 RSpec.describe 'hyrax/collections/_sort_and_per_page.html.erb', type: :view do
-  let(:subject) { 'hyrax/collections/sort_and_per_page.html.erb' }
+  let(:subject) { 'hyrax/collections/sort_and_per_page' }
   let(:collection) { instance_double(Collection) }
 
   before do

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

@@ -129,4 +129,43 @@ RSpec.describe 'hyrax/dashboard/_sidebar.html.erb', type: :view do
 
     it { is_expected.not_to have_link t('hyrax.dashboard.manage_proxies') }
   end
+
+  context 'when sidebar partials are configured' do
+    around do |example|
+      original_partials = Hyrax::DashboardController.sidebar_partials.deep_dup
+      example.call
+      Hyrax::DashboardController.sidebar_partials = original_partials
+    end
+
+    # Show configuration menu
+    let(:manage_feature) { true }
+
+    it 'renders custom activity partials' do
+      stub_template "hyrax/dashboard/sidebar/_custom_activity.html.erb" => "Custom Activity Item"
+      Hyrax::DashboardController.sidebar_partials[:activity] << "hyrax/dashboard/sidebar/custom_activity"
+      render
+      expect(rendered).to have_content "Custom Activity Item"
+    end
+
+    it 'renders custom configuration partials' do
+      stub_template "hyrax/dashboard/sidebar/_custom_configuration.html.erb" => "Custom Configuration Item"
+      Hyrax::DashboardController.sidebar_partials[:configuration] << "hyrax/dashboard/sidebar/custom_configuration"
+      render
+      expect(rendered).to have_content "Custom Configuration Item"
+    end
+
+    it 'renders custom repository content partials' do
+      stub_template "hyrax/dashboard/sidebar/_custom_repository_content.html.erb" => "Custom Repository Content Item"
+      Hyrax::DashboardController.sidebar_partials[:repository_content] << "hyrax/dashboard/sidebar/custom_repository_content"
+      render
+      expect(rendered).to have_content "Custom Repository Content Item"
+    end
+
+    it 'renders custom tasks partials' do
+      stub_template "hyrax/dashboard/sidebar/_custom_task.html.erb" => "Custom Task Item"
+      Hyrax::DashboardController.sidebar_partials[:tasks] << "hyrax/dashboard/sidebar/custom_task"
+      render
+      expect(rendered).to have_content "Custom Task Item"
+    end
+  end
 end

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

@@ -1,5 +1,5 @@
 RSpec.describe 'hyrax/dashboard/collections/_sort_and_per_page.html.erb', type: :view do
-  let(:subject) { 'hyrax/dashboard/collections/sort_and_per_page.html.erb' }
+  let(:subject) { 'hyrax/dashboard/collections/sort_and_per_page' }
   let(:collection) { instance_double(Collection) }
 
   before do

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

@@ -2,6 +2,7 @@ RSpec.describe 'hyrax/file_sets/_versioning.html.erb', type: :view do
   let(:file_set) { stub_model(FileSet) }
 
   before do
+    allow(file_set).to receive(:files).and_return([])
     allow(view).to receive(:curation_concern).and_return(file_set)
     assign(:version_list, [])
     render

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

@@ -53,7 +53,7 @@ RSpec.describe 'hyrax/my/collections/_list_collections.html.erb', type: :view do
       expect(rendered).to have_css '.collection_type', text: 'User Collection'
       expect(rendered).to have_selector '.expanded-details', text: 'Collection Description'
       expect(rendered).not_to have_selector 'span.fa-cubes'
-      expect(rendered).to have_selector '.thumbnail-wrapper > img[alt="Collection"]'
+      expect(rendered).to have_selector '.thumbnail-wrapper > img'
       expect(rendered).to include Date.parse(modified_date).to_formatted_s(:standard)
     end
   end
@@ -102,7 +102,7 @@ RSpec.describe 'hyrax/my/collections/_list_collections.html.erb', type: :view do
       expect(rendered).to have_css '.collection_type', text: 'Admin Set'
       expect(rendered).to have_selector '.expanded-details', text: 'Admin Description'
       expect(rendered).not_to have_selector 'span.fa-cubes'
-      expect(rendered).to have_selector '.thumbnail-wrapper > img[alt="Collection"]'
+      expect(rendered).to have_selector '.thumbnail-wrapper > img'
       expect(rendered).to include Date.parse(modified_date).to_formatted_s(:standard)
     end
   end

data/spec/views/records/edit_fields/_alt_title.html.erb_spec.rb

@@ -0,0 +1,26 @@
+RSpec.describe 'records/edit_fields/_title.html.erb', type: :view do
+  let(:work) { GenericWork.new }
+  let(:form) { Hyrax::GenericWorkForm.new(work, nil, controller) }
+
+  let(:form_template) do
+    %(
+      <%= simple_form_for [main_app, @form] do |f| %>
+        <%= render "records/edit_fields/alt_title", f: f, key: 'description' %>
+      <% end %>
+    )
+  end
+
+  before do
+    work.title = ["bbb", "aaa", "ccc"]
+    work.alt_title = []
+    assign(:form, form)
+  end
+
+  context "when there are 3 titles" do
+    it 'hides the last 2 after alphabetizing all 3 titles' do
+      render inline: form_template
+      expect(rendered).to have_selector('input[type="hidden"][value="bbb"]', visible: false)
+      expect(rendered).to have_selector('input[type="hidden"][value="ccc"]', visible: false)
+    end
+  end
+end

data/spec/views/records/edit_fields/_title.html.erb_spec.rb

@@ -0,0 +1,24 @@
+RSpec.describe 'records/edit_fields/_title.html.erb', type: :view do
+  let(:work) { GenericWork.new }
+  let(:form) { Hyrax::GenericWorkForm.new(work, nil, controller) }
+
+  let(:form_template) do
+    %(
+      <%= simple_form_for [main_app, @form] do |f| %>
+        <%= render "records/edit_fields/title", f: f, key: 'description' %>
+      <% end %>
+    )
+  end
+
+  before do
+    work.title = ["ccc", "bbb", "aaa"]
+    assign(:form, form)
+  end
+
+  context "when there are 3 titles" do
+    it 'displays the first after alphabetizing the list' do
+      render inline: form_template
+      expect(rendered).to have_selector('input[class="form-control string required"][value="aaa"]')
+    end
+  end
+end

data/spec/wings/active_fedora_converter_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 require 'wings'
 require 'wings/active_fedora_converter'
 
-RSpec.describe Wings::ActiveFedoraConverter do
+RSpec.describe Wings::ActiveFedoraConverter, :clean_repo do
   subject(:converter) { described_class.new(resource: resource) }
   let(:adapter)       { Valkyrie::Persistence::Memory::MetadataAdapter.new }
   let(:attributes)    { { id: id } }
@@ -11,6 +11,12 @@ RSpec.describe Wings::ActiveFedoraConverter do
   let(:resource)      { work.valkyrie_resource }
   let(:work)          { GenericWork.new(attributes) }
 
+  describe '.convert' do
+    it 'returns the ActiveFedora model' do
+      expect(described_class.convert(resource: resource)).to eq work
+    end
+  end
+
   describe '#convert' do
     it 'returns the ActiveFedora model' do
       expect(converter.convert).to eq work
@@ -27,5 +33,134 @@ RSpec.describe Wings::ActiveFedoraConverter do
 
       it 'populates reflections'
     end
+
+    context 'with an embargo' do
+      let(:work) { FactoryBot.create(:embargoed_work) }
+
+      it 'repopulates the embargo' do
+        expect(converter.convert).to have_attributes(embargo_id: work.embargo_id)
+      end
+
+      it 'repopulates the embargo as a model' do
+        expect(converter.convert).to have_attributes(embargo: work.embargo)
+      end
+    end
+
+    context 'with a lease' do
+      let(:work) { FactoryBot.create(:leased_work) }
+
+      it 'repopulates the lease' do
+        expect(converter.convert).to have_attributes(lease_id: work.lease_id)
+      end
+    end
+
+    context 'with a generic work with _id attributes' do
+      let(:work) { FactoryBot.create(:work_with_representative_file, with_admin_set: true) }
+      before do
+        work.thumbnail_id = work.representative_id
+      end
+
+      it 'repopulates the _id attributes' do
+        expect(converter.convert).to have_attributes(
+          representative_id: work.representative_id,
+          thumbnail_id: work.thumbnail_id,
+          access_control_id: work.access_control_id,
+          admin_set_id: work.admin_set_id
+        )
+      end
+    end
+
+    context 'when specifying visibility' do
+      let(:attributes) do
+        FactoryBot.attributes_for(:generic_work)
+      end
+
+      let(:visibility) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
+
+      before { resource.visibility = visibility }
+
+      it 'sets the visibility' do
+        expect(converter.convert).to have_attributes(visibility: visibility)
+      end
+
+      context 'when restricted' do
+        let(:visibility) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED }
+
+        it 'sets the visibility' do
+          expect(converter.convert).to have_attributes(visibility: visibility)
+        end
+      end
+
+      context 'when private' do
+        let(:visibility) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }
+
+        it 'sets the visibility' do
+          expect(converter.convert).to have_attributes(visibility: visibility)
+        end
+      end
+    end
+
+    context 'when setting ACLs' do
+      it 'converts ACLs' do
+        expect { resource.read_users = ['moomin'] }
+          .to change { described_class.new(resource: resource).convert }
+          .to have_attributes(read_users: contain_exactly('moomin'))
+      end
+
+      context 'when ACLs exist' do
+        let(:work) { FactoryBot.create(:public_work) }
+
+        it 'can delete ACLs' do
+          expect { resource.read_groups = [] }
+            .to change { described_class.new(resource: resource).convert }
+            .from(have_attributes(read_groups: contain_exactly('public')))
+            .to have_attributes(read_groups: be_empty)
+        end
+      end
+    end
+
+    context 'with relationships' do
+      subject(:factory) { Wings::ModelTransformer.new(pcdm_object: pcdm_object) }
+
+      let(:resource) { subject.build }
+
+      context 'for member_of_collections' do
+        let(:pcdm_object) { collection1 }
+
+        let(:collection1) { build(:public_collection_lw, id: 'col1', title: ['Collection 1']) }
+        let(:collection2) { build(:public_collection_lw, id: 'col2', title: ['Collection 2']) }
+        let(:collection3) { build(:public_collection_lw, id: 'col3', title: ['Collection 3']) }
+
+        before do
+          collection1.member_of_collections = [collection2, collection3]
+          collection1.save!
+        end
+
+        it 'converts member_of_collection_ids back to af_object' do
+          expect(converter.convert.member_of_collections.map(&:id)).to match_array [collection2.id, collection3.id]
+        end
+      end
+
+      context 'for members' do
+        let(:pcdm_object) { work1 }
+
+        let(:work1)       { build(:work, id: 'wk1', title: ['Work 1']) }
+        let(:work2)       { build(:work, id: 'wk2', title: ['Work 2']) }
+        let(:work3)       { build(:work, id: 'wk3', title: ['Work 3']) }
+
+        before do
+          work1.ordered_members = [work2, work3]
+          work1.save!
+        end
+
+        it 'converts member_of_collection_ids back to af_object' do
+          expect(converter.convert.members.map(&:id)).to match_array [work3.id, work2.id]
+        end
+
+        it 'preserves order across conversion' do
+          expect(converter.convert.ordered_member_ids).to eq [work2.id, work3.id]
+        end
+      end
+    end
   end
 end