blacklight-spotlight 3.0.0.alpha.2 → 3.0.0.alpha.3

data/spec/features/javascript/roles_admin_spec.rb

@@ -3,6 +3,7 @@
 describe 'Roles Admin', type: :feature, js: true do
   let(:exhibit) { FactoryBot.create(:exhibit) }
   let(:exhibit_admin) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
+
   before do
     login_as exhibit_admin
 

data/spec/features/javascript/search_config_admin_spec.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-feature 'Search Configuration Administration', js: true do
+describe 'Search Configuration Administration', js: true do
   let(:exhibit) { FactoryBot.create(:exhibit) }
   let(:user) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
+
   before { login_as user }
 
   describe 'search fields', default_max_wait_time: 5 do
@@ -110,6 +111,7 @@ feature 'Search Configuration Administration', js: true do
       expect(page).to have_checked_field '20'
       expect(page).to have_unchecked_field '10'
     end
+
     it 'updates Sort field result options' do
       visit spotlight.edit_exhibit_search_configuration_path(exhibit)
 

data/spec/features/javascript/search_context_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-feature 'Search contexts' do
+describe 'Search contexts' do
   let(:exhibit) { FactoryBot.create(:exhibit) }
   let(:exhibit_curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
   let(:feature_page) do
@@ -10,9 +10,10 @@ feature 'Search contexts' do
       exhibit: exhibit
     )
   end
+
   before { login_as exhibit_curator }
 
-  scenario 'should add context breadcrumbs back to the home page when navigating to an item from the home page', js: true do
+  it 'adds context breadcrumbs back to the home page when navigating to an item from the home page', js: true do
     exhibit.home_page.content = [
       {
         type: 'solr_documents',
@@ -41,7 +42,7 @@ feature 'Search contexts' do
     expect(page).to have_selector '.breadcrumb a', text: 'Home'
   end
 
-  scenario 'should add context breadcrumb back to the feature page when navigating to an item from a feature page', js: true do
+  it 'adds context breadcrumb back to the feature page when navigating to an item from a feature page', js: true do
     feature_page.content = [
       {
         type: 'solr_documents',
@@ -74,7 +75,7 @@ feature 'Search contexts' do
   context 'from a browse page' do
     let!(:search) { FactoryBot.create(:search, title: 'Some Saved Search', exhibit: exhibit, published: true) }
 
-    scenario 'should add context breadcrumbs back to the browse page when navigating to an item', js: true do
+    it 'adds context breadcrumbs back to the browse page when navigating to an item', js: true do
       visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
       click_link 'Browse'
       click_link 'Some Saved Search'

data/spec/features/main_navigation_spec.rb

@@ -3,6 +3,7 @@
 describe 'Main navigation labels are settable', type: :feature do
   let!(:exhibit) { FactoryBot.create(:exhibit) }
   let!(:about) { FactoryBot.create(:about_page, exhibit: exhibit, published: true) }
+
   before do
     about_nav = exhibit.main_navigations.about
     about_nav.label = 'New About Label'
@@ -21,32 +22,75 @@ describe 'Main navigation labels are settable', type: :feature do
     expect(page).to have_css('.navbar-nav li', text: 'New About Label')
     expect(page).to have_css('.navbar-nav li', text: 'New Browse Label')
   end
+
   it 'has the configured about page label in the sidebar' do
     visit spotlight.exhibit_about_page_path(exhibit, about)
-    expect(page).to have_css('#sidebar h4', text: 'New About Label')
+    expect(page).to have_css('#sidebar h2', text: 'New About Label')
   end
+
   it 'has the configured about page label visible in the breadcrumb' do
     visit spotlight.exhibit_about_page_path(exhibit, about)
     expect(page).to have_css('.breadcrumb li', text: 'New About Label')
   end
+
   it 'has the configured browse page label visible in the breadcrumb of the browse index page' do
     visit spotlight.exhibit_browse_index_path(exhibit, exhibit.searches.first)
     expect(page).to have_content('New Browse Label')
     expect(page).to have_css('.breadcrumb li', text: 'New Browse Label')
   end
+
   it 'has the configured browse page label visible in the breadcrumb of the browse show page' do
     visit spotlight.exhibit_browse_path(exhibit, exhibit.searches.first)
     expect(page).to have_content('New Browse Label')
     expect(page).to have_css('.breadcrumb li', text: 'New Browse Label')
   end
+
   it 'does not display any main navigation menu items that are configured to not display' do
     about_nav = exhibit.main_navigations.about
     about_nav.display = false
     about_nav.save
     visit spotlight.exhibit_path(exhibit)
-    expect(page).to_not have_css('.navbar-nav li', text: 'New About Label')
+    expect(page).not_to have_css('.navbar-nav li', text: 'New About Label')
     about_nav = exhibit.main_navigations.about
     about_nav.display = true
     about_nav.save
   end
+
+  describe 'Restore default button functionality', js: true do
+    let(:user) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
+
+    before { login_as user }
+
+    it 'is present when the navigation label is not the default value' do
+      visit spotlight.edit_exhibit_appearance_path(exhibit)
+
+      click_link 'Main menu'
+
+      within '.main_navigation_admin' do
+        within all('li').first do
+          expect(page).not_to have_css('button.restore-default', visible: true)
+        end
+
+        within all('li').last do
+          expect(page).to have_css('button.restore-default', visible: true)
+        end
+      end
+    end
+
+    context 'when the navigation label is not the default value' do
+      it 'restores the default value' do
+        visit spotlight.edit_exhibit_appearance_path(exhibit)
+
+        click_link 'Main menu'
+
+        within '.main_navigation_admin' do
+          within all('li').last do
+            expect(page).to have_css('a', text: 'New About Label')
+            click_button 'Restore default'
+            expect(page).to have_css('a', text: 'About')
+          end
+        end
+      end
+    end
+  end
 end

data/spec/features/metadata_admin_spec.rb

@@ -3,6 +3,7 @@
 describe 'Metadata Administration', type: :feature do
   let(:exhibit) { FactoryBot.create(:exhibit) }
   let(:user) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
+
   before { login_as user }
 
   describe 'edit' do

data/spec/features/report_a_problem_spec.rb

@@ -6,7 +6,7 @@ describe 'Report a Problem', type: :feature do
 
   it 'does not have a header link' do
     visit root_path
-    expect(page).to_not have_content 'Feedback'
+    expect(page).not_to have_content 'Feedback'
   end
 
   describe 'when emails are setup' do

data/spec/features/site_masthead_spec.rb

@@ -56,7 +56,7 @@ describe 'Add and update the site masthead', type: :feature do
   it 'displays a masthead image when one is uploaded and configured' do
     visit spotlight.edit_site_path
 
-    expect(page).to_not have_css('.image-masthead')
+    expect(page).not_to have_css('.image-masthead')
 
     click_link 'Site masthead'
 
@@ -76,7 +76,7 @@ describe 'Add and update the site masthead', type: :feature do
   it 'does not display an uploaded masthead if configured to not display' do
     visit spotlight.edit_site_path
 
-    expect(page).to_not have_css('.image-masthead')
+    expect(page).not_to have_css('.image-masthead')
 
     click_link 'Site masthead'
 
@@ -86,6 +86,6 @@ describe 'Add and update the site masthead', type: :feature do
 
     click_button 'Save changes'
     expect(page).to have_content('The site was successfully updated.')
-    expect(page).to_not have_css('.image-masthead .background-container')
+    expect(page).not_to have_css('.image-masthead .background-container')
   end
 end

data/spec/features/slideshow_spec.rb

@@ -6,7 +6,7 @@ describe 'Slideshow', type: :feature, js: true do
 
   before do
     login_as user
-    exhibit.blacklight_configuration.update(document_index_view_types: %w(list gallery slideshow))
+    exhibit.blacklight_configuration.update(document_index_view_types: %w[list gallery slideshow])
   end
 
   it 'has slideshow' do

data/spec/helpers/spotlight/application_helper_spec.rb

@@ -3,6 +3,7 @@
 describe Spotlight::ApplicationHelper, type: :helper do
   describe '#application_name' do
     let(:site) { Spotlight::Site.instance }
+
     before do
       allow(helper).to receive(:current_site).and_return(site)
     end
@@ -31,6 +32,7 @@ describe Spotlight::ApplicationHelper, type: :helper do
 
   describe '#site_title' do
     let(:site) { Spotlight::Site.instance }
+
     before do
       allow(helper).to receive(:current_site).and_return(site)
     end
@@ -77,13 +79,13 @@ describe Spotlight::ApplicationHelper, type: :helper do
       end
 
       it "returns keys with a value of 'on'" do
-        expect(helper.selected_search_block_views(block)).to eq %w(a d)
+        expect(helper.selected_search_block_views(block)).to eq %w[a d]
       end
     end
 
     describe 'blacklight_view_config_for_search_block' do
       let(:sir_trevor_block) do
-        SirTrevorRails::Block.new({ type: 'xyz', data: { view: %w(list gallery) } }, 'parent')
+        SirTrevorRails::Block.new({ type: 'xyz', data: { view: %w[list gallery] } }, 'parent')
       end
 
       let(:config) do
@@ -93,13 +95,14 @@ describe Spotlight::ApplicationHelper, type: :helper do
           config.view.slideshow = {}
         end
       end
+
       before do
         allow(helper).to receive_messages(blacklight_config: config)
       end
 
       it 'returns a blacklight configuration object that has reduced the views to those that are configured in the block' do
         new_config = helper.blacklight_view_config_for_search_block(sir_trevor_block)
-        expect(new_config.keys).to eq [:list, :gallery]
+        expect(new_config.keys).to eq %i[list gallery]
       end
     end
   end
@@ -107,6 +110,7 @@ describe Spotlight::ApplicationHelper, type: :helper do
   describe 'render_document_class' do
     let(:current_exhibit) { FactoryBot.create(:exhibit) }
     let(:document) { SolrDocument.new(some_field: 'Some data') }
+
     before do
       allow(helper).to receive_messages(current_exhibit: current_exhibit)
       allow(helper).to receive_messages(blacklight_config: Blacklight::Configuration.new do |config|
@@ -119,6 +123,7 @@ describe Spotlight::ApplicationHelper, type: :helper do
       allow(document).to receive(:private?).with(current_exhibit).and_return(true)
       expect(helper.render_document_class(document)).to include 'blacklight-private'
     end
+
     it 'prefixs "blacklight-" to the configured type' do
       expect(helper.render_document_class(document)).to include 'blacklight-some-data'
     end
@@ -155,13 +160,13 @@ describe Spotlight::ApplicationHelper, type: :helper do
       blacklight_config.view.b.if = false
 
       expect(helper.available_view_fields).to include :a
-      expect(helper.available_view_fields).to_not include :b
+      expect(helper.available_view_fields).not_to include :b
     end
   end
 
   describe '#block_document_index_view_type' do
     let(:blacklight_config) { Blacklight::Configuration.new }
-    let(:block) { double(view: %w(b c)) }
+    let(:block) { double(view: %w[b c]) }
     let(:block_with_bad_or_missing_data) { double(view: []) }
 
     before do

data/spec/helpers/spotlight/crud_link_helpers_spec.rb

@@ -3,6 +3,7 @@
 describe Spotlight::CrudLinkHelpers, type: :helper do
   let(:exhibit) { FactoryBot.create(:exhibit) }
   let(:some_model) { Spotlight::FeaturePage.create! exhibit: exhibit }
+
   describe '#cancel_link' do
     it 'is a model-specific cancel link' do
       expect(helper).to receive(:action_default_value).with(:my_model, :cancel).and_return 'Cancel'
@@ -31,6 +32,7 @@ describe Spotlight::CrudLinkHelpers, type: :helper do
 
   describe '#exhibit_create_link' do
     let(:some_model) { Spotlight::FeaturePage.new }
+
     before do
       allow(helper).to receive_messages(current_exhibit: exhibit)
       allow(helper).to receive_messages action_default_value: 'Create'
@@ -52,6 +54,7 @@ describe Spotlight::CrudLinkHelpers, type: :helper do
 
   describe '#exhibit_edit_link' do
     let(:some_model) { Spotlight::FeaturePage.create! exhibit: exhibit }
+
     before do
       allow(helper).to receive_messages(current_exhibit: exhibit)
       allow(helper).to receive_messages action_default_value: 'Edit'

data/spec/helpers/spotlight/languages_helper_spec.rb

@@ -2,6 +2,7 @@
 
 describe Spotlight::LanguagesHelper, type: :helper do
   let(:current_exhibit) { FactoryBot.create(:exhibit) }
+
   describe '#add_exhibit_language_dropdown_options' do
     it 'returns a sorted Array of locales and their names' do
       allow(helper).to receive_messages(current_exhibit: current_exhibit)
@@ -61,6 +62,7 @@ describe Spotlight::LanguagesHelper, type: :helper do
       it do
         expect(helper.default_language?).to eq true
       end
+
       it do
         expect(helper).to receive_messages(params: { locale: :en })
         expect(helper.default_language?).to eq true

data/spec/helpers/spotlight/main_app_helpers_spec.rb

@@ -3,8 +3,10 @@
 describe Spotlight::MainAppHelpers, type: :helper do
   describe '#show_contact_form?' do
     subject { helper }
+
     let(:exhibit) { FactoryBot.create :exhibit }
     let(:exhibit_with_contacts) { FactoryBot.create :exhibit }
+
     context 'with an exhibit with confirmed contacts' do
       before do
         exhibit_with_contacts.contact_emails.create(email: 'cabeer@stanford.edu').tap do |e|
@@ -18,7 +20,7 @@ describe Spotlight::MainAppHelpers, type: :helper do
 
       before { allow(helper).to receive_messages current_exhibit: exhibit_with_contacts }
 
-      its(:show_contact_form?) { should be_truthy }
+      its(:show_contact_form?) { is_expected.to be_truthy }
     end
 
     context 'with an exhibit with only unconfirmed contacts' do
@@ -26,19 +28,19 @@ describe Spotlight::MainAppHelpers, type: :helper do
 
       before { allow(helper).to receive_messages current_exhibit: exhibit_with_contacts }
 
-      its(:show_contact_form?) { should be_falsey }
+      its(:show_contact_form?) { is_expected.to be_falsey }
     end
 
     context 'with an exhibit without contacts' do
       before { allow(helper).to receive_messages current_exhibit: exhibit }
 
-      its(:show_contact_form?) { should be_falsey }
+      its(:show_contact_form?) { is_expected.to be_falsey }
     end
 
     context 'outside the context of an exhibit' do
       before { allow(helper).to receive_messages current_exhibit: nil }
 
-      its(:show_contact_form?) { should be_falsey }
+      its(:show_contact_form?) { is_expected.to be_falsey }
     end
 
     context 'with a default contact address' do
@@ -46,18 +48,20 @@ describe Spotlight::MainAppHelpers, type: :helper do
 
       before { allow(helper).to receive_messages current_exhibit: exhibit }
 
-      its(:show_contact_form?) { should be_truthy }
+      its(:show_contact_form?) { is_expected.to be_truthy }
     end
   end
 
   describe '#exhibit_stylesheet_link_tag' do
     let(:exhibit) { FactoryBot.create(:exhibit) }
+
     before do
       allow(helper).to receive_messages(current_exhibit: exhibit)
     end
 
     context 'without an exhibit context' do
       let(:exhibit) { nil }
+
       it 'uses the standard stylesheet' do
         expect(helper.exhibit_stylesheet_link_tag('application')).to eq helper.stylesheet_link_tag('application')
       end
@@ -85,7 +89,7 @@ describe Spotlight::MainAppHelpers, type: :helper do
 
     context 'for a themed exhibit' do
       before do
-        allow(Spotlight::Engine.config).to receive(:exhibit_themes).and_return(%w(default modern))
+        allow(Spotlight::Engine.config).to receive(:exhibit_themes).and_return(%w[default modern])
         exhibit.update(theme: 'modern')
       end
 

data/spec/helpers/spotlight/masthead_helper_spec.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+describe Spotlight::MastheadHelper, type: :helper do
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:site) { Spotlight::Site.instance }
+
+  before do
+    allow(helper).to receive(:current_exhibit).and_return(nil)
+    allow(helper).to receive(:current_site).and_return(site)
+  end
+
+  describe '#masthead_heading_content' do
+    context 'when there is a current exhibit' do
+      before { allow(helper).to receive(:current_exhibit).and_return(exhibit) }
+
+      it { expect(helper.masthead_heading_content).to eq exhibit.title }
+    end
+
+    context 'when there is no current exhibit' do
+      it { expect(helper.masthead_heading_content).to eq 'Blacklight' } # the application_name
+    end
+  end
+
+  describe '#masthead_subheading_content' do
+    context 'when there is a current exhibit' do
+      before { allow(helper).to receive(:current_exhibit).and_return(exhibit) }
+
+      context 'when the exhibit has a subtitle' do
+        before { exhibit.subtitle = 'MastheadHelper Spec Exhibit' }
+
+        it { expect(helper.masthead_subheading_content).to eq 'MastheadHelper Spec Exhibit' }
+      end
+
+      context 'when the exhibit does not have a subtitle' do
+        it { expect(helper.masthead_subheading_content).to be_nil }
+      end
+    end
+
+    context 'when there is no current exhibit' do
+      context 'when the site has a subtitle' do
+        before { site.subtitle = "The site's subtitle" }
+
+        it { expect(helper.masthead_subheading_content).to eq "The site's subtitle" }
+      end
+
+      context 'when the site does not have a subtitle' do
+        it { expect(helper.masthead_subheading_content).to be_nil }
+      end
+    end
+  end
+end

data/spec/helpers/spotlight/meta_helper_spec.rb

@@ -3,6 +3,7 @@
 describe Spotlight::MetaHelper, type: :helper do
   describe '#add_exhibit_meta_content' do
     let(:current_exhibit) { FactoryBot.create(:exhibit) }
+
     before do
       allow(helper).to receive_messages(current_exhibit: current_exhibit)
       allow(helper).to receive(:site_title).and_return('some title')