Support RSolr 2.x pre-release candidates

projectblacklight · Sep 29, 2016 · bcc3289 · bcc3289
1 parent 32a2df8
commit bcc3289
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/blacklight.gemspec b/blacklight.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency "globalid"
   s.add_dependency "nokogiri",  "~>1.6"     # XML Parser
   s.add_dependency "kaminari", ">= 0.15" # the pagination (page 1,2,3, etc..) of our search results
-  s.add_dependency "rsolr",     "~> 1.0", ">= 1.0.6"  # Library for interacting with rSolr.
+  s.add_dependency "rsolr", ">= 1.0.6", "< 3"  # Library for interacting with rSolr.
   s.add_dependency "bootstrap", ">= 4.0.0.alpha", "< 5"
   s.add_dependency "deprecation"
   s.add_dependency "twitter-typeahead-rails", '0.11.1.pre.corejavascript'

diff --git a/lib/blacklight/solr/repository.rb b/lib/blacklight/solr/repository.rb
@@ -52,7 +52,7 @@ def send_and_receive(path, solr_params = {})
     protected
 
       def build_connection
-        RSolr.connect(connection_config)
+        RSolr.connect(connection_config.merge(adapter: connection_config[:http_adapter]))
       end
   end
 end
diff --git a/spec/controllers/blacklight/search_helper_spec.rb b/spec/controllers/blacklight/search_helper_spec.rb
@@ -34,7 +34,7 @@ def params
 
   let(:blacklight_config) { Blacklight::Configuration.new }
   let(:copy_of_catalog_config) { ::CatalogController.blacklight_config.deep_copy }
-  let(:blacklight_solr) { RSolr.connect(Blacklight.connection_config) }
+  let(:blacklight_solr) { RSolr.connect(Blacklight.connection_config.except(:adapter)) }
 
   before(:each) do
     @all_docs_query = ''