blacklight 9.0.0.beta1 → 9.0.0.beta2

data/spec/components/blacklight/{facet_field_list_component_spec.rb → facets/list_component_spec.rb}

@@ -2,9 +2,9 @@
 
 require 'spec_helper'
 
-RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
-  subject(:rendered) do
-    render_inline_to_capybara_node(described_class.new(facet_field: facet_field))
+RSpec.describe Blacklight::Facets::ListComponent, type: :component do
+  before do
+    render_inline(described_class.new(facet_field: facet_field))
   end
 
   let(:facet_field) do
@@ -21,7 +21,7 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
     )
   end
 
-  let(:facet_config) { Blacklight::Configuration::NullField.new(key: 'field', item_component: Blacklight::FacetItemComponent, item_presenter: Blacklight::FacetItemPresenter) }
+  let(:facet_config) { Blacklight::Configuration::NullField.new(key: 'field', item_component: Blacklight::Facets::ItemComponent, item_presenter: Blacklight::FacetItemPresenter) }
 
   let(:paginator) do
     instance_double(Blacklight::FacetPaginator, items: [
@@ -31,15 +31,15 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
   end
 
   it 'renders an accordion item' do
-    expect(rendered).to have_css '.accordion-item'
-    expect(rendered).to have_button 'Field'
-    expect(rendered).to have_css 'button[data-bs-target="#facet-field"]'
-    expect(rendered).to have_css '#facet-field.collapse.show'
+    expect(page).to have_css '.accordion-item'
+    expect(page).to have_button 'Field'
+    expect(page).to have_css 'button[data-bs-target="#facet-field"]'
+    expect(page).to have_css '#facet-field.collapse.show'
   end
 
   it 'renders the facet items' do
-    expect(rendered).to have_css 'ul.facet-values'
-    expect(rendered).to have_css 'li', count: 2
+    expect(page).to have_css 'ul.facet-values'
+    expect(page).to have_css 'li', count: 2
   end
 
   context 'with an active facet' do
@@ -58,7 +58,7 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
     end
 
     it 'adds the facet-limit-active class' do
-      expect(rendered).to have_css 'div.facet-limit-active'
+      expect(page).to have_css 'div.facet-limit-active'
     end
   end
 
@@ -78,13 +78,13 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
     end
 
     it 'renders a collapsed facet' do
-      expect(rendered).to have_css '.facet-content.collapse'
-      expect(rendered).to have_no_css '.facet-content.collapse.show'
+      expect(page).to have_css '.facet-content.collapse'
+      expect(page).to have_no_css '.facet-content.collapse.show'
     end
 
     it 'renders the toggle button in the collapsed state' do
-      expect(rendered).to have_css '.btn.collapsed'
-      expect(rendered).to have_css '.btn[aria-expanded="false"]'
+      expect(page).to have_css '.btn.collapsed'
+      expect(page).to have_css '.btn[aria-expanded="false"]'
     end
   end
 
@@ -104,7 +104,7 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
     end
 
     it 'renders a link to the modal' do
-      expect(rendered).to have_link 'more Field', href: '/catalog/facet/modal'
+      expect(page).to have_link 'more Field', href: '/catalog/facet/modal'
     end
   end
 
@@ -133,13 +133,13 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
     let(:params) { { f_inclusive: { field: %w[a b c] } } }
 
     it 'displays the constraint above the list' do
-      expect(rendered).to have_content 'Any of:'
-      expect(rendered).to have_css '.inclusive_or .facet-label', text: 'a'
-      expect(rendered).to have_link '[remove]', href: 'http://test.host/catalog?f_inclusive%5Bfield%5D%5B%5D=b&f_inclusive%5Bfield%5D%5B%5D=c'
-      expect(rendered).to have_css '.inclusive_or .facet-label', text: 'b'
-      expect(rendered).to have_link '[remove]', href: 'http://test.host/catalog?f_inclusive%5Bfield%5D%5B%5D=a&f_inclusive%5Bfield%5D%5B%5D=c'
-      expect(rendered).to have_css '.inclusive_or .facet-label', text: 'c'
-      expect(rendered).to have_link '[remove]', href: 'http://test.host/catalog?f_inclusive%5Bfield%5D%5B%5D=a&f_inclusive%5Bfield%5D%5B%5D=b'
+      expect(page).to have_content 'Any of:'
+      expect(page).to have_css '.inclusive_or .facet-label', text: 'a'
+      expect(page).to have_link '[remove]', href: 'http://test.host/catalog?f_inclusive%5Bfield%5D%5B%5D=b&f_inclusive%5Bfield%5D%5B%5D=c'
+      expect(page).to have_css '.inclusive_or .facet-label', text: 'b'
+      expect(page).to have_link '[remove]', href: 'http://test.host/catalog?f_inclusive%5Bfield%5D%5B%5D=a&f_inclusive%5Bfield%5D%5B%5D=c'
+      expect(page).to have_css '.inclusive_or .facet-label', text: 'c'
+      expect(page).to have_link '[remove]', href: 'http://test.host/catalog?f_inclusive%5Bfield%5D%5B%5D=a&f_inclusive%5Bfield%5D%5B%5D=b'
     end
   end
 end

data/spec/components/blacklight/facets/suggest_component_spec.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Blacklight::Facets::SuggestComponent, type: :component do
+  let(:facet) { Blacklight::Configuration::FacetField.new key: 'language_facet', suggest: true }
+  let(:presenter) { Blacklight::FacetFieldPresenter.new(facet, nil, nil, nil) }
+  let(:component) { described_class.new(presenter: presenter) }
+
+  before do
+    allow(presenter).to receive_messages(label: 'Language')
+  end
+
+  it 'has an input with the facet-suggest class, which the javascript needs to find it' do
+    with_request_url "/catalog/facet/language_facet" do
+      rendered = render_inline component
+      expect(rendered.css("input.facet-suggest").count).to eq 1
+    end
+  end
+
+  it 'has an input with the data-facet-field attribute, which the javascript needs to determine the correct query' do
+    with_request_url "/catalog/facet/language_facet" do
+      rendered = render_inline component
+      expect(rendered.css('input[data-facet-field="language_facet"]').count).to eq 1
+    end
+  end
+
+  it 'has an input with the data-facet-search-context attribute, which the javascript needs to determine the current search context' do
+    with_request_url "/catalog/facet/language_facet?f%5Bformat%5D%5B%5D=Book&facet.prefix=R&facet.sort=index&q=tibet&search_field=all_fields" do
+      rendered = render_inline component
+      expect(rendered.css('input[data-facet-search-context="/catalog/facet/language_facet.html?f%5Bformat%5D%5B%5D=Book&facet.prefix=R&facet.sort=index&q=tibet&search_field=all_fields"]').count).to eq 1
+    end
+  end
+
+  it 'has a visible label that is associated with the input' do
+    with_request_url "/catalog/facet/language_facet" do
+      rendered = render_inline component
+      label = rendered.css('label').first
+      expect(label.text.strip).to eq 'Filter Language'
+
+      id_in_label_for = label.attribute('for').text
+      expect(id_in_label_for).to eq('facet_suggest_language_facet')
+
+      expect(rendered.css('input').first.attribute('id').text).to eq id_in_label_for
+    end
+  end
+
+  context 'when the facet is explicitly configured to suggest: false' do
+    let(:facet) { Blacklight::Configuration::FacetField.new key: 'language_facet', suggest: false }
+
+    it 'does not display' do
+      with_request_url "/catalog/facet/language_facet" do
+        expect(render_inline(component).to_s).to eq ''
+      end
+    end
+  end
+
+  context 'when the facet is not explicitly configured with a suggest key' do
+    let(:facet) { Blacklight::Configuration::FacetField.new key: 'language_facet' }
+
+    it 'displays' do
+      with_request_url "/catalog/facet/language_facet" do
+        rendered = render_inline component
+        expect(rendered.css("input.facet-suggest").count).to eq 1
+      end
+    end
+  end
+end

data/spec/components/blacklight/header_component_spec.rb

@@ -3,14 +3,12 @@
 RSpec.describe Blacklight::HeaderComponent, type: :component do
   before do
     with_controller_class(CatalogController) do
-      allow(controller).to receive_messages(current_user: nil, search_action_url: '/search')
-      render
+      allow(vc_test_controller).to receive_messages(current_user: nil, search_action_url: '/search')
+      render_inline described_class.new(blacklight_config: CatalogController.blacklight_config)
     end
   end
 
   context 'with no slots' do
-    let(:render) { render_inline(described_class.new(blacklight_config: CatalogController.blacklight_config)) }
-
     it 'draws the topbar' do
       expect(page).to have_css 'nav.topbar'
       expect(page).to have_link 'Blacklight', href: '/'

data/spec/components/blacklight/hidden_search_state_component_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe Blacklight::HiddenSearchStateComponent, type: :component do
-  subject(:rendered) { render_inline_to_capybara_node(instance) }
+  before { render_inline(instance) }
 
   let(:params) do
     { q: "query",
@@ -13,11 +13,11 @@ RSpec.describe Blacklight::HiddenSearchStateComponent, type: :component do
   let(:instance) { described_class.new(params: params) }
 
   it "converts a hash with nested complex data to Rails-style hidden form fields" do
-    expect(rendered).to have_css("input[type='hidden'][name='q'][value='query']", visible: :hidden)
-    expect(rendered).to have_css("input[type='hidden'][name='per_page'][value='10']", visible: :hidden)
-    expect(rendered).to have_css("input[type='hidden'][name='extra_arbitrary_key'][value='arbitrary_value']", visible: :hidden)
-    expect(rendered).to have_css("input[type='hidden'][name='f[field2][]'][value='z']", visible: :hidden)
-    expect(rendered).to have_css("input[type='hidden'][name='f[field1][]'][value='a']", visible: :hidden)
-    expect(rendered).to have_css("input[type='hidden'][name='f[field1][]'][value='b']", visible: :hidden)
+    expect(page).to have_css("input[type='hidden'][name='q'][value='query']", visible: :hidden)
+    expect(page).to have_css("input[type='hidden'][name='per_page'][value='10']", visible: :hidden)
+    expect(page).to have_css("input[type='hidden'][name='extra_arbitrary_key'][value='arbitrary_value']", visible: :hidden)
+    expect(page).to have_css("input[type='hidden'][name='f[field2][]'][value='z']", visible: :hidden)
+    expect(page).to have_css("input[type='hidden'][name='f[field1][]'][value='a']", visible: :hidden)
+    expect(page).to have_css("input[type='hidden'][name='f[field1][]'][value='b']", visible: :hidden)
   end
 end

data/spec/components/blacklight/metadata_field_component_spec.rb

@@ -3,11 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::MetadataFieldComponent, type: :component do
-  subject(:rendered) do
-    render_inline_to_capybara_node(described_class.new(field: field))
-  end
-
-  let(:view_context) { controller.view_context }
+  let(:view_context) { vc_test_controller.view_context }
   let(:document) { SolrDocument.new('field' => ['Value']) }
   let(:field_config) { Blacklight::Configuration::Field.new(key: 'field', field: 'field', label: 'Field label') }
 
@@ -15,23 +11,29 @@ RSpec.describe Blacklight::MetadataFieldComponent, type: :component do
     Blacklight::FieldPresenter.new(view_context, document, field_config)
   end
 
-  it 'renders the field label' do
-    expect(rendered).to have_css 'dt.blacklight-field', text: 'Field label'
-  end
+  context "from index view" do
+    before do
+      render_inline(described_class.new(field: field))
+    end
+
+    it 'renders the field label' do
+      expect(page).to have_css 'dt.blacklight-field', text: 'Field label'
+    end
 
-  it 'renders the field value' do
-    expect(rendered).to have_css 'dd.blacklight-field', text: 'Value'
+    it 'renders the field value' do
+      expect(page).to have_css 'dd.blacklight-field', text: 'Value'
+    end
   end
 
   context 'from a show view' do
-    subject(:rendered) do
-      render_inline_to_capybara_node(described_class.new(field: field, show: true))
+    before do
+      allow(field).to receive(:label).with('show').and_return('custom label')
+
+      render_inline(described_class.new(field: field, show: true))
     end
 
     it 'renders the right field label' do
-      allow(field).to receive(:label).with('show').and_return('custom label')
-
-      expect(rendered).to have_css 'dt.blacklight-field', text: 'custom label'
+      expect(page).to have_css 'dt.blacklight-field', text: 'custom label'
     end
   end
 end

data/spec/components/blacklight/response/facet_group_component_spec.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Blacklight::Response::FacetGroupComponent, type: :component do
+  before do
+    render_inline(instance)
+  end
+
+  context 'when classes are passed in' do
+    let(:instance) do
+      described_class.new(id: 'foo', title: 'bar', body_classes: 'custom-class').tap do |component|
+        component.with_body { 'body' }
+      end
+    end
+
+    it "uses them" do
+      within '.facets' do
+        expect(page).to have_css 'div.custom-class'
+      end
+    end
+  end
+
+  context 'when classes are not passed in' do
+    let(:instance) do
+      described_class.new(id: 'foo', title: 'bar').tap do |component|
+        component.with_body { 'body' }
+      end
+    end
+
+    it "uses default classes them" do
+      within '.facets' do
+        expect(page).to have_css 'div.facets-collapse.d-lg-block.collapse.accordion'
+      end
+    end
+  end
+end

data/spec/components/blacklight/response/pagination_component_spec.rb

@@ -38,7 +38,7 @@ RSpec.describe Blacklight::Response::PaginationComponent, type: :component do
 
     context 'when a different configuration that removes deep links is configured in the controller' do
       before do
-        allow(controller.blacklight_config.index)
+        allow(vc_test_controller.blacklight_config.index)
           .to receive(:pagination_options)
           .and_return(theme: 'blacklight', left: 5, right: 0)
         render

data/spec/components/blacklight/response/spellcheck_component_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe Blacklight::Response::SpellcheckComponent, type: :component do
   end
 
   before do
-    allow(controller).to receive(:blacklight_config).and_return(config)
+    allow(vc_test_controller).to receive(:blacklight_config).and_return(config)
   end
 
   context 'when there are many results' do

data/spec/components/blacklight/search_bar_component_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe Blacklight::SearchBarComponent, type: :component do
   end
 
   before do
-    allow(controller).to receive(:blacklight_config).and_return(blacklight_config)
+    allow(vc_test_controller).to receive(:blacklight_config).and_return(blacklight_config)
   end
 
   context 'with the default button' do
@@ -31,7 +31,7 @@ RSpec.describe Blacklight::SearchBarComponent, type: :component do
     subject(:render) do
       render_inline(instance) do |c|
         c.with_search_button do
-          controller.view_context.tag.button "hello", id: 'custom_search'
+          vc_test_controller.view_context.tag.button "hello", id: 'custom_search'
         end
       end
     end
@@ -70,8 +70,8 @@ RSpec.describe Blacklight::SearchBarComponent, type: :component do
   context 'with extra inputs' do
     subject(:render) do
       render_inline(instance) do |c|
-        c.with_before_input_group { controller.view_context.tag.input name: 'foo' }
-        c.with_before_input_group { controller.view_context.tag.input name: 'bar' }
+        c.with_before_input_group { vc_test_controller.view_context.tag.input name: 'foo' }
+        c.with_before_input_group { vc_test_controller.view_context.tag.input name: 'bar' }
       end
     end
 

data/spec/components/blacklight/search_context/server_applied_params_component_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe Blacklight::SearchContext::ServerAppliedParamsComponent, type: :c
 
   let(:instance) { described_class.new }
   let(:current_search_session) { nil }
-  let(:view_context) { controller.view_context }
+  let(:view_context) { vc_test_controller.view_context }
 
   before do
     # Not sure why we need to re-implement rspec's stub_template, but
@@ -16,7 +16,7 @@ RSpec.describe Blacklight::SearchContext::ServerAppliedParamsComponent, type: :c
     # https://github.com/rspec/rspec-rails/issues/2696
     replace_hash = { 'application/_start_over.html.erb' => 'start over' }
     if Rails.version.to_f >= 7.1
-      controller.prepend_view_path(RSpec::Rails::ViewExampleGroup::StubResolverCache.resolver_for(replace_hash))
+      vc_test_controller.prepend_view_path(RSpec::Rails::ViewExampleGroup::StubResolverCache.resolver_for(replace_hash))
     else
       view_context.view_paths.unshift(RSpec::Rails::ViewExampleGroup::StubResolverCache.resolver_for(replace_hash))
     end

data/spec/components/blacklight/search_context/server_item_pagination_component_spec.rb

@@ -11,8 +11,8 @@ RSpec.describe Blacklight::SearchContext::ServerItemPaginationComponent, type: :
   let(:instance) { described_class.new(search_context: search_context, search_session: search_session, current_document: current_document) }
 
   before do
-    allow(controller).to receive(:current_search_session).and_return(double(id: current_document_id))
-    controller.class.helper_method :current_search_session
+    allow(vc_test_controller).to receive(:current_search_session).and_return(double(id: current_document_id))
+    vc_test_controller.class.helper_method :current_search_session
   end
 
   context 'when there is no next or previous' do
@@ -40,9 +40,7 @@ RSpec.describe Blacklight::SearchContext::ServerItemPaginationComponent, type: :
     let(:next_doc) { SolrDocument.new(id: '888') }
 
     before do
-      # allow(controller).to receive(:controller_tracking_method).and_return('track_catalog_path')
-
-      allow(controller).to receive_messages(controller_name: 'catalog', link_to_previous_document: '', link_to_next_document: '')
+      allow(vc_test_controller).to receive_messages(controller_name: 'catalog', link_to_previous_document: '', link_to_next_document: '')
     end
 
     it "renders content" do

data/spec/components/blacklight/skip_link_component_spec.rb

@@ -3,12 +3,9 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::SkipLinkComponent, type: :component do
-  subject(:rendered) do
-    render_inline_to_capybara_node(described_class.new)
-  end
-
   before do
-    allow(controller).to receive(:blacklight_config).and_return(blacklight_config)
+    allow(vc_test_controller).to receive(:blacklight_config).and_return(blacklight_config)
+    render_inline(described_class.new)
   end
 
   context 'with no search fields' do
@@ -19,8 +16,8 @@ RSpec.describe Blacklight::SkipLinkComponent, type: :component do
     end
 
     it 'renders skip links with correct link to search' do
-      expect(rendered).to have_link("Skip to main content", href: '#main-container')
-      expect(rendered).to have_link("Skip to search", href: "#q")
+      expect(page).to have_link("Skip to main content", href: '#main-container')
+      expect(page).to have_link("Skip to search", href: "#q")
     end
   end
 
@@ -32,8 +29,8 @@ RSpec.describe Blacklight::SkipLinkComponent, type: :component do
     end
 
     it 'renders skip links with correct link to search' do
-      expect(rendered).to have_link("Skip to main content", href: "#main-container")
-      expect(rendered).to have_link("Skip to search", href: "#q")
+      expect(page).to have_link("Skip to main content", href: "#main-container")
+      expect(page).to have_link("Skip to search", href: "#q")
     end
   end
 
@@ -45,8 +42,8 @@ RSpec.describe Blacklight::SkipLinkComponent, type: :component do
     end
 
     it 'renders skip links with correct link to search' do
-      expect(rendered).to have_link("Skip to main content", href: "#main-container")
-      expect(rendered).to have_link("Skip to search", href: "#search_field")
+      expect(page).to have_link("Skip to main content", href: "#main-container")
+      expect(page).to have_link("Skip to search", href: "#search_field")
     end
   end
 end

data/spec/components/blacklight/start_over_button_component_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::StartOverButtonComponent, type: :component do
-  subject(:render) { render_inline(instance) }
+  subject(:render) { render_inline instance }
 
   let(:instance) { described_class.new }
   let(:blacklight_config) do
@@ -13,12 +13,12 @@ RSpec.describe Blacklight::StartOverButtonComponent, type: :component do
   end
 
   before do
-    allow(controller).to receive(:blacklight_config).and_return(blacklight_config)
+    allow(vc_test_controller).to receive(:blacklight_config).and_return(blacklight_config)
   end
 
   context 'with the current view type' do
     before do
-      controller.params[:view] = 'abc'
+      vc_test_controller.params[:view] = 'abc'
     end
 
     it 'is the catalog path' do
@@ -28,7 +28,7 @@ RSpec.describe Blacklight::StartOverButtonComponent, type: :component do
 
   context 'when the current view type is the default' do
     before do
-      controller.params[:view] = 'list'
+      vc_test_controller.params[:view] = 'list'
     end
 
     it 'does not include the current view type' do

data/spec/components/blacklight/system/dropdown_component_spec.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Blacklight::System::DropdownComponent, type: :component do
+  it 'includes a link for each choice' do
+    search_state = double(Blacklight::SearchState)
+    allow(search_state).to receive(:params_for_search).and_return('http://example.com')
+    rendered = render_inline(described_class.new(
+                               param: :per_page,
+                               choices: [
+                                 ['10 per page', 10],
+                                 ['20 per page', 20]
+                               ],
+                               search_state: search_state,
+                               selected: 20,
+                               interpolation: :count
+                             ))
+
+    expect(rendered.css('a').length).to eq 2
+    expect(rendered.css('a')[0].text).to eq '10 per page'
+    expect(rendered.css('a')[0].attributes).not_to have_key 'aria-current'
+    expect(rendered.css('a')[1].text).to eq '20 per page'
+    expect(rendered.css('a')[1].attributes).to have_key 'aria-current'
+  end
+end

data/spec/components/blacklight/system/flash_message_component_spec.rb

@@ -5,26 +5,22 @@ require 'spec_helper'
 RSpec.describe Blacklight::System::FlashMessageComponent, type: :component do
   subject(:component) { described_class.new(message: message, type: type) }
 
-  let(:view_context) { controller.view_context }
-  let(:render) do
-    component.render_in(view_context)
+  before do
+    render_inline(component)
   end
 
-  let(:rendered) do
-    Capybara::Node::Simple.new(render)
-  end
   let(:message) { 'This is an important message' }
   let(:type) { 'whatever' }
 
   it 'renders a message inside an alert' do
-    expect(rendered).to have_css 'div.alert.alert-whatever', text: message
+    expect(page).to have_css 'div.alert.alert-whatever', text: message
   end
 
   context 'with a success message' do
     let(:type) { 'success' }
 
     it 'adds some styling' do
-      expect(rendered).to have_css 'div.alert-success'
+      expect(page).to have_css 'div.alert-success'
     end
   end
 
@@ -32,7 +28,7 @@ RSpec.describe Blacklight::System::FlashMessageComponent, type: :component do
     let(:type) { 'notice' }
 
     it 'adds some styling' do
-      expect(rendered).to have_css 'div.alert-info'
+      expect(page).to have_css 'div.alert-info'
     end
   end
 
@@ -40,7 +36,7 @@ RSpec.describe Blacklight::System::FlashMessageComponent, type: :component do
     let(:type) { 'alert' }
 
     it 'adds some styling' do
-      expect(rendered).to have_css 'div.alert-warning'
+      expect(page).to have_css 'div.alert-warning'
     end
   end
 
@@ -48,7 +44,7 @@ RSpec.describe Blacklight::System::FlashMessageComponent, type: :component do
     let(:type) { 'error' }
 
     it 'adds some styling' do
-      expect(rendered).to have_css 'div.alert-danger'
+      expect(page).to have_css 'div.alert-danger'
     end
   end
 end

data/spec/controllers/catalog_controller_spec.rb

@@ -499,13 +499,14 @@ RSpec.describe CatalogController, :api do
         expect(request.flash[:error]).to be_nil
       end
 
-      it "redirects back to the record upon success" do
-        allow(RecordMailer).to receive(:email_record)
-          .with(anything, { to: 'test_email@projectblacklight.org', message: 'xyz', config: config }, hash_including(host: 'test.host'))
-          .and_return double(deliver: nil)
-        post :email, params: { id: doc_id, to: 'test_email@projectblacklight.org', message: 'xyz' }
-        expect(request.flash[:error]).to be_nil
-        expect(request).to redirect_to(solr_document_path(doc_id))
+      context 'when message is provided' do
+        it "sends email and redirects back to the record" do
+          expect do
+            post :email, params: { id: doc_id, to: 'test_email@projectblacklight.org', message: 'xyz' }
+          end.to send_email(to: 'test_email@projectblacklight.org')
+          expect(request.flash[:error]).to be_nil
+          expect(request).to redirect_to(solr_document_path(doc_id))
+        end
       end
 
       it "renders email_success for XHR requests" do
@@ -549,11 +550,9 @@ RSpec.describe CatalogController, :api do
       end
 
       it "sends to the appropriate carrier email address" do
-        expect(RecordMailer)
-          .to receive(:sms_record)
-          .with(anything, { to: '5555555555@txt.att.net', config: config }, hash_including(host: 'test.host'))
-          .and_return double(deliver: nil)
-        post :sms, params: { id: doc_id, to: '5555555555', carrier: 'txt.att.net' }
+        expect do
+          post :sms, params: { id: doc_id, to: '5555555555', carrier: 'txt.att.net' }
+        end.to send_email(to: '5555555555@txt.att.net')
       end
 
       it "redirects back to the record upon success" do
@@ -786,13 +785,6 @@ RSpec.describe CatalogController, :api do
     end
   end
 
-  describe "search_facet_path" do
-    it "is the same as the catalog path" do
-      get :index, params: { page: 1 }
-      expect(controller.send(:search_facet_path, id: "some_facet", page: 5)).to eq facet_catalog_path(id: "some_facet")
-    end
-  end
-
   describe "page_links" do
     it "has prev/next docs and result set data for non-empty result sets", :integration do
       get :page_links, params: { f: { "format" => 'Book' }, counter: 2 }
@@ -803,7 +795,7 @@ RSpec.describe CatalogController, :api do
     end
 
     it "is empty for empty result sets", :integration do
-      get :page_links, params: { f: { "format" => 'empty-result-set' }, counter: 1 }
+      get :page_links, params: { f: { "format" => ['empty-result-set'] }, counter: 1 }
       expect(assigns(:page_link_data)).to be_empty
     end
   end