blacklight 6.18.0 → 6.19.0

data/spec/models/blacklight/solr/repository_spec.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
-describe Blacklight::Solr::Repository do
+RSpec.describe Blacklight::Solr::Repository, api: true do
+  subject(:repository) do
+    described_class.new blacklight_config
+  end
 
   let :blacklight_config do
     CatalogController.blacklight_config.deep_copy
@@ -42,7 +45,7 @@ describe Blacklight::Solr::Repository do
       allow(subject.connection).to receive(:send_and_receive).with('select', hash_including(params: { id: '123', qt: 'abc'})).and_return(mock_response)
       expect(subject.find("123", {qt: 'abc'})).to be_a_kind_of Blacklight::Solr::Response
     end
-    
+
     it "should use the :qt parameter from the default_document_solr_params" do
       blacklight_config.default_document_solr_params[:qt] = 'abc'
       blacklight_config.document_solr_request_handler = 'xyz'
@@ -82,12 +85,12 @@ describe Blacklight::Solr::Repository do
       allow(subject.connection).to receive(:send_and_receive).with('select', hash_including(params: { qt: 'abc'})).and_return(mock_response)
       expect(subject.search({qt: 'abc'})).to be_a_kind_of Blacklight::Solr::Response
     end
-    
+
     it "should preserve the class of the incoming params" do
       search_params = ActiveSupport::HashWithIndifferentAccess.new
       search_params[:q] = "query"
       allow(subject.connection).to receive(:send_and_receive).with('select', anything).and_return(mock_response)
-      
+
       response = subject.search(search_params)
       expect(response).to be_a_kind_of Blacklight::Solr::Response
       expect(response.params).to be_a_kind_of ActiveSupport::HashWithIndifferentAccess
@@ -134,5 +137,9 @@ describe Blacklight::Solr::Repository do
     end
   end
 
+  describe '#ping' do
+    subject { repository.ping }
 
+    it { is_expected.to be true }
+  end
 end

data/spec/models/blacklight/suggest/response_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-describe Blacklight::Suggest::Response do
-  let(:empty_response) { described_class.new({}, { q: 'hello' }, 'suggest') }
+RSpec.describe Blacklight::Suggest::Response, api: true do
+  let(:empty_response) { described_class.new({}, { q: 'hello' }, 'suggest', 'mySuggester') }
   let(:full_response) do
     described_class.new(
       {
@@ -36,7 +36,8 @@ describe Blacklight::Suggest::Response do
       {
         q: 'new'
       },
-      'suggest'
+      'suggest',
+      'mySuggester'
     )
   end
 
@@ -52,4 +53,4 @@ describe Blacklight::Suggest::Response do
       expect(full_response.suggestions.first['term']).to eq 'new jersey'
     end
   end
-end
+end

data/spec/models/blacklight/suggest_search_spec.rb

@@ -2,21 +2,14 @@
 
 describe Blacklight::SuggestSearch do
   let(:params) { {q: 'test'} }
-  let(:suggest_path) { 'suggest' }
-  let(:connection) { instance_double(RSolr::Client, send_and_receive: 'sent')}
-  let(:repository) { instance_double(Blacklight::Solr::Repository, connection: connection) }
+  let(:response) { instance_double(Blacklight::Suggest::Response)}
+  let(:repository) { instance_double(Blacklight::Solr::Repository, suggestions: response) }
   let(:suggest_search) { described_class.new(params, repository)}
+
   describe '#suggestions' do
-    it 'returns a Blacklight::Suggest::Response' do
-      expect(suggest_search).to receive(:suggest_results).and_return([])
-      expect(suggest_search).to receive(:suggest_handler_path).and_return(suggest_path)
-      expect(suggest_search.suggestions).to be_an Blacklight::Suggest::Response
-    end
-  end
-  describe '#suggest_results' do
-    it 'calls send_and_recieve from a repository connection' do
-      expect(suggest_search).to receive(:suggest_handler_path).and_return(suggest_path)
-      expect(suggest_search.suggest_results).to eq 'sent'
+    it 'delegates to the repository' do
+      expect(repository).to receive(:suggestions).with(q: 'test').and_return(response)
+      expect(suggest_search.suggestions).to eq response
     end
   end
 end

data/spec/presenters/index_presenter_spec.rb

@@ -49,6 +49,15 @@ describe Blacklight::IndexPresenter do
         expect(Deprecation).to receive(:warn)
         expect(subject).to eq 'document qwer value'
       end
+
+      context 'with a name as a symbol' do
+        subject { presenter.field_value :qwer }
+
+        it 'raises a deprecation' do
+          expect(Deprecation).to receive(:warn)
+          expect(subject).to eq 'document qwer value'
+        end
+      end
     end
 
     context 'when an explicit value is provided' do

data/spec/spec_helper.rb

@@ -25,15 +25,19 @@ require 'rspec/rails'
 require 'rspec/its'
 require 'rspec/collection_matchers'
 require 'capybara/rspec'
-require 'capybara/poltergeist'
+require 'selenium-webdriver'
 require 'equivalent-xml'
 
-Capybara.javascript_driver = :poltergeist
+Capybara.javascript_driver = :headless_chrome
 
-Capybara.register_driver :poltergeist do |app|
-  options = {}
-  options[:timeout] = 120 if RUBY_PLATFORM == "java"
-  Capybara::Poltergeist::Driver.new(app, options)
+Capybara.register_driver :headless_chrome do |app|
+  capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
+    chromeOptions: { args: %w[headless disable-gpu] }
+  )
+
+  Capybara::Selenium::Driver.new(app,
+                                 browser: :chrome,
+                                 desired_capabilities: capabilities)
 end
 
 # Requires supporting ruby files with custom matchers and macros, etc,

data/tasks/blacklight.rake

@@ -12,9 +12,9 @@ RuboCop::RakeTask.new(:rubocop)
 EngineCart.fingerprint_proc = EngineCart.rails_fingerprint_proc
 
 desc "Run test suite"
-task :ci => ['blacklight:generate'] do
+task ci: ['blacklight:generate'] do
   SolrWrapper.wrap do |solr|
-    solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path("..", File.dirname(__FILE__)), "solr", "conf")) do
+    solr.with_collection do
       within_test_app do
         system "RAILS_ENV=test rake blacklight:index:seed"
       end
@@ -52,8 +52,8 @@ namespace :blacklight do
       Rake::Task['engine_cart:generate'].invoke
     end
 
-    SolrWrapper.wrap(port: '8983') do |solr|
-      solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path("..", File.dirname(__FILE__)), "solr", "conf")) do
+    SolrWrapper.wrap do |solr|
+      solr.with_collection do
         Rake::Task['blacklight:internal:seed'].invoke
 
         within_test_app do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 6.18.0
+  version: 6.19.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2018-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -57,16 +57,16 @@ dependencies:
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -217,44 +217,64 @@ dependencies:
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: chromedriver-helper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.13.1
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -765,7 +785,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)