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

data/spec/features/edit_content_block_admin_spec.rb

@@ -31,7 +31,7 @@ RSpec.describe 'Editing content blocks as admin', :js do
       end
     end
 
-    it "does not change tab when user dismisses the confirmation" do
+    it "change tab when user dismisses the confirmation" do
       expect(page).to have_selector('#announcement_text', class: 'active')
       expect(page).not_to have_selector('#marketing', class: 'active')
       within_frame('content_block_announcement_ifr') do
@@ -41,8 +41,8 @@ RSpec.describe 'Editing content blocks as admin', :js do
       within('#nav-safety-modal') do
         click_button('OK')
       end
-      expect(page).not_to have_selector('#marketing', class: 'active')
-      expect(page).to have_selector('#announcement_text', class: 'active')
+      expect(page).to have_selector('#marketing', class: 'active')
+      expect(page).not_to have_selector('#announcement_text', class: 'active')
     end
 
     it "does not redisplay the confirmation unless form data is changed" do

data/spec/features/edit_pages_admin.spec.rb

@@ -0,0 +1,62 @@
+RSpec.describe 'Editing pages as admin', :js do
+  let(:user) { create(:admin) }
+
+  context 'when user wants to change tabs' do
+    let!(:confirm_modal_text) { 'Are you sure you want to leave this tab?  Any unsaved data will be lost.' }
+
+    before do
+      sign_in user
+      visit '/dashboard'
+      click_link 'Settings'
+      click_link 'Pages'
+    end
+
+    it "does not display a confirmation message when form data has not changed" do
+      expect(page).to have_content('Content Blocks')
+      expect(page).to have_content('About')
+      click_link 'Help Page'
+      expect(page).not_to have_content(confirm_modal_text)
+    end
+
+    it "displays a confirmation message when form data has changed" do
+      expect(page).to have_content('Content Blocks')
+      expect(page).to have_content('About')
+      expect(page).to have_selector('#content_block_about_ifr')
+      within_frame('content_block_about_ifr') do
+        find('body').set('Updated text.')
+      end
+      click_link 'Help Page'
+      within('#nav-safety-modal') do
+        expect(page).to have_content(confirm_modal_text)
+      end
+    end
+
+    it "changes tab when user dismisses the confirmation by clicking OK" do
+      expect(page).to have_selector('#about', class: 'active')
+      expect(page).not_to have_selector('#help', class: 'active')
+      within_frame('content_block_about_ifr') do
+        find('body').set('Updated text.')
+      end
+      click_link 'Help Page'
+      within('#nav-safety-modal') do
+        click_button('OK')
+      end
+      expect(page).to have_selector('#help', class: 'active')
+      expect(page).not_to have_selector('#about', class: 'active')
+    end
+
+    it "does not redisplay the confirmation unless form data is changed" do
+      expect(page).to have_selector('#about', class: 'active')
+      expect(page).not_to have_selector('#help', class: 'active')
+      within_frame('content_block_about_ifr') do
+        find('body').set('Updated text.')
+      end
+      click_link 'Help Page'
+      within('#nav-safety-modal') do
+        click_button('OK')
+      end
+      click_link 'Deposit Agreement'
+      expect(page).not_to have_content(confirm_modal_text)
+    end
+  end
+end

data/spec/features/proxy_spec.rb

@@ -21,5 +21,26 @@ RSpec.describe 'proxy', type: :feature do
       expect(page).to have_css('td.depositor-name', text: second_user.user_key)
       expect(page).to have_link('Delete Proxy')
     end
+
+    it "try to make yourself a proxy" do
+      sign_in user
+      click_link "Your activity"
+      within 'div#proxy_management' do
+        click_link "Manage Proxies"
+      end
+      expect(first("td.depositor-name")).to be_nil
+
+      # BEGIN create_proxy_using_partial
+      find('a.select2-choice').click
+      find(".select2-input").set(user.user_key)
+      expect(page).to have_css("div.select2-result-label")
+      find("div.select2-result-label").click
+      # END create_proxy_using_partial
+
+      within('#proxy-deny-modal') do
+        expect(page).to have_content "You cannot make yourself a proxy"
+        click_button('Close')
+      end
+    end
   end
 end

data/spec/features/static_pages_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe "The static pages" do
+RSpec.describe "The static pages", :clean_repo do
   it do
     visit root_path
     click_link "About"

data/spec/features/work_show_spec.rb

@@ -47,11 +47,14 @@ RSpec.describe "work show view" do
       end
 
       # IIIF manifest does not include locale query param
-      expect(find('div.viewer:first')['data-uri']).to eq "http://www.example.com/concern/generic_works/#{work.id}/manifest"
+      expect(find('div.viewer-wrapper iframe')['src']).to eq(
+        "http://www.example.com/uv/uv.html#?manifest=" \
+        "http://www.example.com/concern/generic_works/#{work.id}/manifest&" \
+        "config=http://www.example.com/uv/uv-config.json"
+      )
     end
 
     it "allows adding work to a collection", clean_repo: true, js: true do
-      optional 'ability to get capybara to find css select2-result (see Issue #3038)' if ci_build?
       click_button "Add to collection" # opens the modal
       # Really ensure that this Collection model is persisted
       Collection.all.map(&:destroy!)
@@ -60,6 +63,7 @@ RSpec.describe "work show view" do
       click_button 'Save changes'
 
       # forwards to collection show page
+      sleep 5
       expect(page).to have_content persisted_collection.title.first
       expect(page).to have_content work.title.first
       expect(page).to have_selector '.alert-success', text: 'Collection was successfully updated.'
@@ -103,12 +107,12 @@ RSpec.describe "work show view" do
     end
 
     it "allows adding work to a collection", clean_repo: true, js: true do
-      optional 'ability to get capybara to find css select2-result (see Issue #3038)' if ci_build?
       click_button "Add to collection" # opens the modal
       select_member_of_collection(collection)
       click_button 'Save changes'
 
       # forwards to collection show page
+      sleep 5
       expect(page).to have_content collection.title.first
       expect(page).to have_content work.title.first
       expect(page).to have_selector '.alert-success', text: 'Collection was successfully updated.'

data/spec/fixtures/updated-file.txt

@@ -0,0 +1 @@
+some updated content

data/spec/forms/hyrax/forms/batch_upload_form_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe Hyrax::Forms::BatchUploadForm do
   describe "#primary_terms" do
     subject { form.primary_terms }
 
-    it { is_expected.to eq [:creator, :keyword, :rights_statement] }
+    it { is_expected.to eq [:creator, :rights_statement] }
     it { is_expected.not_to include(:title) }
   end
 
@@ -41,12 +41,15 @@ RSpec.describe Hyrax::Forms::BatchUploadForm do
     subject { form.terms }
 
     it do
-      is_expected.to eq [:creator,
+      is_expected.to eq [:alt_title,
+                         :creator,
                          :contributor,
                          :description,
+                         :abstract,
                          :keyword,
                          :license,
                          :rights_statement,
+                         :access_right,
                          :rights_notes,
                          :publisher,
                          :date_created,

data/spec/forms/hyrax/forms/collection_form_spec.rb

@@ -3,7 +3,8 @@ RSpec.describe Hyrax::Forms::CollectionForm do
     subject { described_class.terms }
 
     it do
-      is_expected.to eq [:resource_type,
+      is_expected.to eq [:alt_title,
+                         :resource_type,
                          :title,
                          :creator,
                          :contributor,
@@ -40,6 +41,7 @@ RSpec.describe Hyrax::Forms::CollectionForm do
 
     it do
       is_expected.to eq [
+        :alt_title,
         :creator,
         :contributor,
         :keyword,
@@ -127,7 +129,8 @@ RSpec.describe Hyrax::Forms::CollectionForm do
     subject { described_class.build_permitted_params }
 
     it do
-      is_expected.to eq [{ resource_type: [] },
+      is_expected.to eq [{ alt_title: [] },
+                         { resource_type: [] },
                          { title: [] },
                          { creator: [] },
                          { contributor: [] },

data/spec/forms/hyrax/forms/work_form_spec.rb

@@ -100,8 +100,9 @@ RSpec.describe Hyrax::Forms::WorkForm do
     let(:params) { ActionController::Parameters.new(attributes) }
     let(:attributes) do
       {
-        title: ['foo'],
+        title: ['aaa', 'bbb', 'ccc'],
         description: [''],
+        abstract: [''],
         visibility: 'open',
         parent_id: '123',
         representative_id: '456',
@@ -110,21 +111,27 @@ RSpec.describe Hyrax::Forms::WorkForm do
         source: ['related'],
         rights_statement: 'http://rightsstatements.org/vocab/InC-EDU/1.0/',
         rights_notes: ['Notes on the rights'],
-        license: ['http://creativecommons.org/licenses/by/3.0/us/']
+        license: ['http://creativecommons.org/licenses/by/3.0/us/'],
+        access_right: ['Only accessible via login.']
       }
     end
 
     subject { described_class.model_attributes(params) }
 
     it 'permits parameters' do
-      expect(subject['title']).to eq ['foo']
+      expect(subject['title']).to eq ['aaa', 'bbb', 'ccc']
       expect(subject['description']).to be_empty
+      expect(subject['abstract']).to be_empty
       expect(subject['visibility']).to eq 'open'
+      expect(subject['keyword']).to eq ['penguin']
+      expect(subject['source']).to eq ['related']
+    end
+
+    it 'permits rights parameters' do
       expect(subject['license']).to eq ['http://creativecommons.org/licenses/by/3.0/us/']
       expect(subject['rights_statement']).to eq 'http://rightsstatements.org/vocab/InC-EDU/1.0/'
       expect(subject['rights_notes']).to eq ['Notes on the rights']
-      expect(subject['keyword']).to eq ['penguin']
-      expect(subject['source']).to eq ['related']
+      expect(subject['access_right']).to eq ['Only accessible via login.']
     end
 
     it 'excludes non-permitted params' do
@@ -174,6 +181,12 @@ RSpec.describe Hyrax::Forms::WorkForm do
       it { is_expected.to eq [''] }
     end
 
+    context "for :abstract" do
+      subject { form[:abstract] }
+
+      it { is_expected.to eq [''] }
+    end
+
     context "for :embargo_release_date" do
       subject { form[:embargo_release_date] }
 

data/spec/forms/hyrax/generic_work_form_spec.rb

@@ -6,20 +6,20 @@ RSpec.describe Hyrax::GenericWorkForm do
   describe "#required_fields" do
     subject { form.required_fields }
 
-    it { is_expected.to eq [:title, :creator, :keyword, :rights_statement] }
+    it { is_expected.to eq [:title, :creator, :rights_statement] }
   end
 
   describe "#primary_terms" do
     subject { form.primary_terms }
 
-    it { is_expected.to eq [:title, :creator, :keyword, :rights_statement] }
+    it { is_expected.to eq [:title, :creator, :rights_statement] }
   end
 
   describe "#secondary_terms" do
     subject { form.secondary_terms }
 
     it do
-      is_expected.not_to include(:title, :creator, :keyword,
+      is_expected.not_to include(:title, :creator,
                                  :visibilty, :visibility_during_embargo,
                                  :embargo_release_date, :visibility_after_embargo,
                                  :visibility_during_lease, :lease_expiration_date,
@@ -90,7 +90,7 @@ RSpec.describe Hyrax::GenericWorkForm do
       end
 
       it 'removes blank parameters' do
-        expect(subject['title']).to be_empty
+        expect(subject['title']).to eq ['']
         expect(subject['description']).to be_empty
         expect(subject['license']).to be_empty
         expect(subject['keyword']).to be_empty

data/spec/helpers/hyrax/collections_helper_spec.rb

@@ -32,9 +32,9 @@ RSpec.describe Hyrax::CollectionsHelper do
       let!(:work_doc) { SolrDocument.new(id: '123', title_tesim: ['My GenericWork'], member_of_collection_ids_ssim: coll_ids) }
 
       before do
-        ActiveFedora::SolrService.add(coll1_attrs)
-        ActiveFedora::SolrService.add(coll2_attrs)
-        ActiveFedora::SolrService.commit
+        Hyrax::SolrService.add(coll1_attrs)
+        Hyrax::SolrService.add(coll2_attrs)
+        Hyrax::SolrService.commit
       end
 
       it 'renders a list of links to the collections' do
@@ -59,8 +59,8 @@ RSpec.describe Hyrax::CollectionsHelper do
       let!(:work_doc) { SolrDocument.new(id: '123', title_tesim: ['My GenericWork'], member_of_collection_ids_ssim: coll_ids) }
 
       before do
-        ActiveFedora::SolrService.add(coll1_attrs)
-        ActiveFedora::SolrService.commit
+        Hyrax::SolrService.add(coll1_attrs)
+        Hyrax::SolrService.commit
       end
 
       it 'renders nothing' do
@@ -76,9 +76,9 @@ RSpec.describe Hyrax::CollectionsHelper do
       let!(:work_doc) { SolrDocument.new(id: '123', title_tesim: ['My GenericWork'], member_of_collection_ids_ssim: coll_ids) }
 
       before do
-        ActiveFedora::SolrService.add(coll1_attrs)
-        ActiveFedora::SolrService.add(coll2_attrs)
-        ActiveFedora::SolrService.commit
+        Hyrax::SolrService.add(coll1_attrs)
+        Hyrax::SolrService.add(coll2_attrs)
+        Hyrax::SolrService.commit
       end
 
       it 'renders a list of links to the collections' do

data/spec/helpers/hyrax/dashboard_helper_behavior_spec.rb

@@ -18,7 +18,6 @@ RSpec.describe Hyrax::DashboardHelperBehavior, type: :helper do
   end
 
   describe "#number_of_works" do
-    let(:conn) { ActiveFedora::SolrService.instance.conn }
     let(:user1) { User.new(email: "abc@test") }
     let(:user2) { User.new(email: "abc@test.123") }
 
@@ -32,7 +31,6 @@ RSpec.describe Hyrax::DashboardHelperBehavior, type: :helper do
   end
 
   describe "#number_of_files" do
-    let(:conn) { ActiveFedora::SolrService.instance.conn }
     let(:user1) { User.new(email: "abc@test") }
     let(:user2) { User.new(email: "abc@test.123") }
 
@@ -46,7 +44,6 @@ RSpec.describe Hyrax::DashboardHelperBehavior, type: :helper do
   end
 
   describe "#number_of_collections" do
-    let(:conn) { ActiveFedora::SolrService.instance.conn }
     let(:user1) { User.new(email: "abc@test") }
     let(:user2) { User.new(email: "abc@test.123") }
 
@@ -60,15 +57,17 @@ RSpec.describe Hyrax::DashboardHelperBehavior, type: :helper do
   end
 
   def create_models(model, user1, user2)
+    solr_service = Hyrax::SolrService
+
     # deposited by the first user
     3.times do |t|
-      conn.add id: "199#{t}", ActiveFedora.index_field_mapper.solr_name('depositor', :stored_searchable) => user1.user_key, "has_model_ssim" => [model],
-               ActiveFedora.index_field_mapper.solr_name('depositor', :symbol) => user1.user_key
+      solr_service.add id: "199#{t}", "depositor_tesim" => user1.user_key, "has_model_ssim" => [model],
+                       "depositor_ssim" => user1.user_key
     end
 
     # deposited by the second user, but editable by the first
-    conn.add id: "1994", ActiveFedora.index_field_mapper.solr_name('depositor', :stored_searchable) => user2.user_key, "has_model_ssim" => [model],
-             ActiveFedora.index_field_mapper.solr_name('depositor', :symbol) => user2.user_key, "edit_access_person_ssim" => user1.user_key
-    conn.commit
+    solr_service.add id: "1994", "depositor_tesim" => user2.user_key, "has_model_ssim" => [model],
+                     "depositor_ssim" => user2.user_key, "edit_access_person_ssim" => user1.user_key
+    solr_service.commit
   end
 end

data/spec/helpers/hyrax/iiif_helper_spec.rb

@@ -41,4 +41,20 @@ RSpec.describe Hyrax::IiifHelper, type: :helper do
       it { is_expected.to eq 'hyrax/base/iiif_viewers/mirador' }
     end
   end
+
+  describe '#universal_viewer_base_url' do
+    subject { helper.universal_viewer_base_url }
+
+    it 'defaults to universal viewer base path' do
+      expect(subject).to eq "http://test.host/uv/uv.html"
+    end
+  end
+
+  describe '#universal_viewer_config_url' do
+    subject { helper.universal_viewer_config_url }
+
+    it 'defaults to universal viewer base path' do
+      expect(subject).to eq "http://test.host/uv/uv-config.json"
+    end
+  end
 end

data/spec/helpers/hyrax_helper_spec.rb

@@ -117,7 +117,7 @@ RSpec.describe HyraxHelper, type: :helper do
     subject { helper.link_to_each_facet_field(options) }
 
     context "with helper_facet and default separator" do
-      let(:options) { { config: { helper_facet: ActiveFedora.index_field_mapper.solr_name("document_types", :facetable).to_sym }, value: ["Imaging > Object Photography"] } }
+      let(:options) { { config: { helper_facet: "document_types_sim".to_sym }, value: ["Imaging > Object Photography"] } }
 
       it do
         is_expected.to eq("<a href=\"/catalog?f%5Bdocument_types_sim%5D%5B%5D=Imaging\">" \
@@ -127,7 +127,7 @@ RSpec.describe HyraxHelper, type: :helper do
     end
 
     context "with helper_facet and optional separator" do
-      let(:options) { { config: { helper_facet: ActiveFedora.index_field_mapper.solr_name("document_types", :facetable).to_sym, separator: " : " }, value: ["Imaging : Object Photography"] } }
+      let(:options) { { config: { helper_facet: "document_types_sim".to_sym, separator: " : " }, value: ["Imaging : Object Photography"] } }
 
       it do
         is_expected.to eq("<a href=\"/catalog?f%5Bdocument_types_sim%5D%5B%5D=Imaging\">" \
@@ -138,7 +138,7 @@ RSpec.describe HyraxHelper, type: :helper do
 
     context "with :output_separator" do
       let(:options) do
-        { config: { helper_facet: ActiveFedora.index_field_mapper.solr_name("document_types", :facetable).to_sym, output_separator: ' ~ ', separator: ":" }, value: ["Imaging : Object Photography"] }
+        { config: { helper_facet: "document_types_sim".to_sym, output_separator: ' ~ ', separator: ":" }, value: ["Imaging : Object Photography"] }
       end
 
       it do
@@ -150,7 +150,7 @@ RSpec.describe HyraxHelper, type: :helper do
 
     context "with :no_spaces_around_separator" do
       let(:options) do
-        { config: { helper_facet: ActiveFedora.index_field_mapper.solr_name("document_types", :facetable).to_sym, output_separator: '~', separator: ":" }, value: ["Imaging : Object Photography"] }
+        { config: { helper_facet: "document_types_sim".to_sym, output_separator: '~', separator: ":" }, value: ["Imaging : Object Photography"] }
       end
 
       it do