blacklight 6.0.0.pre5 → 6.0.0

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Blacklight::Solr::SearchBuilderBehavior do
@@ -81,10 +82,6 @@ describe Blacklight::Solr::SearchBuilderBehavior do
       it "should take q from request params" do
         expect(subject[:q]).to eq "test query"
       end
-
-      it "should add in extra facet.field from params" do
-        expect(subject[:"facet.field"]).to include("extra_facet")
-      end
     end
   end
 
@@ -111,6 +108,26 @@ describe Blacklight::Solr::SearchBuilderBehavior do
       expect(subject[:"f.subject_topic_facet.facet.limit"]).to eq 21
     end
 
+    context 'with a negative facet limit' do
+      before do
+        blacklight_config.facet_fields['subject_topic_facet'].limit = -1
+      end
+
+      it 'is negative' do
+        expect(subject[:"f.subject_topic_facet.facet.limit"]).to eq -1
+      end
+    end
+
+    context 'with a facet limit set to 0' do
+      before do
+        blacklight_config.facet_fields['subject_topic_facet'].limit = 0
+      end
+
+      it 'is negative' do
+        expect(subject[:"f.subject_topic_facet.facet.limit"]).to eq 0
+      end
+    end
+
     it "should handle no facet_limits in config" do
       blacklight_config.facet_fields = {}
       expect(subject).not_to have_key(:"f.subject_topic_facet.facet.limit")
@@ -333,32 +350,6 @@ describe Blacklight::Solr::SearchBuilderBehavior do
           config.add_facet_fields_to_solr_request!
         end
       end
-
-      context "user provides a single facet.field" do
-        let(:user_params) { { "facet.field" => "additional_facet" } }
-        it "adds the field" do
-          expect(subject[:"facet.field"]).to include("additional_facet")
-          expect(subject[:"facet.field"]).to have(2).fields
-        end
-      end
-
-      context "user provides a multiple facet.field" do
-        let(:user_params) { { "facet.field" => ["add_facet1", "add_facet2"] } }
-        it "adds the fields" do
-          expect(subject[:"facet.field"]).to include("add_facet1")
-          expect(subject[:"facet.field"]).to include("add_facet2")
-          expect(subject[:"facet.field"]).to have(3).fields
-        end
-      end
-
-      context "user provides a multiple facets" do
-        let(:user_params) { { "facets" => ["add_facet1", "add_facet2"] } }
-        it "adds the fields" do
-          expect(subject[:"facet.field"]).to include("add_facet1")
-          expect(subject[:"facet.field"]).to include("add_facet2")
-          expect(subject[:"facet.field"]).to have(3).fields
-        end
-      end
     end
   end
 

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

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

data/spec/models/blacklight/user_spec.rb

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

data/spec/models/bookmark_spec.rb

@@ -1,13 +1,14 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Bookmark do
+  let(:user) { User.create! email: 'xyz@example.com', password: 'xyz12345'}
   subject do
-    b = Bookmark.new 
-    b.user_id = 1
+    b = Bookmark.new(user: user)
     b.document = SolrDocument.new(id: 'u001')
     b
   end
-  
+
   it "should be valid" do
     expect(subject).to be_valid
   end

data/spec/models/record_mailer_spec.rb

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

data/spec/models/search_spec.rb

@@ -1,27 +1,25 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Search do
+  let(:user) { User.create! email: 'xyz@example.com', password: 'xyz12345'}
   describe "query_params" do
     before(:each) do
-      @search = Search.new
+      @search = Search.new(user: user)
       @query_params = { :q => "query", :f => "facet" }
     end
-    it "should accept a Hash as the value and save without error" do
-      @search.query_params = @query_params
-      assert @search.save
-    end
-    it "should return a Hash as the value" do
+
+    it "can save and retrieve the hash" do
       @search.query_params = @query_params
-      assert @search.save
+      @search.save!
       expect(Search.find(@search.id).query_params).to eq @query_params
     end
   end
-  
+
   describe "saved?" do
-    it "should be true when user_id is not NULL and greater than 0" do
-      @search = Search.new
-      @search.user_id = 1
-      @search.save
+    it "is true when user_id is not NULL and greater than 0" do
+      @search = Search.new(user: user)
+      @search.save!
 
       expect(@search).to be_saved
     end
@@ -30,45 +28,31 @@ describe Search do
       expect(@search).not_to be_saved
     end
   end
-  
+
   describe "delete_old_searches" do
-    it "should throw an ArgumentError if days_old is not a number" do
+    it "throws an ArgumentError if days_old is not a number" do
       expect { Search.delete_old_searches("blah") }.to raise_error(ArgumentError)
     end
-    it "should throw an ArgumentError if days_old is equal to 0" do
+
+    it "throws an ArgumentError if days_old is equal to 0" do
       expect { Search.delete_old_searches(0) }.to raise_error(ArgumentError)
     end
-    it "should throw an ArgumentError if days_old is less than 0" do
+
+    it "throws an ArgumentError if days_old is less than 0" do
       expect { Search.delete_old_searches(-1) }.to raise_error(ArgumentError)
     end
-    it "should destroy searches with no user_id that are older than X days" do
+
+    it "destroy searches with no user_id that are older than X days" do
       Search.destroy_all
       days_old = 7
-      unsaved_search_today = Search.new
-      unsaved_search_today.user_id = nil
-      unsaved_search_today.created_at = Date.today
-      unsaved_search_today.save
-
-      unsaved_search_past = Search.new
-      unsaved_search_past.user_id = nil
-      unsaved_search_past.created_at = Date.today - (days_old + 1).days
-      unsaved_search_past.save
-
-      saved_search_today = Search.new
-      saved_search_today.user_id = 1
-      saved_search_today.created_at = Date.today
-      saved_search_today.save
-
-      saved_search_past = Search.new
-      saved_search_past.user_id = 1
-      saved_search_past.created_at = Date.today - (days_old + 1).days
-      saved_search_past.save
+      Search.create!(created_at: Date.today)
+      Search.create!(created_at: Date.today - (days_old + 1).days)
+      Search.create!(user: user, created_at: Date.today)
+      Search.create!(user: user, created_at: Date.today - (days_old + 1).days)
 
       expect do
         Search.delete_old_searches(days_old)
       end.to change(Search, :count).by(-1)
     end
-    
   end
-  
 end

data/spec/models/solr_document_spec.rb

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

data/spec/presenters/document_presenter_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Blacklight::DocumentPresenter do
@@ -7,6 +8,9 @@ describe Blacklight::DocumentPresenter do
 
   subject { presenter }
   let(:presenter) { Blacklight::DocumentPresenter.new(document, request_context, config) }
+  let(:parameter_class) { ActionController::Parameters }
+  let(:params) { parameter_class.new }
+  let(:search_state) { Blacklight::SearchState.new(params, config) }
 
   let(:document) do
     SolrDocument.new(id: 1,
@@ -17,7 +21,7 @@ describe Blacklight::DocumentPresenter do
   end
 
   before do
-    allow(request_context).to receive(:search_state).and_return(Blacklight::SearchState.new({}, config))
+    allow(request_context).to receive(:search_state).and_return(search_state)
   end
 
   describe "link_rel_alternates" do
@@ -120,14 +124,14 @@ describe Blacklight::DocumentPresenter do
     end
 
     it "should check for a link_to_search" do
-      allow(request_context).to receive(:search_action_path).with(:f => { :link_to_search_true => ['x'] }).and_return('/foo')
+      allow(request_context).to receive(:search_action_path).with('f' => { 'link_to_search_true' => ['x'] }).and_return('/foo')
       allow(request_context).to receive(:link_to).with("x", '/foo').and_return('bar')
       value = subject.render_index_field_value 'link_to_search_true'
       expect(value).to eq 'bar'
     end
 
     it "should check for a link_to_search with a field name" do
-      allow(request_context).to receive(:search_action_path).with(:f => { :some_field => ['x'] }).and_return('/foo')
+      allow(request_context).to receive(:search_action_path).with('f' => { 'some_field' => ['x'] }).and_return('/foo')
       allow(request_context).to receive(:link_to).with("x", '/foo').and_return('bar')
       value = subject.render_index_field_value 'link_to_search_named'
       expect(value).to eq 'bar'

data/spec/routing/catalog_routing_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Routing" do

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 # Has been customized by Blacklight to work when application is in one place,
 # and actual spec/ stuff is in another (the blacklight gem checkout).  

data/spec/support/controller_level_helpers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ControllerLevelHelpers
   module ControllerViewHelpers
     include Blacklight::Facet
@@ -14,4 +15,4 @@ module ControllerLevelHelpers
   def initialize_controller_helpers(helper)
     helper.extend ControllerViewHelpers
   end
-end
+end

data/spec/support/features.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # spec/support/features.rb
 
 require File.expand_path("../features/session_helpers.rb", __FILE__)

data/spec/support/features/session_helpers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # spec/support/features/session_helpers.rb
 module Features
   module SessionHelpers

data/spec/test_app_templates/Gemfile.extra

@@ -0,0 +1,14 @@
+
+if ENV['RAILS_VERSION'] =~ /^5\.0/ || ENV['RAILS_VERSION'] == 'edge'
+  gem 'rails-controller-testing', github: 'rails/rails-controller-testing'
+  gem 'capybara', github: 'jnicklas/capybara' # we need 2.6.0 to be released
+  gem 'rspec-mocks', github: 'rspec/rspec-mocks' # we need 3.5.0 to be released
+  gem 'rspec-expectations', github: 'rspec/rspec-expectations' # we need 3.5.0 to be released
+  gem 'rspec-support', github: 'rspec/rspec-support' # we need 3.5.0 to be released
+  gem 'rspec', github: 'rspec/rspec' # we need 3.5.0 to be released
+  gem 'rspec-core', github: 'rspec/rspec-core' # we need 3.5.0 to be released
+  gem 'rspec-rails', github: 'rspec/rspec-rails' # we need 3.5.0 to be released
+  gem 'kaminari', github: 'amatsuda/kaminari' # need > 0.16.3
+  gem 'deprecation', github: 'jcoyne/deprecation', branch: 'no_alias_method_chain'
+  gem 'turbolinks', github: 'basecamp/turbolinks', branch: 'v5' # need >= 5.0.0
+end

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rails/generators'
 
 class TestAppGenerator < Rails::Generators::Base

data/spec/views/_user_util_links.html.erb_spec.rb

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

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe "catalog/constraints" do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe "catalog/_constraints_element.html.erb" do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe "catalog/_document" do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe "catalog/_document_list", type: :view do  

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

@@ -1,12 +1,15 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'catalog/_facet_index_navigation.html.erb', type: :view do
   let(:pagination) { Blacklight::Solr::FacetPaginator.new([]) }
   let(:facet) { Blacklight::Configuration::FacetField.new({ index_range: '0'..'9' })}
+  let(:blacklight_config) { Blacklight::Configuration.new }
 
   before do
     assign(:pagination, pagination)
     assign(:facet, facet)
+    allow(view).to receive(:blacklight_config).and_return(blacklight_config)
   end
 
   it 'renders the facet index navigation range' do
@@ -37,4 +40,4 @@ describe 'catalog/_facet_index_navigation.html.erb', type: :view do
       expect(rendered).to have_link 'Clear Filter'
     end
   end
-end
+end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe "catalog/facet_layout" do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe "catalog/_facets" do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 # spec for default partial to display solr document fields 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe "catalog/_index_header_default" do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe "catalog/_paginate_compact.html.erb" do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 # spec for sidebar partial in catalog show view

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 # spec for default partial to display solr document fields 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 # spec for sidebar partial in catalog show view

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe "catalog/_show_tools.html.erb" do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe "catalog/_sort_and_per_page" do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe "catalog/_thumbnail_default" do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe "catalog/_view_type_group" do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'catalog/facet.html.erb' do