blacklight 6.5.0 → 6.6.0

data/spec/integration/generators/blacklight/solr5_generator_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+require 'generators/blacklight/solr5_generator'
+
+describe Blacklight::Solr5Generator do
+  let(:destination) { Dir.mktmpdir }
+
+  describe "#solr_wrapper_config" do
+    let(:generator) { described_class.new }
+    let(:files_to_test) {[
+        File.join("#{destination}", '.solr_wrapper.yml')
+    ]}
+
+    before do
+      generator.destination_root = destination
+      generator.solr_wrapper_config
+
+    end
+
+    after do
+      files_to_test.each { |file| File.delete(file) if File.exist?(file) }
+    end
+
+    it "creates config files" do
+      files_to_test.each do |file|
+        expect(File).to exist(file), "Expected #{file} to exist"
+      end
+    end
+  end
+
+  describe "#copy_solr_conf" do
+    let(:generator) { described_class.new }
+    let(:dirs_to_test) {[
+        File.join("#{destination}", 'solr'),
+        File.join("#{destination}", 'solr/conf')]}
+    let(:files_to_test) {[
+        File.join("#{destination}", 'solr/conf/solrconfig.xml')
+    ]}
+
+    before do
+      generator.destination_root = destination
+      generator.copy_solr_conf
+    end
+
+    after do
+      dirs_to_test.each { |dir| FileUtils.rm_rf(Dir.glob(dir)) if File.directory?(dir) }
+    end
+
+    it "creates solr directory" do
+      dirs_to_test.each do |dir|
+        expect(File).to exist(dir), "Expected #{dir} to exist"
+      end
+    end
+
+    it "copies solr config files" do
+      files_to_test.each do |file|
+        expect(File).to exist(file), "Expected #{file} to exist"
+      end
+    end
+  end
+end

data/spec/models/blacklight/document_spec.rb

@@ -80,7 +80,7 @@ describe Blacklight::Document do
     end
 
     before do
-      allow(MockDocument).to receive(:repository).and_return(double(find: MockResponse.new([{id: 1}], {})))
+      allow(MockDocument).to receive(:repository).and_return(instance_double(Blacklight::Solr::Repository, find: MockResponse.new([{id: 1}], {})))
     end
 
     it "has a globalid" do

data/spec/models/blacklight/search_builder_spec.rb

@@ -92,7 +92,7 @@ describe Blacklight::SearchBuilder do
       expect(actual[:q]).to eq 'xyz'
     end
   end
-  
+
   describe "#reverse_merge" do
     let(:processor_chain) { [:pass_through] }
     before do
@@ -146,7 +146,6 @@ describe Blacklight::SearchBuilder do
   end
 
   describe "#rows" do
-
     it "is nil if no value is set" do
       blacklight_config.default_per_page = nil
       blacklight_config.per_page = []
@@ -235,24 +234,26 @@ describe Blacklight::SearchBuilder do
     end
 
     it "is marked as changed when reverse merged parameters are added" do
-      subject.merge(a: 1)
+      subject.reverse_merge(a: 1)
       expect(subject.send(:params_changed?)).to eq true
     end
 
     it "is marked as changed when pagination changes" do
+      expect(subject).to receive(:page=).with(1).and_call_original
       subject.page(1)
       expect(subject.send(:params_changed?)).to eq true
     end
 
     it "is marked as changed when rows changes" do
+      expect(subject).to receive(:rows=).with(1).and_call_original
       subject.rows(1)
       expect(subject.send(:params_changed?)).to eq true
     end
 
     it "is marked as changed when start offset changes" do
+      expect(subject).to receive(:start=).with(1).and_call_original
       subject.start(1)
       expect(subject.send(:params_changed?)).to eq true
     end
-
   end
 end

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

@@ -377,6 +377,7 @@ describe Blacklight::Solr::SearchBuilderBehavior do
 
     it "should pass integer-like strings through" do
       expect(subject.send(:facet_value_to_fq_string, "facet_name", "1")).to eq '{!term f=facet_name}1'
+      expect(subject.send(:facet_value_to_fq_string, "facet_name", -1)).to eq '{!term f=facet_name}-1'
     end
 
     it "should pass floats through" do
@@ -387,26 +388,19 @@ describe Blacklight::Solr::SearchBuilderBehavior do
       expect(subject.send(:facet_value_to_fq_string, "facet_name", "1.11")).to eq '{!term f=facet_name}1.11'
     end
 
-    it "should escape negative integers" do
-      expect(subject.send(:facet_value_to_fq_string, "facet_name", -1)).to eq '{!term f=facet_name}-1'
-    end
-
-    it "should pass date-type fields through" do
-      allow(blacklight_config.facet_fields).to receive(:[]).with('facet_name').and_return(double(:date => true, :query => nil, :tag => nil, :field => 'facet_name'))
-
-      expect(subject.send(:facet_value_to_fq_string, "facet_name", "2012-01-01")).to eq '{!term f=facet_name}2012-01-01'
-    end
-
-    it "should escape datetime-type fields" do
-      allow(blacklight_config.facet_fields).to receive(:[]).with('facet_name').and_return(double(:date => true, :query => nil, :tag => nil, :field => 'facet_name'))
+    context 'date handling' do
+      before { allow(blacklight_config.facet_fields).to receive(:[]).with('facet_name').and_return(double(:date => true, :query => nil, :tag => nil, :field => 'facet_name')) }
 
-      expect(subject.send(:facet_value_to_fq_string, "facet_name", "2003-04-09T00:00:00Z")).to eq '{!term f=facet_name}2003-04-09T00:00:00Z'
-    end
+      it "should pass date-type fields through" do
+        expect(subject.send(:facet_value_to_fq_string, "facet_name", "2012-01-01")).to eq '{!term f=facet_name}2012-01-01'
+        expect(subject.send(:facet_value_to_fq_string, "facet_name", "2003-04-09T00:00:00Z")).to eq '{!term f=facet_name}2003-04-09T00:00:00Z'
+      end
 
-    it "should format Date objects correctly" do
-      allow(blacklight_config.facet_fields).to receive(:[]).with('facet_name').and_return(double(:date => nil, :query => nil, :tag => nil, :field => 'facet_name'))
-      d = DateTime.parse("2003-04-09T00:00:00")
-      expect(subject.send(:facet_value_to_fq_string, "facet_name", d)).to eq '{!term f=facet_name}2003-04-09T00:00:00Z'
+      it "should format Date objects correctly" do
+        allow(blacklight_config.facet_fields).to receive(:[]).with('facet_name').and_return(double(:date => nil, :query => nil, :tag => nil, :field => 'facet_name'))
+        d = DateTime.parse("2003-04-09T00:00:00")
+        expect(subject.send(:facet_value_to_fq_string, "facet_name", d)).to eq '{!term f=facet_name}2003-04-09T00:00:00Z'
+      end
     end
 
     it "should handle range requests" do

data/spec/presenters/pipeline_spec.rb

@@ -2,7 +2,7 @@
 
 describe Blacklight::Rendering::Pipeline do
   include Capybara::RSpecMatchers
-  let(:document) { double }
+  let(:document) { instance_double(SolrDocument) }
   let(:context) { double }
   let(:options) { double }
   let(:presenter) { described_class.new(values, field_config, document, context, options) }

data/spec/spec_helper.rb

@@ -67,4 +67,47 @@ RSpec.configure do |config|
   unless Rails.version > '5'
     config.include BackportTest, type: :controller
   end
+
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.default_formatter = 'doc' if config.files_to_run.one?
+
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
+
+  config.example_status_persistence_file_path = 'spec/examples.txt'
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
 end

data/spec/views/catalog/_index_header_default.html.erb_spec.rb

@@ -9,7 +9,7 @@ describe "catalog/_index_header_default" do
 
   before do
     allow(controller).to receive(:action_name).and_return('index')
-    assign :response, double(start: 0)
+    assign :response, instance_double(Blacklight::Solr::Response, start: 0)
     allow(view).to receive(:render_grouped_response?).and_return false
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
     allow(view).to receive(:current_search_session).and_return nil

data/spec/views/catalog/_show_tools.html.erb_spec.rb

@@ -5,7 +5,7 @@ describe "catalog/_show_tools.html.erb" do
   let(:blacklight_config) { Blacklight::Configuration.new }
 
   before do
-    assign :response, double(:params => {})
+    assign :response, instance_double(Blacklight::Solr::Response, params: {})
     assign :document, document
     allow(view).to receive(:blacklight_config).and_return blacklight_config
     allow(view).to receive(:has_user_authentication_provider?).and_return false

data/spec/views/catalog/_sort_and_per_page.html.erb_spec.rb

@@ -11,7 +11,7 @@ describe "catalog/_sort_and_per_page" do
   end
 
   it "renders the pagination, sort, per page and view type controls" do
-    assign(:response, double("Solr::Response", limit_value: 1))
+    assign(:response, instance_double(Blacklight::Solr::Response, limit_value: 1))
     stub_template "catalog/_paginate_compact.html.erb" => "paginate_compact"
     stub_template "catalog/_sort_widget.html.erb" => "sort_widget"
     stub_template "catalog/_per_page_widget.html.erb" => "per_page_widget"
@@ -24,7 +24,7 @@ describe "catalog/_sort_and_per_page" do
   end
 
   it "does not render the pagination controls with bad limit values" do
-    assign(:response, double("Solr::Response", limit_value: 0))
+    assign(:response, instance_double(Blacklight::Solr::Response, limit_value: 0))
     stub_template "catalog/_paginate_compact.html.erb" => "paginate_compact"
     stub_template "catalog/_sort_widget.html.erb" => "sort_widget"
     stub_template "catalog/_per_page_widget.html.erb" => "per_page_widget"

data/spec/views/catalog/_thumbnail_default.erb_spec.rb

@@ -18,7 +18,7 @@ describe "catalog/_thumbnail_default" do
 
   before do
     allow(controller).to receive(:action_name).and_return('index')
-    assign :response, double(start: 0)
+    assign :response, instance_double(Blacklight::Solr::Response, start: 0)
     allow(view).to receive(:render_grouped_response?).and_return false
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
     allow(view).to receive(:current_search_session).and_return nil

data/spec/views/catalog/_view_type_group.html.erb_spec.rb

@@ -2,6 +2,7 @@
 
 describe "catalog/_view_type_group" do
   let(:blacklight_config) { Blacklight::Configuration.new }
+  let(:response) { instance_double(Blacklight::Solr::Response, empty?: false) }
 
   before do
     allow(view).to receive(:view_label) do |view|
@@ -9,16 +10,16 @@ describe "catalog/_view_type_group" do
     end
     allow(view).to receive_messages(how_sort_and_per_page?: true, blacklight_config: blacklight_config)
     controller.request.path_parameters[:action] = 'index'
+    assign(:response, response)
   end
 
   it "does not display the group when there's only one option" do
-    assign(:response, [])
+    allow(response).to receive_messages(empty?: true)
     render partial: 'catalog/view_type_group'
     expect(rendered).to be_empty
   end
 
   it "displays the group" do
-    assign(:response, [double])
     blacklight_config.configure do |config|
       config.view.delete(:list)
       config.view.a
@@ -33,7 +34,6 @@ describe "catalog/_view_type_group" do
   end
 
   it "sets the current view to 'active'" do
-    assign(:response, [double])
     blacklight_config.configure do |config|
       config.view.delete(:list)
       config.view.a

data/spec/views/catalog/index.html.erb_spec.rb

@@ -26,7 +26,7 @@ describe "catalog/index.html.erb" do
       stub_template "catalog/_search_header.html.erb" => "header_content"
       allow(view).to receive(:blacklight_config).and_return(Blacklight::Configuration.new)
       allow(view).to receive(:render_opensearch_response_metadata).and_return("")
-      assign(:response, double(:empty? => true))
+      assign(:response, instance_double(Blacklight::Solr::Response, empty?: true))
     end
     it "renders the search_header partial" do
       render

data/spec/views/catalog/index.json.jbuilder_spec.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 describe "catalog/index.json" do
-  let(:response) { double("response") }
+  let(:response) { instance_double(Blacklight::Solr::Response) }
   let(:docs) { [{ id: '123', title_t: 'Book1' }, { id: '456', title_t: 'Book2' }] }
   let(:facets) { double("facets") }
-  let(:config) { double("config") }
+  let(:config) { instance_double(Blacklight::Configuration) }
   let(:presenter) { Blacklight::JsonPresenter.new(response, docs, facets, config) }
 
   it "renders index json" do

data/tasks/blacklight.rake

@@ -6,6 +6,9 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern =  'spec/**/*_spec.rb'
 end
 
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new(:rubocop)
+
 EngineCart.fingerprint_proc = EngineCart.rails_fingerprint_proc
 
 desc "Run test suite"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 6.5.0
+  version: 6.6.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -255,6 +255,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   Blacklight is an open source Solr user interface discovery platform.
       You can use Blacklight to enable searching and browsing of your
@@ -272,7 +328,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".solr_wrapper"
+- ".solr_wrapper.yml"
 - ".travis.yml"
 - ".yardopts"
 - Gemfile
@@ -597,6 +653,7 @@ files:
 - spec/helpers/search_history_constraints_helper_spec.rb
 - spec/helpers/suggest_helper_spec.rb
 - spec/helpers/url_helper_spec.rb
+- spec/integration/generators/blacklight/solr5_generator_spec.rb
 - spec/lib/blacklight/parameters_spec.rb
 - spec/lib/blacklight/search_state_spec.rb
 - spec/lib/blacklight/utils_spec.rb
@@ -733,6 +790,7 @@ test_files:
 - spec/helpers/search_history_constraints_helper_spec.rb
 - spec/helpers/suggest_helper_spec.rb
 - spec/helpers/url_helper_spec.rb
+- spec/integration/generators/blacklight/solr5_generator_spec.rb
 - spec/lib/blacklight/parameters_spec.rb
 - spec/lib/blacklight/search_state_spec.rb
 - spec/lib/blacklight/utils_spec.rb