blacklight 6.0.0.pre5 → 6.0.0

data/spec/lib/blacklight/parameters_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Blacklight::Parameters do
@@ -5,7 +6,7 @@ describe Blacklight::Parameters do
     subject { described_class.sanitize(params) }
 
     context "with nil values" do
-      let(:params) { { a: nil, b: 1 } }
+      let(:params) { ActionController::Parameters.new a: nil, b: 1 }
       it "removes them" do
         expect(subject).to_not have_key(:a)
         expect(subject[:b]).to eq 1
@@ -13,7 +14,7 @@ describe Blacklight::Parameters do
     end
 
     context "with blacklisted keys" do
-      let(:params) { { action: true, controller: true, id: true, commit: true, utf8: true } }
+      let(:params) { ActionController::Parameters.new action: true, controller: true, id: true, commit: true, utf8: true }
       it "removes them" do
         expect(subject).to be_empty
       end

data/spec/lib/blacklight/search_state_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Blacklight::SearchState do
@@ -8,11 +9,12 @@ describe Blacklight::SearchState do
     end
   end
 
+  let(:parameter_class) { ActionController::Parameters }
   let(:helper) { described_class.new(params, blacklight_config) }
-  let(:params) { {} }
+  let(:params) { parameter_class.new }
 
   describe "params_for_search" do
-    let(:params) { { 'default' => 'params' } }
+    let(:params) { parameter_class.new 'default' => 'params' }
 
     it "takes original params" do
       result = helper.params_for_search
@@ -22,11 +24,11 @@ describe Blacklight::SearchState do
 
     it "accepts params to merge into the controller's params" do
       result = helper.params_for_search(q: 'query')
-      expect(result).to include(:q => 'query', 'default' => 'params')
+      expect(result).to eq('q' => 'query', 'default' => 'params')
     end
 
     context "when params have blacklisted keys" do
-      let(:params) { { action: 'action', controller: 'controller', id: "id", commit: 'commit' } }
+      let(:params) { parameter_class.new action: 'action', controller: 'controller', id: "id", commit: 'commit' }
       it "removes them" do
         result = helper.params_for_search
         expect(result.keys).to_not include(:action, :controller, :commit, :id)
@@ -35,7 +37,7 @@ describe Blacklight::SearchState do
 
     context "when params has page" do
       context "and per_page changed" do
-        let(:params) { { per_page: 20, page: 5 } }
+        let(:params) { parameter_class.new per_page: 20, page: 5 }
         it "adjusts the current page" do
           result = helper.params_for_search(per_page: 100)
           expect(result[:page]).to eq 1
@@ -43,7 +45,7 @@ describe Blacklight::SearchState do
       end
 
       context "and per_page didn't change" do
-        let(:params) { { per_page: 20, page: 5 } }
+        let(:params) { parameter_class.new per_page: 20, page: 5 }
         it "doesn't change the current page" do
           result = helper.params_for_search(per_page: 20)
           expect(result[:page]).to eq 5
@@ -51,7 +53,7 @@ describe Blacklight::SearchState do
       end
 
       context "and the sort changes" do
-        let(:params) { { sort: 'field_a', page: 5 } }
+        let(:params) { parameter_class.new sort: 'field_a', page: 5 }
         it "adjusts the current page" do
           result = helper.params_for_search(sort: 'field_b')
           expect(result[:page]).to eq 1
@@ -59,7 +61,7 @@ describe Blacklight::SearchState do
       end
 
       context "and the sort didn't change" do
-        let(:params) { { sort: 'field_a', page: 5 } }
+        let(:params) { parameter_class.new sort: 'field_a', page: 5 }
         it "doesn't change the current page" do
           result = helper.params_for_search(sort: 'field_a')
           expect(result[:page]).to eq 5
@@ -68,10 +70,10 @@ describe Blacklight::SearchState do
     end
 
     context "with a block" do
-      let(:params) { { a: 1, b: 2 } }
+      let(:params) { parameter_class.new a: 1, b: 2 }
       it "should evalute the block and allow it to add or remove keys" do
         result = helper.params_for_search(c: 3) do |params|
-          params.except! :a, :b
+          params.extract! :a, :b
           params[:d] = 'd'
         end
 
@@ -83,14 +85,24 @@ describe Blacklight::SearchState do
   end
 
   describe "add_facet_params" do
-    let(:params_no_existing_facet) { { q: "query", search_field: "search_field", per_page: "50" } }
-    let(:params_existing_facets) { { q: "query", search_field: "search_field", per_page: "50", f: { "facet_field_1" => ["value1"], "facet_field_2" => ["value2", "value2a"] } } }
+    let(:params_no_existing_facet) do
+      parameter_class.new q: "query",
+                                       search_field: "search_field",
+                                       per_page: "50"
+    end
+    let(:params_existing_facets) do
+      parameter_class.new q: "query",
+                                       search_field: "search_field",
+                                       per_page: "50",
+                                       f: { "facet_field_1" => ["value1"],
+                                            "facet_field_2" => ["value2", "value2a"] }
+    end
 
     context "when there are no pre-existing facets" do
       let(:params) { params_no_existing_facet }
       it "adds facet value" do
         result_params = helper.add_facet_params("facet_field", "facet_value")
-        expect(result_params[:f]).to be_a_kind_of(Hash)
+        expect(result_params[:f]).to be_a Hash
         expect(result_params[:f]["facet_field"]).to be_a_kind_of(Array)
         expect(result_params[:f]["facet_field"]).to eq ["facet_value"]
       end
@@ -119,7 +131,7 @@ describe Blacklight::SearchState do
       it "adds a facet param to existing facet constraints" do
         result_params = helper.add_facet_params("facet_field_2", "new_facet_value")
 
-        expect(result_params[:f]).to be_a_kind_of(Hash)
+        expect(result_params[:f]).to be_a Hash
 
         params_existing_facets[:f].each_pair do |facet_field, value_list|
           expect(result_params[:f][facet_field]).to be_a_kind_of(Array)
@@ -135,14 +147,14 @@ describe Blacklight::SearchState do
         result_params = helper.add_facet_params("facet_field_2", "new_facet_value")
 
         params.each_pair do |key, value|
-          next if key == :f
+          next if key == 'f'
           expect(result_params[key]).to eq params[key]
         end
       end
     end
 
     context "with a facet selected in the params" do
-      let(:params) { { f: { 'single_value_facet_field' => 'other_value' } } }
+      let(:params) { parameter_class.new f: { 'single_value_facet_field' => 'other_value' } }
       it "replaces facets configured as single" do
         allow(helper).to receive(:facet_configuration_for_field).with('single_value_facet_field').and_return(double(single: true, key: "single_value_facet_field"))
         result_params = helper.add_facet_params('single_value_facet_field', 'my_value')
@@ -174,15 +186,15 @@ describe Blacklight::SearchState do
   end
 
   describe "add_facet_params_and_redirect" do
-    let(:params) { { q: "query",
-                :search_field => "search_field",
-                :per_page => "50",
-                :page => "5",
-                :f => {"facet_field_1" => ["value1"], "facet_field_2" => ["value2", "value2a"]},
-                Blacklight::Solr::FacetPaginator.request_keys[:page] => "100",
-                Blacklight::Solr::FacetPaginator.request_keys[:sort] => "index",
-                :id => 'facet_field_name'
-      }
+    let(:params) { parameter_class.new(
+                    q: "query",
+                    search_field: "search_field",
+                    per_page: "50",
+                    page: "5",
+                    f: { "facet_field_1" => ["value1"], "facet_field_2" => ["value2", "value2a"] },
+                    Blacklight::Solr::FacetPaginator.request_keys[:page] => "100",
+                    Blacklight::Solr::FacetPaginator.request_keys[:sort] => "index",
+                    id: 'facet_field_name')
     }
 
     it "does not include request parameters used by the facet paginator" do
@@ -196,10 +208,10 @@ describe Blacklight::SearchState do
 
     it 'removes :page request key' do
       params = helper.add_facet_params_and_redirect("facet_field_2", "facet_value")
-      expect(params.keys).to_not include(:page)
+      expect(params).to_not have_key(:page)
     end
 
-    it "should otherwise do the same thing as add_facet_params" do
+    it "otherwise does the same thing as add_facet_params" do
       added_facet_params = helper.add_facet_params("facet_field_2", "facet_value")
       added_facet_params_from_facet_action = helper.add_facet_params_and_redirect("facet_field_2", "facet_value")
 
@@ -208,7 +220,7 @@ describe Blacklight::SearchState do
   end
 
   describe "#remove_facet_params" do
-    let(:params) { { f: facet_params }}
+    let(:params) { parameter_class.new 'f' => facet_params }
     let(:facet_params) { { } }
     context "when the facet has multiple values" do
       let(:facet_params) { { 'some_field' => ['some_value', 'another_value'] } }
@@ -234,21 +246,21 @@ describe Blacklight::SearchState do
       end
     end
 
-    it "should remove the facet entirely when the last facet value is removed" do
+    it "removes the facet entirely when the last facet value is removed" do
       facet_params['another_field'] = ['some_value']
       facet_params['some_field'] = ['some_value']
 
       params = helper.remove_facet_params('some_field', 'some_value')
 
-      expect(params[:f]).not_to include 'some_field'
+      expect(params[:f]).not_to have_key 'some_field'
     end
 
-    it "should remove the 'f' parameter entirely when no facets remain" do
+    it "removes the 'f' parameter entirely when no facets remain" do
       facet_params['some_field'] = ['some_value']
 
       params = helper.remove_facet_params('some_field', 'some_value')
 
-      expect(params).not_to include :f
+      expect(params).not_to have_key :f
     end
   end
 end

data/spec/lib/blacklight/utils_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'Blacklight::Utils' do

data/spec/lib/blacklight_spec.rb

@@ -1,15 +1,13 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Blacklight do
-  
   context 'root' do
-
     let(:blroot) { File.expand_path(File.join(__FILE__, '..', '..', '..' )) }
 
     it 'should return the full path to the BL plugin' do
       expect(Blacklight.root).to eq blroot
     end
-
   end
 
   describe '.default_index' do
@@ -25,6 +23,16 @@ describe Blacklight do
   end
 
   describe '.repository_class' do
+    context 'when the adapter key is missing' do
+      before do
+        allow(Blacklight).to receive(:connection_config).and_return({})
+      end
+
+      it 'raises an error' do
+        expect { Blacklight.repository_class }.to raise_error RuntimeError, 'The value for :adapter was not found in the blacklight.yml config'
+      end
+    end
+
     context 'for a solr index' do
       before do
         allow(Blacklight).to receive(:connection_config).and_return(adapter: 'solr')

data/spec/lib/tasks/blacklight_task_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 require 'rake'
 

data/spec/models/blacklight/configurable_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe "Blacklight::Configurable" do

data/spec/models/blacklight/configuration/context_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Blacklight::Configuration::Context do

data/spec/models/blacklight/configuration_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe "Blacklight::Configuration" do

data/spec/models/blacklight/document/active_model_shim_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'Blacklight::Document::ActiveModelShim' do

data/spec/models/blacklight/document/cache_key_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Blacklight::Document::CacheKey do

data/spec/models/blacklight/document/dublin_core_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe "Blacklight::Document::DublinCore" do

data/spec/models/blacklight/document/email_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe "Blacklight::Document::Email" do

data/spec/models/blacklight/document/sms_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe "Blacklight::Document::Email" do

data/spec/models/blacklight/document_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Blacklight::Document do

data/spec/models/blacklight/facet_paginator_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Blacklight::FacetPaginator do
@@ -62,8 +63,8 @@ describe Blacklight::FacetPaginator do
 
     it 'should know a manually set sort, and produce proper sort url' do
         expect(subject.sort).to eq 'index'
-        
-        click_params = subject.params_for_resort_url('count', {})
+
+        click_params = subject.params_for_resort_url('count', {}.with_indifferent_access)
 
         expect(click_params[ sort_key ]).to eq 'count'
         expect(click_params[ page_key ]).to be_nil
@@ -71,23 +72,35 @@ describe Blacklight::FacetPaginator do
 
     context 'when sorting by "count"' do
       subject { described_class.new([]) }
+      let(:params) { HashWithIndifferentAccess.new :'facet.prefix' => 'A' }
 
       it 'includes the prefix filter for "index" sorting' do
-        expect(subject.params_for_resort_url('index', :'facet.prefix' => 'A')).to include :'facet.prefix' => 'A'
+        expect(subject.params_for_resort_url('index', params)).to include :'facet.prefix' => 'A'
       end
 
       it 'removes the prefix filter' do
-        expect(subject.params_for_resort_url('count', :'facet.prefix' => 'A')).not_to include :'facet.prefix' => 'A'
+        expect(subject.params_for_resort_url('count', params)).not_to include :'facet.prefix' => 'A'
       end
     end
   end
 
   context "for a nil :limit" do
-    subject { described_class.new(seven_facet_values, offset: 0, limit: nil) }
-    it "should return all the items" do
-      expect(subject.items).to eq seven_facet_values
+    let(:paginator) { described_class.new(seven_facet_values, offset: 0, limit: nil) }
+
+    describe "#items" do
+      subject { paginator.items }
+      it { is_expected.to eq seven_facet_values }
+    end
+
+    describe "#last_page?" do
+      subject { paginator.last_page? }
+      it { is_expected.to be true }
+    end
+
+    describe "#current_page" do
+      subject { paginator.current_page }
+      it { is_expected.to eq 1 }
     end
-    it { should be_last_page }
   end
 
   describe "#as_json" do

data/spec/models/blacklight/search_builder_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Blacklight::SearchBuilder do

data/spec/models/blacklight/solr/document/more_like_this_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Blacklight::Solr::Document::MoreLikeThis do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe "Blacklight::Solr::Document" do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Blacklight::Solr::FacetPaginator do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Blacklight::Solr::Repository do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Blacklight::Solr::Request do

data/spec/models/blacklight/solr/response/facets_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Blacklight::Solr::Response::Facets do

data/spec/models/blacklight/solr/response/group_response_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 describe Blacklight::Solr::Response::GroupResponse do

data/spec/models/blacklight/solr/response/group_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 describe Blacklight::Solr::Response::Group do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Blacklight::Solr::Response do