blacklight-spotlight 0.19.0 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 797e808c409dd777422ae85313b3730de6bd0cd3
-  data.tar.gz: 95908a121831207677ffe422e1b67cb5a451bca1
+  metadata.gz: 9fcd8fc066ada25ea481ac2794e080804013a3dd
+  data.tar.gz: b915e2ddab7b609f7359cca735298a04433fd5a3
 SHA512:
-  metadata.gz: 2789c3565185605cb60facf97aa1958825d121d4e412d989bb77ba9df20460211236a269812703457624b3d55d152acab312da275a78e601c061cb70aada9d58
-  data.tar.gz: ee69b30eb9115c7e96f1cd853cce54949d1f42fe8d9b94cce4eea451308532bbaa2c440570d51fea763e4edb777789bd430bd794058510782f1eaef5a48a9b32
+  metadata.gz: 9a905461d224104c93c8d6d215088e50e5c450e2abe82ca0db2d13e7c16f2e6abf0fad2eb41bb6cb4af872a1a130ab40fdf63e044645eeb46a1c2c7c0f58047e
+  data.tar.gz: bad97d38c3b0ddf5917e688068d64d6a6d22bfa5fbd6d4b2e96f8993250e008dea0900d6cec5a92ad843c35f509a4a41b3339356370125229475b18ffc1bf3fb

data/README.md

@@ -73,7 +73,6 @@ Our `$ rake ci` and `$ rake spotlight:server` tasks utilize Solr and the testing
 ##  More Information for Developers
 
 * [Contributing to Spotlight](https://github.com/projectblacklight/spotlight/wiki/Contributing-to-Spotlight)
-* [Testing](https://github.com/projectblacklight/spotlight/wiki/Testing)
 
 ## Tests
 

data/app/helpers/spotlight/title_helper.rb

@@ -17,7 +17,7 @@ module Spotlight
 
     # rubocop:disable Style/AccessorMethodName
     def set_html_page_title(title = nil)
-      @page_title = strip_tags(t(:'spotlight.html_title', title: title || t(:'.title', default: :'.header'), application_name: application_name))
+      @page_title = strip_tags(t(:'spotlight.html_title', title: title || t(:'.title', default: :'.header'), application_name: application_name)).html_safe
     end
     # rubocop:enable Style/AccessorMethodName
   end

data/lib/generators/spotlight/install_generator.rb

@@ -124,7 +124,7 @@ module Spotlight
     end
 
     def add_solr_config_resources
-      copy_file 'jetty.rake', 'lib/tasks/jetty.rake'
+      copy_file '.solr_wrapper.yml', '.solr_wrapper.yml'
       directory 'solr_conf'
     end
 

data/lib/spotlight/version.rb

@@ -1,4 +1,3 @@
-#
 module Spotlight
-  VERSION = '0.19.0'.freeze
+  VERSION = '0.19.1'.freeze
 end

data/spec/controllers/spotlight/resources/csv_upload_controller_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe Spotlight::Resources::CsvUploadController, type: :controller do
   routes { Spotlight::Engine.routes }

data/spec/controllers/spotlight/resources/upload_controller_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe Spotlight::Resources::UploadController, type: :controller do
   routes { Spotlight::Engine.routes }

data/spec/features/javascript/blocks/featured_browse_categories_block_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe 'Featured Browse Category Block', type: :feature, js: true do
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/features/javascript/blocks/featured_pages_block_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe 'Featured Pages Blocks', type: :feature, js: true do
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/features/javascript/blocks/search_result_block_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe 'Search Result Block', type: :feature, js: true do
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/features/javascript/blocks/solr_documents_block_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 feature 'Solr Document Block', feature: true do
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/features/javascript/blocks/uploaded_items_block_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 feature 'Uploaded Items Block', feature: true, js: true do
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/helpers/spotlight/application_helper_spec.rb

@@ -1,4 +1,3 @@
-
 describe Spotlight::ApplicationHelper, type: :helper do
   describe '#application_name' do
     let(:site) { Spotlight::Site.instance }
@@ -77,6 +76,7 @@ describe Spotlight::ApplicationHelper, type: :helper do
       end
     end
   end
+
   describe 'render_document_class' do
     let(:current_exhibit) { FactoryGirl.create(:exhibit) }
     let(:document) { SolrDocument.new(some_field: 'Some data') }
@@ -133,13 +133,8 @@ describe Spotlight::ApplicationHelper, type: :helper do
   end
 
   describe '#uploaded_field_label' do
-    let :field do
-      OpenStruct.new field_name: 'x'
-    end
-
-    let :blacklight_config do
-      Blacklight::Configuration.new
-    end
+    let(:field) { OpenStruct.new field_name: 'x' }
+    let(:blacklight_config) { Blacklight::Configuration.new }
 
     before do
       allow(helper).to receive_messages(blacklight_config: blacklight_config)
@@ -157,9 +152,7 @@ describe Spotlight::ApplicationHelper, type: :helper do
   end
 
   describe '#available_view_fields' do
-    let :blacklight_config do
-      Blacklight::Configuration.new
-    end
+    let(:blacklight_config) { Blacklight::Configuration.new }
 
     before do
       allow(helper).to receive_message_chain(:current_exhibit, :blacklight_configuration, default_blacklight_config: blacklight_config)

data/spec/helpers/spotlight/browse_helper_spec.rb

@@ -1,4 +1,3 @@
-
 describe Spotlight::BrowseHelper, type: :helper do
   it 'defaults to the gallery' do
     allow(helper).to receive_messages(blacklight_config: double(view: { gallery: true }))

data/spec/helpers/spotlight/crud_link_helpers_spec.rb

@@ -1,132 +1,129 @@
+describe Spotlight::CrudLinkHelpers, type: :helper do
+  let(:exhibit) { FactoryGirl.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'
+      expect(helper.cancel_link(:my_model, '#')).to have_link 'Cancel', href: '#'
+    end
+  end
+
+  describe '#exhibit_view_link' do
+    before do
+      allow(helper).to receive_messages action_default_value: 'View'
+    end
+
+    it 'is a model-specific view link' do
+      expect(helper).to receive(:action_default_value).with(some_model, :view).and_return 'View'
+      expect(helper.exhibit_view_link(some_model)).to have_link 'View', href: spotlight.exhibit_feature_page_path(some_model.exhibit, some_model)
+    end
+
+    it 'accepts an explicit link' do
+      expect(helper.exhibit_view_link(some_model, '#')).to have_link 'View', href: '#'
+    end
+
+    it 'accepts link_to options' do
+      expect(helper.exhibit_view_link(some_model, '#', class: 'btn')).to have_selector 'a.btn'
+    end
+  end
+
+  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'
+    end
+
+    it 'is a model-specific view link' do
+      expect(helper).to receive(:action_default_value).with(some_model).and_return 'Create'
+      expect(helper.exhibit_create_link(some_model)).to have_link 'Create', href: spotlight.new_exhibit_feature_page_path(exhibit)
+    end
+
+    it 'accepts an explicit link' do
+      expect(helper.exhibit_create_link(some_model, '#')).to have_link 'Create', href: '#'
+    end
+
+    it 'accepts link_to options' do
+      expect(helper.exhibit_create_link(some_model, '#', class: 'btn')).to have_selector 'a.btn'
+    end
+  end
 
-module Spotlight
-  describe CrudLinkHelpers, type: :helper do
-    let(:exhibit) { FactoryGirl.create(:exhibit) }
+  describe '#exhibit_edit_link' do
     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'
-        expect(helper.cancel_link(:my_model, '#')).to have_link 'Cancel', href: '#'
-      end
-    end
-
-    describe '#exhibit_view_link' do
-      before do
-        allow(helper).to receive_messages action_default_value: 'View'
-      end
-
-      it 'is a model-specific view link' do
-        expect(helper).to receive(:action_default_value).with(some_model, :view).and_return 'View'
-        expect(helper.exhibit_view_link(some_model)).to have_link 'View', href: spotlight.exhibit_feature_page_path(some_model.exhibit, some_model)
-      end
-
-      it 'accepts an explicit link' do
-        expect(helper.exhibit_view_link(some_model, '#')).to have_link 'View', href: '#'
-      end
-
-      it 'accepts link_to options' do
-        expect(helper.exhibit_view_link(some_model, '#', class: 'btn')).to have_selector 'a.btn'
-      end
-    end
-
-    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'
-      end
-
-      it 'is a model-specific view link' do
-        expect(helper).to receive(:action_default_value).with(some_model).and_return 'Create'
-        expect(helper.exhibit_create_link(some_model)).to have_link 'Create', href: spotlight.new_exhibit_feature_page_path(exhibit)
-      end
-
-      it 'accepts an explicit link' do
-        expect(helper.exhibit_create_link(some_model, '#')).to have_link 'Create', href: '#'
-      end
-
-      it 'accepts link_to options' do
-        expect(helper.exhibit_create_link(some_model, '#', class: 'btn')).to have_selector 'a.btn'
-      end
-    end
-
-    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'
-      end
-
-      it 'is a model-specific edit link' do
-        expect(helper).to receive(:action_default_value).with(some_model).and_return 'Edit'
-        expect(helper.exhibit_edit_link(some_model)).to have_link 'Edit', href: spotlight.edit_exhibit_feature_page_path(exhibit, some_model)
-      end
-
-      it 'accepts an explicit link' do
-        expect(helper.exhibit_edit_link(some_model, '#')).to have_link 'Edit', href: '#'
-      end
-
-      it 'accepts link_to options' do
-        expect(helper.exhibit_edit_link(some_model, '#', class: 'btn')).to have_selector 'a.btn'
-      end
-    end
-
-    describe '#exhibit_delete_link' do
-      before do
-        allow(helper).to receive_messages action_default_value: 'Delete'
-      end
-
-      it 'is a model-specific view link' do
-        expect(helper).to receive(:action_default_value).with(some_model, :destroy).and_return 'Delete'
-        expect(helper.exhibit_delete_link(some_model)).to have_link 'Delete', href: spotlight.exhibit_feature_page_path(some_model.exhibit, some_model)
-      end
-
-      it 'accepts an explicit link' do
-        expect(helper.exhibit_delete_link(some_model, '#')).to have_link 'Delete', href: '#'
-      end
-
-      it 'accepts link_to options' do
-        expect(helper.exhibit_delete_link(some_model, '#', class: 'btn')).to have_selector 'a.btn'
-      end
-    end
-
-    describe '#action_label' do
-      it 'returns the label for an action on a model' do
-        some_model = double
-        expect(helper).to receive(:action_default_value).with(some_model, :action).and_return 'xyz'
-        expect(helper.action_label(some_model, :action)).to eq 'xyz'
-      end
-    end
-
-    describe '#action_default_value' do
-      it 'attempts i18n lookups for models' do
-        expect(I18n).to receive(:t).with(:'helpers.action.spotlight/feature_page.edit',
-                                         model: some_model.class.model_name.human,
-                                         default: [:'helpers.action.edit', 'Edit Feature page'])
-        expect(helper.send(:action_default_value, some_model))
-      end
-
-      it 'attempts i18n lookups for unpersisted models' do
-        some_model = Spotlight::FeaturePage.new
-        expect(I18n).to receive(:t).with(:'helpers.action.spotlight/feature_page.create',
-                                         model: some_model.class.model_name.human,
-                                         default: [:'helpers.action.create', 'Create Feature page'])
-        expect(helper.send(:action_default_value, some_model))
-      end
-
-      it 'attempts i18n lookups for models with an explicit action' do
-        expect(I18n).to receive(:t).with(:'helpers.action.spotlight/feature_page.custom_action',
-                                         model: some_model.class.model_name.human,
-                                         default: [:'helpers.action.custom_action', 'Custom action Feature page'])
-        expect(helper.send(:action_default_value, some_model, :custom_action))
-      end
-
-      it 'attempts i18n lookups for symbols' do
-        expect(I18n).to receive(:t).with(:'helpers.action.my_thing.custom_action',
-                                         model: :my_thing,
-                                         default: [:'helpers.action.custom_action', 'Custom action my_thing'])
-        expect(helper.send(:action_default_value, :my_thing, :custom_action))
-      end
+    before do
+      allow(helper).to receive_messages(current_exhibit: exhibit)
+      allow(helper).to receive_messages action_default_value: 'Edit'
+    end
+
+    it 'is a model-specific edit link' do
+      expect(helper).to receive(:action_default_value).with(some_model).and_return 'Edit'
+      expect(helper.exhibit_edit_link(some_model)).to have_link 'Edit', href: spotlight.edit_exhibit_feature_page_path(exhibit, some_model)
+    end
+
+    it 'accepts an explicit link' do
+      expect(helper.exhibit_edit_link(some_model, '#')).to have_link 'Edit', href: '#'
+    end
+
+    it 'accepts link_to options' do
+      expect(helper.exhibit_edit_link(some_model, '#', class: 'btn')).to have_selector 'a.btn'
+    end
+  end
+
+  describe '#exhibit_delete_link' do
+    before do
+      allow(helper).to receive_messages action_default_value: 'Delete'
+    end
+
+    it 'is a model-specific view link' do
+      expect(helper).to receive(:action_default_value).with(some_model, :destroy).and_return 'Delete'
+      expect(helper.exhibit_delete_link(some_model)).to have_link 'Delete', href: spotlight.exhibit_feature_page_path(some_model.exhibit, some_model)
+    end
+
+    it 'accepts an explicit link' do
+      expect(helper.exhibit_delete_link(some_model, '#')).to have_link 'Delete', href: '#'
+    end
+
+    it 'accepts link_to options' do
+      expect(helper.exhibit_delete_link(some_model, '#', class: 'btn')).to have_selector 'a.btn'
+    end
+  end
+
+  describe '#action_label' do
+    it 'returns the label for an action on a model' do
+      some_model = double
+      expect(helper).to receive(:action_default_value).with(some_model, :action).and_return 'xyz'
+      expect(helper.action_label(some_model, :action)).to eq 'xyz'
+    end
+  end
+
+  describe '#action_default_value' do
+    it 'attempts i18n lookups for models' do
+      expect(I18n).to receive(:t).with(:'helpers.action.spotlight/feature_page.edit',
+                                       model: some_model.class.model_name.human,
+                                       default: [:'helpers.action.edit', 'Edit Feature page'])
+      expect(helper.send(:action_default_value, some_model))
+    end
+
+    it 'attempts i18n lookups for unpersisted models' do
+      some_model = Spotlight::FeaturePage.new
+      expect(I18n).to receive(:t).with(:'helpers.action.spotlight/feature_page.create',
+                                       model: some_model.class.model_name.human,
+                                       default: [:'helpers.action.create', 'Create Feature page'])
+      expect(helper.send(:action_default_value, some_model))
+    end
+
+    it 'attempts i18n lookups for models with an explicit action' do
+      expect(I18n).to receive(:t).with(:'helpers.action.spotlight/feature_page.custom_action',
+                                       model: some_model.class.model_name.human,
+                                       default: [:'helpers.action.custom_action', 'Custom action Feature page'])
+      expect(helper.send(:action_default_value, some_model, :custom_action))
+    end
+
+    it 'attempts i18n lookups for symbols' do
+      expect(I18n).to receive(:t).with(:'helpers.action.my_thing.custom_action',
+                                       model: :my_thing,
+                                       default: [:'helpers.action.custom_action', 'Custom action my_thing'])
+      expect(helper.send(:action_default_value, :my_thing, :custom_action))
     end
   end
 end

data/spec/helpers/spotlight/jcrop_helper_spec.rb

@@ -1,4 +1,3 @@
-
 describe Spotlight::JcropHelper do
   describe '.default_thumbnail_jcrop_options' do
     it 'produces a 4:3 aspect ratio by default' do

data/spec/helpers/spotlight/navbar_helper_spec.rb

@@ -1,22 +1,19 @@
-
-module Spotlight
-  describe NavbarHelper, type: :helper do
-    describe '#should_render_search_bar?' do
-      before do
-        allow(helper).to receive_messages(current_exhibit: nil)
-        allow(helper).to receive_messages(exhibit_masthead?: true)
-      end
-      it 'returns false when there is no exhibit context' do
-        expect(helper.should_render_spotlight_search_bar?).to be_falsey
-      end
-      it 'returns true if searchable' do
-        allow(helper).to receive_messages(current_exhibit: double(searchable?: true))
-        expect(helper.should_render_spotlight_search_bar?).to be_truthy
-      end
-      it 'returns false if currently under an "Exhibity" browse category' do
-        allow(helper).to receive_messages(exhibit_masthead?: false)
-        expect(helper.should_render_spotlight_search_bar?).to be_falsey
-      end
+describe Spotlight::NavbarHelper, type: :helper do
+  describe '#should_render_search_bar?' do
+    before do
+      allow(helper).to receive_messages(current_exhibit: nil)
+      allow(helper).to receive_messages(exhibit_masthead?: true)
+    end
+    it 'returns false when there is no exhibit context' do
+      expect(helper.should_render_spotlight_search_bar?).to be_falsey
+    end
+    it 'returns true if searchable' do
+      allow(helper).to receive_messages(current_exhibit: double(searchable?: true))
+      expect(helper.should_render_spotlight_search_bar?).to be_truthy
+    end
+    it 'returns false if currently under an "Exhibity" browse category' do
+      allow(helper).to receive_messages(exhibit_masthead?: false)
+      expect(helper.should_render_spotlight_search_bar?).to be_falsey
     end
   end
 end

data/spec/helpers/spotlight/pages_helper_spec.rb

@@ -1,95 +1,93 @@
+describe Spotlight::PagesHelper, type: :helper do
+  let(:blacklight_config) { Blacklight::Configuration.new { |config| config.show.title_field = :abc } }
+  let(:titled_document) { blacklight_config.document_model.new(abc: 'value') }
+  let(:untitled_document) { blacklight_config.document_model.new(id: '1234') }
+  let!(:current_exhibit) { FactoryGirl.create(:exhibit) }
+  let!(:home_page) { current_exhibit.home_page }
+  let!(:search) { FactoryGirl.create(:search, exhibit: current_exhibit, query_params: { 'q' => 'query' }, published: true) }
 
-module Spotlight
-  describe PagesHelper, type: :helper do
-    let(:blacklight_config) { Blacklight::Configuration.new { |config| config.show.title_field = :abc } }
-    let(:titled_document) { blacklight_config.document_model.new(abc: 'value') }
-    let(:untitled_document) { blacklight_config.document_model.new(id: '1234') }
-    let!(:current_exhibit) { FactoryGirl.create(:exhibit) }
-    let!(:home_page) { current_exhibit.home_page }
-    let!(:search) { FactoryGirl.create(:search, exhibit: current_exhibit, query_params: { 'q' => 'query' }, published: true) }
+  before(:each) do
+    allow(helper).to receive_messages(blacklight_config: blacklight_config)
+  end
 
-    before(:each) do
-      allow(helper).to receive_messages(blacklight_config: blacklight_config)
+  describe 'available_index_fields' do
+    before do
+      blacklight_config.index.title_field = :title_field
+      blacklight_config.add_index_field 'x', label: 'X'
     end
 
-    describe 'available_index_fields' do
-      before do
-        blacklight_config.index.title_field = :title_field
-        blacklight_config.add_index_field 'x', label: 'X'
-      end
+    it 'lists the configured index fields' do
+      expect(helper.available_index_fields).to include key: 'x', label: 'X'
+    end
 
-      it 'lists the configured index fields' do
-        expect(helper.available_index_fields).to include key: 'x', label: 'X'
-      end
+    it 'adds the title field if necessary' do
+      expect(helper.available_index_fields).to include key: :title_field, label: 'Title'
+    end
+  end
 
-      it 'adds the title field if necessary' do
-        expect(helper.available_index_fields).to include key: :title_field, label: 'Title'
-      end
+  describe 'disable_save_pages_button?' do
+    it 'returns true if there are no pages and we are on the about pages page' do
+      expect(helper).to receive(:page_collection_name).and_return('about_pages')
+      assign(:pages, [])
+      expect(helper.disable_save_pages_button?).to be_truthy
+    end
+    it 'returns false if there are about pages' do
+      expect(helper).to receive(:page_collection_name).and_return('about_pages')
+      assign(:pages, [{}])
+      expect(helper.disable_save_pages_button?).to be_falsey
+    end
+    it 'returns false if on the feature pages page' do
+      expect(helper).to receive(:page_collection_name).and_return('feature_pages')
+      assign(:pages, [])
+      expect(helper.disable_save_pages_button?).to be_falsey
     end
+  end
 
-    describe 'disable_save_pages_button?' do
-      it 'returns true if there are no pages and we are on the about pages page' do
-        expect(helper).to receive(:page_collection_name).and_return('about_pages')
-        assign(:pages, [])
-        expect(helper.disable_save_pages_button?).to be_truthy
-      end
-      it 'returns false if there are about pages' do
-        expect(helper).to receive(:page_collection_name).and_return('about_pages')
-        assign(:pages, [{}])
-        expect(helper.disable_save_pages_button?).to be_falsey
-      end
-      it 'returns false if on the feature pages page' do
-        expect(helper).to receive(:page_collection_name).and_return('feature_pages')
-        assign(:pages, [])
-        expect(helper.disable_save_pages_button?).to be_falsey
-      end
+  describe 'get_search_widget_search_results' do
+    let(:good) do
+      content = { type: 'xyz', data: { 'item' => { search.slug => { id: search.slug, display: 'true' } } } }
+      SirTrevorRails::Blocks::SearchResultsBlock.new(content, home_page)
     end
-    describe 'get_search_widget_search_results' do
-      let(:good) do
-        content = { type: 'xyz', data: { 'item' => { search.slug => { id: search.slug, display: 'true' } } } }
-        SirTrevorRails::Blocks::SearchResultsBlock.new(content, home_page)
-      end
 
-      let(:bad) do
-        content = { type: 'xyz', data: { 'item' => { 'garbage' => { id: 'missing', display: 'true' } } } }
-        SirTrevorRails::Blocks::SearchResultsBlock.new(content, home_page)
-      end
+    let(:bad) do
+      content = { type: 'xyz', data: { 'item' => { 'garbage' => { id: 'missing', display: 'true' } } } }
+      SirTrevorRails::Blocks::SearchResultsBlock.new(content, home_page)
+    end
 
-      let(:search_result) { [double('response'), double('documents')] }
+    let(:search_result) { [double('response'), double('documents')] }
 
-      it 'returns the results for a given search browse category' do
-        expect(helper).to receive(:search_results).with('q' => 'query').and_return(search_result)
-        expect(helper.get_search_widget_search_results(good)).to eq search_result
+    it 'returns the results for a given search browse category' do
+      expect(helper).to receive(:search_results).with('q' => 'query').and_return(search_result)
+      expect(helper.get_search_widget_search_results(good)).to eq search_result
+    end
+    it "returns an empty array when requesting a search that doesn't exist" do
+      expect(helper.get_search_widget_search_results(bad)).to be_empty
+    end
+  end
+
+  describe 'nestable helpers' do
+    describe 'nestable data attributes' do
+      it 'returns the appropriate attributes for feature pages' do
+        expect(helper.nestable_data_attributes('feature_pages')).to eq "data-max-depth='2' data-expand-btn-HTML='' data-collapse-btn-HTML=''"
+      end
+      it 'returns the appropriate attributes for about pages' do
+        expect(helper.nestable_data_attributes('about_pages')).to eq "data-max-depth='1'"
       end
-      it "returns an empty array when requesting a search that doesn't exist" do
-        expect(helper.get_search_widget_search_results(bad)).to be_empty
+      it 'returns a blank string if the type is not valid' do
+        expect(helper.nestable_data_attributes('something_else')).to eq ''
       end
     end
-
-    describe 'nestable helpers' do
-      describe 'nestable data attributes' do
-        it 'returns the appropriate attributes for feature pages' do
-          expect(helper.nestable_data_attributes('feature_pages')).to eq "data-max-depth='2' data-expand-btn-HTML='' data-collapse-btn-HTML=''"
-        end
-        it 'returns the appropriate attributes for about pages' do
-          expect(helper.nestable_data_attributes('about_pages')).to eq "data-max-depth='1'"
-        end
-        it 'returns a blank string if the type is not valid' do
-          expect(helper.nestable_data_attributes('something_else')).to eq ''
-        end
+    describe 'nestable data attributes hash' do
+      it 'returns the appropriate hash for feature pages' do
+        expect(helper.nestable_data_attributes_hash('feature_pages')).to eq('data-max-depth' => '2',
+                                                                            'data-expand-btn-HTML' => '',
+                                                                            'data-collapse-btn-HTML' => '')
+      end
+      it 'returns the appropriate hash for about pages' do
+        expect(helper.nestable_data_attributes_hash('about_pages')).to eq 'data-max-depth' => '1'
       end
-      describe 'nestable data attributes hash' do
-        it 'returns the appropriate hash for feature pages' do
-          expect(helper.nestable_data_attributes_hash('feature_pages')).to eq('data-max-depth' => '2',
-                                                                              'data-expand-btn-HTML' => '',
-                                                                              'data-collapse-btn-HTML' => '')
-        end
-        it 'returns the appropriate hash for about pages' do
-          expect(helper.nestable_data_attributes_hash('about_pages')).to eq 'data-max-depth' => '1'
-        end
-        it 'returns an empty hash if the type is not valid' do
-          expect(helper.nestable_data_attributes_hash('something_else')).to eq({})
-        end
+      it 'returns an empty hash if the type is not valid' do
+        expect(helper.nestable_data_attributes_hash('something_else')).to eq({})
       end
     end
   end