blacklight-spotlight 0.13.0 → 0.14.0

data/spec/features/add_contacts_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe 'Add a contact to an exhibit', type: :feature do
-  let(:curator) { FactoryGirl.create(:exhibit_curator) }
-  let(:exhibit) { curator.roles.first.exhibit }
+  let(:curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+  let(:exhibit) { FactoryGirl.create(:exhibit) }
   let!(:about_page) { FactoryGirl.create(:about_page, exhibit: exhibit) }
   before { login_as curator }
   it 'displays a newly added contact in the sidebar' do

data/spec/features/browse_category_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+feature 'Browse pages' do
+  let(:exhibit) { FactoryGirl.create(:exhibit) }
+
+  context 'a browse page' do
+    let!(:search) { FactoryGirl.create(:search, title: 'Some Saved Search', exhibit: exhibit, published: true) }
+    context 'with the standard exhibit masthead' do
+      it 'includes the search title and resource count in the body' do
+        visit spotlight.exhibit_browse_path(exhibit, search)
+
+        within '#main-container' do
+          expect(page).to have_selector 'h1', text: 'Some Saved Search'
+        end
+
+        expect(page).not_to have_selector '.masthead .h1', text: 'Some Saved Search'
+      end
+
+      it 'shows the search bar' do
+        visit spotlight.exhibit_browse_path(exhibit, search)
+
+        expect(page).to have_selector '.search-query-form'
+      end
+
+      it 'has breadcrumbs' do
+        visit spotlight.exhibit_browse_path(exhibit, search)
+
+        expect(page).to have_selector '.breadcrumbs-container'
+      end
+    end
+
+    context 'with a custom masthead' do
+      let(:masthead) { FactoryGirl.create(:masthead, display: true) }
+
+      before do
+        search.masthead = masthead
+        search.save
+      end
+
+      it 'has a contextual masthead with the title and resource count' do
+        visit spotlight.exhibit_browse_path(exhibit, search)
+
+        expect(page).to have_selector '.masthead .h1', text: 'Some Saved Search'
+
+        within '#main-container' do
+          expect(page).not_to have_selector 'h1', text: 'Some Saved Search'
+        end
+
+        expect(page).to have_selector '.masthead small.item-count', text: /\d+ items/
+      end
+
+      it 'does not show the search bar' do
+        visit spotlight.exhibit_browse_path(exhibit, search)
+
+        expect(page).not_to have_selector '.search-query-form'
+      end
+
+      it 'does not have breadcrumbs' do
+        visit spotlight.exhibit_browse_path(exhibit, search)
+
+        expect(page).not_to have_selector '.breadcrumbs-container'
+      end
+    end
+  end
+end

data/spec/features/edit_contact_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe 'Add a contact to an exhibit', type: :feature do
-  let(:curator) { FactoryGirl.create(:exhibit_curator) }
-  let(:exhibit) { curator.roles.first.exhibit }
+  let(:curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+  let(:exhibit) { FactoryGirl.create(:exhibit) }
   let!(:about_page) { FactoryGirl.create(:about_page, exhibit: exhibit) }
   let!(:contact) { FactoryGirl.create(:contact, name: 'Marcus Aurelius', exhibit: exhibit) }
   before { login_as curator }

data/spec/features/exhibit_masthead_spec.rb

@@ -0,0 +1,100 @@
+require 'spec_helper'
+
+describe 'Add and update the site masthead', type: :feature do
+  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:user) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
+
+  before { login_as user }
+  it 'updates exhibit masthead options' do
+    visit spotlight.exhibit_dashboard_path(exhibit)
+
+    within '#sidebar' do
+      click_link 'Appearance'
+    end
+
+    click_link 'Site masthead'
+
+    within '#site-masthead' do
+      check 'Show background image in masthead'
+      choose 'Upload an image'
+      attach_file('exhibit_masthead_attributes_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
+    end
+
+    click_button 'Save changes'
+
+    expect(page).to have_content('The exhibit was successfully updated.')
+
+    within '#sidebar' do
+      click_link 'Appearance'
+    end
+
+    click_link 'Site masthead'
+
+    within '#site-masthead' do
+      expect(field_labeled('Show background image in masthead')).to be_checked
+      expect(field_labeled('Upload an image')).to be_checked
+    end
+  end
+  it 'displays a masthead image when one is uploaded and configured' do
+    visit spotlight.exhibit_dashboard_path(exhibit)
+    expect(page).to_not have_css('.image-masthead')
+    within '#sidebar' do
+      click_link 'Appearance'
+    end
+
+    click_link 'Site masthead'
+
+    within '#site-masthead' do
+      check 'Show background image in masthead'
+
+      attach_file('exhibit_masthead_attributes_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
+    end
+
+    click_button 'Save changes'
+
+    expect(page).to have_content('The exhibit was successfully updated.')
+
+    expect(page).to have_css('.image-masthead .background-container')
+  end
+  it 'does not display an uploaded masthead if configured to not display' do
+    visit spotlight.exhibit_dashboard_path(exhibit)
+    expect(page).to_not have_css('.image-masthead')
+    within '#sidebar' do
+      click_link 'Appearance'
+    end
+
+    click_link 'Site masthead'
+
+    within '#site-masthead' do
+      attach_file('exhibit_masthead_attributes_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
+    end
+
+    click_button 'Save changes'
+
+    expect(page).to have_content('The exhibit was successfully updated.')
+
+    expect(page).to_not have_css('.image-masthead .background-container')
+  end
+  it 'displays a masthead image when one is uploaded from an exhibit item', js: true do
+    skip "Capyabara and jcrop don't play well together.."
+    visit spotlight.exhibit_dashboard_path(exhibit)
+    expect(page).to_not have_css('.image-masthead')
+    within '#sidebar' do
+      click_link 'Appearance'
+    end
+
+    click_link 'Site masthead'
+
+    within '#site-masthead' do
+      check 'Show background image in masthead'
+
+      fill_in_typeahead_field 'document_title', with: 'Armenia'
+    end
+
+    click_button 'Save changes'
+
+    expect(page).to have_content('The appearance was successfully updated.')
+
+    expect(page).to have_css('.image-masthead .background-container')
+  end
+end

data/spec/features/javascript/reindex_monitor_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+feature 'Reindex Monitor', js: true do
+  let(:resources) do
+    [FactoryGirl.create(:resource, updated_at: Time.zone.now, index_status: 1)]
+  end
+  let(:exhibit) { FactoryGirl.create(:exhibit, resources: resources) }
+  let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+
+  before do
+    login_as exhibit_curator
+    visit spotlight.admin_exhibit_catalog_index_path(exhibit)
+  end
+
+  it 'is rendered on the item admin page' do
+    expect(page).to have_css('.panel.index-status', visible: true)
+    within('.panel.index-status') do
+      expect(page).to have_css('p', text: /Began reindexing a total of \d items/)
+      expect(page).to have_css('p', text: /Reindexed \d of \d items/)
+    end
+  end
+end

data/spec/features/site_masthead_spec.rb

@@ -1,100 +1,65 @@
 require 'spec_helper'
 
 describe 'Add and update the site masthead', type: :feature do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
-  let(:user) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
+  let(:user) { FactoryGirl.create(:site_admin) }
 
   before { login_as user }
-  it 'updates site masthead options' do
-    visit spotlight.exhibit_dashboard_path(exhibit)
 
-    within '#sidebar' do
-      click_link 'Appearance'
-    end
+  it 'updates site masthead options' do
+    visit spotlight.edit_site_path
 
     click_link 'Site masthead'
 
     within '#site-masthead' do
       check 'Show background image in masthead'
-      choose 'Upload an image'
-      attach_file('exhibit_masthead_attributes_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
+      attach_file('site_masthead_attributes_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
     end
 
     click_button 'Save changes'
 
-    expect(page).to have_content('The exhibit was successfully updated.')
-
-    within '#sidebar' do
-      click_link 'Appearance'
-    end
+    expect(page).to have_content('The site was successfully updated.')
 
+    visit spotlight.edit_site_path
     click_link 'Site masthead'
 
     within '#site-masthead' do
       expect(field_labeled('Show background image in masthead')).to be_checked
-      expect(field_labeled('Upload an image')).to be_checked
     end
   end
   it 'displays a masthead image when one is uploaded and configured' do
-    visit spotlight.exhibit_dashboard_path(exhibit)
-    expect(page).to_not have_css('#exhibit-masthead.with-image')
-    within '#sidebar' do
-      click_link 'Appearance'
-    end
+    visit spotlight.edit_site_path
+
+    expect(page).to_not have_css('.image-masthead')
 
     click_link 'Site masthead'
 
     within '#site-masthead' do
       check 'Show background image in masthead'
 
-      attach_file('exhibit_masthead_attributes_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
+      attach_file('site_masthead_attributes_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
     end
 
     click_button 'Save changes'
 
-    expect(page).to have_content('The exhibit was successfully updated.')
+    expect(page).to have_content('The site was successfully updated.')
 
-    expect(page).to have_css('#exhibit-masthead.with-image .background-container')
+    expect(page).to have_css('.image-masthead .background-container')
   end
   it 'does not display an uploaded masthead if configured to not display' do
-    visit spotlight.exhibit_dashboard_path(exhibit)
-    expect(page).to_not have_css('#exhibit-masthead.with-image')
-    within '#sidebar' do
-      click_link 'Appearance'
-    end
-
-    click_link 'Site masthead'
+    visit spotlight.edit_site_path
 
-    within '#site-masthead' do
-      attach_file('exhibit_masthead_attributes_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
-    end
-
-    click_button 'Save changes'
-
-    expect(page).to have_content('The exhibit was successfully updated.')
-
-    expect(page).to_not have_css('#exhibit-masthead.with-image .background-container')
-  end
-  it 'displays a masthead image when one is uploaded from an exhibit item', js: true do
-    skip "Capyabara and jcrop don't play well together.."
-    visit spotlight.exhibit_dashboard_path(exhibit)
-    expect(page).to_not have_css('#exhibit-masthead.with-image')
-    within '#sidebar' do
-      click_link 'Appearance'
-    end
+    expect(page).to_not have_css('.image-masthead')
 
     click_link 'Site masthead'
 
     within '#site-masthead' do
-      check 'Show background image in masthead'
-
-      fill_in_typeahead_field 'document_title', with: 'Armenia'
+      attach_file('site_masthead_attributes_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
     end
 
     click_button 'Save changes'
 
-    expect(page).to have_content('The appearance was successfully updated.')
+    expect(page).to have_content('The site was successfully updated.')
 
-    expect(page).to have_css('#exhibit-masthead.with-image .background-container')
+    expect(page).to_not have_css('.image-masthead .background-container')
   end
 end

data/spec/helpers/spotlight/application_helper_spec.rb

@@ -2,6 +2,11 @@ require 'spec_helper'
 
 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
+
     it 'includes the exhibit' do
       allow(helper).to receive_messages(current_exhibit: double(title: 'My Exhibit'))
       expect(helper.application_name).to eq 'My Exhibit - Blacklight'
@@ -11,6 +16,17 @@ describe Spotlight::ApplicationHelper, type: :helper do
       allow(helper).to receive_messages(current_exhibit: nil)
       expect(helper.application_name).to eq 'Blacklight'
     end
+
+    context 'with a configured site title' do
+      before do
+        site.title = 'Some Title'
+        allow(helper).to receive_messages(current_exhibit: nil)
+      end
+
+      it 'uses the configured name' do
+        expect(helper.application_name).to eq 'Some Title'
+      end
+    end
   end
 
   describe '#url_to_tag_facet' do

data/spec/lib/spotlight/controller_spec.rb

@@ -24,37 +24,63 @@ describe Spotlight::Controller do
       allow(subject).to receive_messages(current_exhibit: nil, current_masthead: nil)
     end
 
-    it 'is true if there is no exhibit' do
-      expect(subject.exhibit_masthead?).to eq true
+    it 'is false if there is no exhibit' do
+      expect(subject.exhibit_masthead?).to be_falsey
     end
 
-    it 'is true if there is no custom exhibit masthead' do
-      allow(subject).to receive_messages(current_exhibit: double, current_masthead: nil)
-      expect(subject.exhibit_masthead?).to eq true
+    it 'is false if there is no custom exhibit masthead' do
+      allow(subject).to receive_messages(current_exhibit: double(masthead: nil), current_masthead: nil)
+      expect(subject.exhibit_masthead?).to be_falsey
     end
 
-    it 'is false if the current masthead is not the exhibit masthead' do
-      allow(subject).to receive_messages(current_exhibit: double(masthead: double), current_masthead: masthead)
-      expect(subject.exhibit_masthead?).to eq false
+    it 'is true if there is an exhibit masthead, but it is not set to display' do
+      allow(subject).to receive_messages(current_exhibit: double(masthead: double(display?: false)))
+      expect(subject.exhibit_masthead?).to be_falsey
+    end
+
+    it 'is true if there is an exhibit masthead' do
+      allow(subject).to receive_messages(current_exhibit: double(masthead: double(display?: true)))
+      expect(subject.exhibit_masthead?).to be_truthy
     end
   end
+
   describe '#current_masthead' do
     let(:search_masthead) { double('search-masthead', display?: true) }
     let(:no_display_search_masthead) { double('no-display-search-masthead', display?: false) }
     let(:exhibit_masthead) { double('exhibit-masthead', display?: true) }
     let(:exhibit) { FactoryGirl.create(:exhibit) }
     let(:search) { FactoryGirl.create(:search) }
+
     it 'is nil by default' do
       expect(subject.current_masthead).to be_nil
     end
+
     it 'returns the exhibit masthead if available' do
       allow(exhibit).to receive_messages(masthead: exhibit_masthead)
       subject.instance_variable_set(:@exhibit, exhibit)
       expect(subject.current_masthead).to eq exhibit_masthead
     end
+
     it 'allows the masthead to be set' do
       subject.current_masthead = search_masthead
       expect(subject.current_masthead).to eq search_masthead
     end
+
+    context 'with a resource masthead' do
+      before do
+        allow(subject).to receive(:resource_masthead?).and_return(true)
+      end
+
+      it 'checks if the current resource has a masthead' do
+        pending
+        expect(subject.current_masthead).to eq search_masthead
+      end
+    end
+  end
+
+  describe '#resource_masthead?' do
+    it 'is false by default' do
+      expect(subject.resource_masthead?).to eq false
+    end
   end
 end

data/spec/models/spotlight/ability_spec.rb

@@ -30,7 +30,7 @@ describe Spotlight::Ability, type: :model do
 
   describe 'a user with admin role' do
     let(:user) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
-    let(:role) { FactoryGirl.create(:role, exhibit: exhibit) }
+    let(:role) { FactoryGirl.create(:role, resource: exhibit) }
 
     it { is_expected.to be_able_to(:update, exhibit) }
 
@@ -43,7 +43,7 @@ describe Spotlight::Ability, type: :model do
     it { is_expected.to be_able_to(:process_import, exhibit) }
     it { is_expected.to be_able_to(:destroy, exhibit) }
 
-    let(:blacklight_config) { role.exhibit.blacklight_configuration }
+    let(:blacklight_config) { exhibit.blacklight_configuration }
   end
 
   describe 'a user with curate role' do
@@ -72,7 +72,6 @@ describe Spotlight::Ability, type: :model do
     it { is_expected.to be_able_to(:create, contact) }
     it { is_expected.to be_able_to(:destroy, contact) }
 
-    let(:role) { FactoryGirl.create(:role, exhibit: user.roles.first.exhibit) }
-    let(:blacklight_config) { role.exhibit.blacklight_configuration }
+    let(:blacklight_config) { exhibit.blacklight_configuration }
   end
 end