blacklight-spotlight 0.19.0 → 0.19.1

data/spec/views/spotlight/feature_pages/_empty.html.erb_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe 'spotlight/feature_pages/_empty.html.erb', type: :view do
   let(:can?) { false }

data/spec/views/spotlight/feature_pages/_sidebar.html.erb_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe 'spotlight/feature_pages/_sidebar.html.erb', type: :view do
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/views/spotlight/home_pages/_empty.html.erb_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe 'spotlight/home_pages/_empty.html.erb', type: :view do
   describe 'resource providers' do

data/spec/views/spotlight/home_pages/_sidebar.html.erb_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe 'spotlight/home_pages/_sidebar.html.erb', type: :view do
   before do

data/spec/views/spotlight/metadata_configurations/_metadata_field.html.erb_spec.rb

@@ -1,27 +1,23 @@
-require 'spec_helper'
-
-module Spotlight
-  describe 'spotlight/metadata_configurations/_metadata_field', type: :view do
-    let(:exhibit) { FactoryGirl.create(:exhibit) }
-    let(:p) { 'spotlight/metadata_configurations/metadata_field.html.erb' }
-    before do
-      assign(:exhibit, exhibit)
-      assign(:blacklight_configuration, exhibit.blacklight_configuration)
-      allow(view).to receive_messages(
-        current_exhibit: exhibit,
-        blacklight_config: exhibit.blacklight_configuration,
-        available_view_fields: { some_view_type: 1, another_view_type: 2 },
-        select_deselect_button: nil
-      )
-    end
+describe 'spotlight/metadata_configurations/_metadata_field', type: :view do
+  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:p) { 'spotlight/metadata_configurations/metadata_field.html.erb' }
+  before do
+    assign(:exhibit, exhibit)
+    assign(:blacklight_configuration, exhibit.blacklight_configuration)
+    allow(view).to receive_messages(
+      current_exhibit: exhibit,
+      blacklight_config: exhibit.blacklight_configuration,
+      available_view_fields: { some_view_type: 1, another_view_type: 2 },
+      select_deselect_button: nil
+    )
+  end
 
-    let(:facet_field) { Blacklight::Configuration::FacetField.new }
-    let(:builder) { ActionView::Helpers::FormBuilder.new 'z', nil, view, {} }
+  let(:facet_field) { Blacklight::Configuration::FacetField.new }
+  let(:builder) { ActionView::Helpers::FormBuilder.new 'z', nil, view, {} }
 
-    it 'uses the index_field_label helper to render the label' do
-      allow(view).to receive(:index_field_label).with(nil, 'some_key').and_return 'Some label'
-      render partial: p, locals: { key: 'some_key', config: facet_field, f: builder }
-      expect(rendered).to have_selector '.field-label', text: 'Some label'
-    end
+  it 'uses the index_field_label helper to render the label' do
+    allow(view).to receive(:index_field_label).with(nil, 'some_key').and_return 'Some label'
+    render partial: p, locals: { key: 'some_key', config: facet_field, f: builder }
+    expect(rendered).to have_selector '.field-label', text: 'Some label'
   end
 end

data/spec/views/spotlight/metadata_configurations/edit.html.erb_spec.rb

@@ -1,23 +1,19 @@
-require 'spec_helper'
-
-module Spotlight
-  describe 'spotlight/metadata_configurations/edit', type: :view do
-    let(:exhibit) { FactoryGirl.create(:exhibit) }
-    before do
-      assign(:exhibit, exhibit)
-      assign(:blacklight_configuration, exhibit.blacklight_configuration)
-      allow(view).to receive_messages(
-        current_exhibit: exhibit,
-        blacklight_config: exhibit.blacklight_configuration,
-        available_view_fields: { some_view_type: 1, another_view_type: 2 },
-        select_deselect_button: nil
-      )
-    end
+describe 'spotlight/metadata_configurations/edit', type: :view do
+  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  before do
+    assign(:exhibit, exhibit)
+    assign(:blacklight_configuration, exhibit.blacklight_configuration)
+    allow(view).to receive_messages(
+      current_exhibit: exhibit,
+      blacklight_config: exhibit.blacklight_configuration,
+      available_view_fields: { some_view_type: 1, another_view_type: 2 },
+      select_deselect_button: nil
+    )
+  end
 
-    it 'has columns for the available view types' do
-      render
-      expect(rendered).to have_selector 'th', text: 'Some View Type'
-      expect(rendered).to have_selector 'th', text: 'Another View Type'
-    end
+  it 'has columns for the available view types' do
+    render
+    expect(rendered).to have_selector 'th', text: 'Some View Type'
+    expect(rendered).to have_selector 'th', text: 'Another View Type'
   end
 end

data/spec/views/spotlight/pages/edit.html.erb_spec.rb

@@ -1,68 +1,64 @@
-require 'spec_helper'
-
-module Spotlight
-  describe 'spotlight/pages/edit', type: :view do
-    let(:exhibit) { stub_model(Exhibit) }
-    let(:page) { stub_model(FeaturePage, exhibit: exhibit) }
-    before do
-      assign(:page, page)
-      allow(view).to receive_messages(default_thumbnail_jcrop_options: {}, available_index_fields: [], available_view_fields: [])
-    end
+describe 'spotlight/pages/edit', type: :view do
+  let(:exhibit) { stub_model(Spotlight::Exhibit) }
+  let(:page) { stub_model(Spotlight::FeaturePage, exhibit: exhibit) }
+  before do
+    assign(:page, page)
+    allow(view).to receive_messages(default_thumbnail_jcrop_options: {}, available_index_fields: [], available_view_fields: [])
+  end
 
-    it 'renders the edit page form' do
-      render
+  it 'renders the edit page form' do
+    render
 
-      # Run the generator again with the --webrat flag if you want to use webrat matchers
-      assert_select 'form[action=?][method=?]', spotlight.exhibit_feature_page_path(page.exhibit, page), 'post' do
-        assert_select 'input#feature_page_title[name=?]', 'feature_page[title]'
-        assert_select 'textarea#feature_page_content[name=?]', 'feature_page[content]'
-      end
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    assert_select 'form[action=?][method=?]', spotlight.exhibit_feature_page_path(page.exhibit, page), 'post' do
+      assert_select 'input#feature_page_title[name=?]', 'feature_page[title]'
+      assert_select 'textarea#feature_page_content[name=?]', 'feature_page[content]'
     end
+  end
 
-    describe 'locks' do
-      let(:lock) { Lock.create! on: page }
+  describe 'locks' do
+    let(:lock) { Spotlight::Lock.create! on: page }
 
-      before do
-        page.lock = lock
-      end
+    before do
+      page.lock = lock
+    end
 
-      it 'renders a lock' do
-        render
+    it 'renders a lock' do
+      render
 
-        expect(rendered).to have_css '.alert-lock'
-      end
+      expect(rendered).to have_css '.alert-lock'
+    end
 
-      it 'does not render an old lock' do
-        lock.created_at -= 1.day
+    it 'does not render an old lock' do
+      lock.created_at -= 1.day
 
-        render
+      render
 
-        expect(rendered).not_to have_css '.alert-lock'
-      end
+      expect(rendered).not_to have_css '.alert-lock'
+    end
 
-      it 'does not render a lock held by the current session' do
-        lock.current_session!
+    it 'does not render a lock held by the current session' do
+      lock.current_session!
 
-        render
+      render
 
-        expect(rendered).not_to have_css '.alert-lock'
-      end
+      expect(rendered).not_to have_css '.alert-lock'
+    end
 
-      it 'attaches a data-lock attribute to the cancel button' do
-        lock.current_session!
+    it 'attaches a data-lock attribute to the cancel button' do
+      lock.current_session!
 
-        render
+      render
 
-        expect(rendered).to have_link 'Cancel'
-        expect(rendered).to have_css "a[data-lock=\"#{url_for([spotlight, page.exhibit, lock])}\"]", text: 'Cancel'
-      end
+      expect(rendered).to have_link 'Cancel'
+      expect(rendered).to have_css "a[data-lock=\"#{url_for([spotlight, page.exhibit, lock])}\"]", text: 'Cancel'
+    end
 
-      it "does not have data-lock attribute if the lock doesn't belong to this session" do
-        render
+    it "does not have data-lock attribute if the lock doesn't belong to this session" do
+      render
 
-        expect(rendered).to have_link 'Cancel'
-        expect(rendered).not_to have_css 'a[data-lock]', text: 'Cancel'
-      end
+      expect(rendered).to have_link 'Cancel'
+      expect(rendered).not_to have_css 'a[data-lock]', text: 'Cancel'
     end
   end
 end

data/spec/views/spotlight/pages/index.html.erb_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe 'spotlight/pages/index.html.erb', type: :view do
   let(:pages) do

data/spec/views/spotlight/pages/new.html.erb_spec.rb

@@ -1,21 +1,17 @@
-require 'spec_helper'
-
-module Spotlight
-  describe 'spotlight/pages/new', type: :view do
-    let(:exhibit) { stub_model(Exhibit) }
-    before do
-      assign(:page, stub_model(FeaturePage, exhibit: exhibit).as_new_record)
-      allow(view).to receive_messages(default_thumbnail_jcrop_options: {}, available_index_fields: [], available_view_fields: [])
-    end
+describe 'spotlight/pages/new', type: :view do
+  let(:exhibit) { stub_model(Spotlight::Exhibit) }
+  before do
+    assign(:page, stub_model(Spotlight::FeaturePage, exhibit: exhibit).as_new_record)
+    allow(view).to receive_messages(default_thumbnail_jcrop_options: {}, available_index_fields: [], available_view_fields: [])
+  end
 
-    it 'renders new page form' do
-      render
+  it 'renders new page form' do
+    render
 
-      # Run the generator again with the --webrat flag if you want to use webrat matchers
-      assert_select 'form[action=?][method=?]', spotlight.exhibit_feature_pages_path(exhibit), 'post' do
-        assert_select 'input#feature_page_title[name=?]', 'feature_page[title]'
-        assert_select 'textarea#feature_page_content[name=?]', 'feature_page[content]'
-      end
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    assert_select 'form[action=?][method=?]', spotlight.exhibit_feature_pages_path(exhibit), 'post' do
+      assert_select 'input#feature_page_title[name=?]', 'feature_page[title]'
+      assert_select 'textarea#feature_page_content[name=?]', 'feature_page[content]'
     end
   end
 end

data/spec/views/spotlight/pages/show.html.erb_spec.rb

@@ -1,63 +1,68 @@
-require 'spec_helper'
-
-module Spotlight
-  describe 'spotlight/pages/show', type: :view do
-    let(:exhibit) { stub_model(Exhibit) }
-    let(:page) do
-      stub_model(FeaturePage,
-                 exhibit: exhibit,
-                 title: 'Title',
-                 content: '[]')
-    end
-    before(:each) do
-      allow(view).to receive(:current_exhibit).and_return(exhibit)
-      assign(:page, page)
-      stub_template 'spotlight/pages/_sidebar.html.erb' => 'Sidebar'
-    end
-
-    it 'renders the title as a heading' do
-      render
-      expect(rendered).to have_css('.page-title', text: page.title)
-    end
-    it 'does not render an empty heading' do
-      allow(page).to receive_messages(title: nil)
-      render
-      expect(rendered).to_not have_css('.page-title')
-    end
-
-    it 'injects the page title into the html title' do
-      expect(view).to receive(:set_html_page_title)
-      render
-    end
-
-    it 'does not include the page title' do
-      allow(page).to receive_messages(should_display_title?: false)
-      expect(view).to_not receive(:set_html_page_title)
-      render
-    end
-
-    it 'renders attributes in <p>' do
-      render
-      expect(rendered).to match(/Title/)
-    end
-
-    it 'renders the sidebar' do
-      page.display_sidebar = true
-      render
-      expect(rendered).to match('Sidebar')
-    end
-
-    it 'does not render the sidebar if the page has it disabled' do
-      allow(page).to receive_messages(display_sidebar?: false)
-      render
-      expect(rendered).to_not match('Sidebar')
-    end
-
-    it 'renders an empty partial if the page has no content' do
-      allow(page).to receive_messages(content?: false)
-      stub_template 'spotlight/pages/_empty.html.erb' => 'Empty message'
-      render
-      expect(rendered).to have_content('Empty message')
-    end
+describe 'spotlight/pages/show', type: :view do
+  let(:exhibit) { stub_model(Spotlight::Exhibit) }
+  let(:page) do
+    stub_model(Spotlight::FeaturePage,
+               exhibit: exhibit,
+               title: 'Title',
+               content: '[]')
+  end
+  before(:each) do
+    allow(view).to receive(:current_exhibit).and_return(exhibit)
+    assign(:page, page)
+    stub_template 'spotlight/pages/_sidebar.html.erb' => 'Sidebar'
+  end
+
+  it 'renders the title as a heading' do
+    render
+    expect(rendered).to have_css('.page-title', text: page.title)
+  end
+
+  it 'does not render an empty heading' do
+    allow(page).to receive_messages(title: nil)
+    render
+    expect(rendered).to_not have_css('.page-title')
+  end
+
+  it 'injects the page title into the html title' do
+    expect(view).to receive(:set_html_page_title)
+    render
+  end
+
+  it 'does not double-escape HTML entities in the HTML title' do
+    allow(page).to receive_messages(title: 'Abbott & Costello')
+    stub_template '_user_util_links.html.erb' => ''
+    stub_template 'shared/_masthead.html.erb' => ''
+    render template: 'spotlight/pages/show', layout: 'layouts/spotlight/spotlight'
+    expect(rendered).to have_content('Abbott & Costello | Blacklight')
+  end
+
+  it 'does not include the page title' do
+    allow(page).to receive_messages(should_display_title?: false)
+    expect(view).to_not receive(:set_html_page_title)
+    render
+  end
+
+  it 'renders attributes in <p>' do
+    render
+    expect(rendered).to match(/Title/)
+  end
+
+  it 'renders the sidebar' do
+    page.display_sidebar = true
+    render
+    expect(rendered).to match('Sidebar')
+  end
+
+  it 'does not render the sidebar if the page has it disabled' do
+    allow(page).to receive_messages(display_sidebar?: false)
+    render
+    expect(rendered).to_not match('Sidebar')
+  end
+
+  it 'renders an empty partial if the page has no content' do
+    allow(page).to receive_messages(content?: false)
+    stub_template 'spotlight/pages/_empty.html.erb' => 'Empty message'
+    render
+    expect(rendered).to have_content('Empty message')
   end
 end

data/spec/views/spotlight/resources/_external_resources_form.html.erb_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe 'spotlight/resources/_external_resources_form.html.erb', type: :view do
   let(:blacklight_config) { Blacklight::Configuration.new }

data/spec/views/spotlight/resources/new.html.erb_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe 'spotlight/resources/new.html.erb', type: :view do
   let(:blacklight_config) { Blacklight::Configuration.new }

data/spec/views/spotlight/roles/index.html.erb_spec.rb

@@ -1,31 +1,26 @@
-require 'spec_helper'
+describe 'spotlight/roles/index', type: :view do
+  let(:user) { stub_model(Spotlight::Engine.user_class, email: 'jane@example.com') }
+  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:admin_role) { FactoryGirl.create(:role, role: 'admin', user: user, resource: exhibit) }
+  let(:roles) { [admin_role] }
 
-module Spotlight
-  describe 'spotlight/roles/index', type: :view do
-    let(:user) { stub_model(Spotlight::Engine.user_class, email: 'jane@example.com') }
-
-    let(:exhibit) { FactoryGirl.create(:exhibit) }
-    let(:admin_role) { FactoryGirl.create(:role, role: 'admin', user: user, resource: exhibit) }
-    let(:roles) { [admin_role] }
-
-    before do
-      assign(:exhibit, exhibit)
-      allow(view).to receive(:current_exhibit).and_return(exhibit)
-      allow(exhibit).to receive(:roles).and_return roles
-    end
+  before do
+    assign(:exhibit, exhibit)
+    allow(view).to receive(:current_exhibit).and_return(exhibit)
+    allow(exhibit).to receive(:roles).and_return roles
+  end
 
-    it 'renders the index page form' do
-      render
+  it 'renders the index page form' do
+    render
 
-      action = spotlight.update_all_exhibit_roles_path(exhibit)
-      assert_select "form[action='#{action}'][method='post']" do
-        assert_select "tr[data-show-for='#{admin_role.id}']"
-        assert_select "tr[data-edit-for='#{admin_role.id}']"
-        assert_select "input[type='submit'][data-behavior='destroy-user'][data-target='#{admin_role.id}']"
-        assert_select "input[type='hidden'][data-destroy-for='#{admin_role.id}']"
-        assert_select "a[data-behavior='cancel-edit']"
-        assert_select "input[type='submit'][value='Save changes']"
-      end
+    action = spotlight.update_all_exhibit_roles_path(exhibit)
+    assert_select "form[action='#{action}'][method='post']" do
+      assert_select "tr[data-show-for='#{admin_role.id}']"
+      assert_select "tr[data-edit-for='#{admin_role.id}']"
+      assert_select "input[type='submit'][data-behavior='destroy-user'][data-target='#{admin_role.id}']"
+      assert_select "input[type='hidden'][data-destroy-for='#{admin_role.id}']"
+      assert_select "a[data-behavior='cancel-edit']"
+      assert_select "input[type='submit'][value='Save changes']"
     end
   end
 end