Disable did you mean for elasticsearch

Author: jcoyne

app/components/blacklight/search_header_component.html.erb

@@ -1,2 +1,2 @@
-<%= render 'did_you_mean' %>
-<%= render 'sort_and_per_page' %>
+<%= render 'did_you_mean' if did_you_mean? %>
+<%= render 'sort_and_per_page' %>

app/components/blacklight/search_header_component.rb

@@ -2,5 +2,10 @@
 
 module Blacklight
   class SearchHeaderComponent < Blacklight::Component
+    # Should we draw the did_you_mean component?
+    # Currently not supported with elasticsearch
+    def did_you_mean?
+      Blacklight.solr?
+    end
   end
 end

lib/blacklight.rb

@@ -24,6 +24,11 @@ def self.default_index=(repository)
     Blacklight::RuntimeRegistry.connection = repository
   end
 
+  # @return [Bool] Are we configured to use solr?
+  def self.solr?
+    repository_class == Blacklight::Solr::Repository
+  end
+
   ##
   # The configured repository class. By convention, this is
   # the class Blacklight::(name of the adapter)::Repository, e.g.

lib/blacklight/configuration/facet_field.rb

@@ -82,11 +82,11 @@ def normalize! blacklight_config = nil
       super
 
       if single && tag.blank? && ex.blank?
-        if Blacklight.repository_class == Blacklight::Elasticsearch::Repository
-          Blacklight.logger.warn "the `single' property on the facet configuration (for #{key}) is not yet supported for elasticsearch"
-        else
+        if Blacklight.solr?
           self.tag = "#{key}_single"
           self.ex = "#{key}_single"
+        else
+          Blacklight.logger.warn "the `single' property on the facet configuration (for #{key}) is not yet supported for elasticsearch"
         end
       end
 

lib/blacklight/elasticsearch/response.rb

@@ -67,6 +67,7 @@ def grouped?
   end
 
   def spelling
+    raise "XXXXXX"
     nil
   end
 

lib/generators/blacklight/solr_generator.rb

@@ -30,6 +30,7 @@ def install_solrwrapper
     end
 
     def copy_solr_conf
+      raise "XXXXXX"
       directory 'solr'
     end
 

spec/controllers/catalog_controller_spec.rb

@@ -27,19 +27,22 @@
       it "has docs and facets for query with results", :integration do
         get :index, params: { q: user_query }
         expect(assigns(:response).docs).not_to be_empty
+
         assert_facets_have_values(assigns(:response).aggregations)
       end
 
       it "has docs and facets for existing facet value", :integration do
         get :index, params: { f: { "format" => 'Book' } }
         expect(assigns(:response).docs).not_to be_empty
+
         assert_facets_have_values(assigns(:response).aggregations)
       end
 
       it "has docs and facets for non-default results per page", :integration do
         num_per_page = 7
         get :index, params: { per_page: num_per_page }
         expect(assigns(:response).docs).to have(num_per_page).items
+
         assert_facets_have_values(assigns(:response).aggregations)
       end
 
@@ -48,6 +51,7 @@
         get :index, params: { page: page }
         expect(assigns(:response).docs).not_to be_empty
         expect(assigns(:response).params[:start].to_i).to eq (page - 1) * controller.blacklight_config[:default_solr_params][:rows]
+
         assert_facets_have_values(assigns(:response).aggregations)
       end
 
@@ -74,7 +78,7 @@
         expect(assigns(:response).docs).to be_empty
       end
 
-      it "has a spelling suggestion for an appropriately poor query", :integration do
+      it "has a spelling suggestion for an appropriately poor query", :integration, :solr do
         get :index, params: { q: 'boo' }
         expect(assigns(:response).spelling.words).not_to be_nil
       end
@@ -102,6 +106,7 @@
 
         it "gets facets when no query", :integration do
           get :index
+
           assert_facets_have_values(assigns(:response).aggregations)
         end
       end
@@ -246,6 +251,7 @@
 
     it "redirects to show action for doc id" do
       put :track, params: { id: doc_id, counter: 3 }
+
       assert_redirected_to(solr_document_path(doc_id))
     end
 
@@ -256,16 +262,19 @@
 
     it "redirects to the path given in the redirect param" do
       put :track, params: { id: doc_id, counter: 3, redirect: '/xyz' }
+
       assert_redirected_to("/xyz")
     end
 
     it "redirects to the path of the uri given in the redirect param" do
       put :track, params: { id: doc_id, counter: 3, redirect: 'http://localhost:3000/xyz' }
+
       assert_redirected_to("/xyz")
     end
 
     it "keeps querystring on redirect" do
       put :track, params: { id: doc_id, counter: 3, redirect: 'http://localhost:3000/xyz?locale=pt-BR' }
+
       assert_redirected_to("/xyz?locale=pt-BR")
     end
   end

spec/features/did_you_mean_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "Did You Mean" do
+RSpec.describe "Did You Mean", :solr do
   before { visit root_path }
 
   describe "searching all fields" do

spec/integration/generators/blacklight/solr_generator_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'generators/blacklight/solr_generator'
 
-RSpec.describe Blacklight::SolrGenerator do
+RSpec.describe Blacklight::SolrGenerator, :solr do
   let(:destination) { Dir.mktmpdir }
 
   describe "#solr_wrapper_config" do

spec/services/blacklight/search_service_spec.rb

@@ -309,7 +309,7 @@
   end
 
   # SPECS FOR SPELLING SUGGESTIONS VIA SEARCH
-  describe "Searches should return spelling suggestions", :integration do
+  describe "Searches should return spelling suggestions", :integration, :solr do
     context "for just-poor-enough-query term" do
       let(:user_params) { { q: 'boo' } }