Merge pull request #3631 from projectblacklight/refactor-tests

Refactor test to use SearchBuilder

Author: jcoyne

lib/blacklight/search_builder.rb

@@ -12,7 +12,7 @@ class SearchBuilder
     attr_reader :processor_chain, :search_state, :blacklight_params
 
     # @overload initialize(scope)
-    #   @param [Object] scope scope the scope where the filter methods reside in.
+    #   @param [Object] scope the scope where the filter methods reside in.
     # @overload initialize(processor_chain, scope)
     #   @param [List<Symbol>,TrueClass] processor_chain options a list of filter methods to run or true, to use the default methods
     #   @param [Object] scope the scope where the filter methods reside in.

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

@@ -4,7 +4,14 @@
 
 RSpec.describe Blacklight::Solr::Response::GroupResponse, :api do
   let(:response) do
-    create_response(sample_response)
+    Blacklight::Solr::Response.new(sample_response, search_builder)
+  end
+
+  let(:search_builder) do
+    Blacklight::SearchBuilder.new(view_context).tap { |b| b.rows = 3 }
+  end
+  let(:view_context) do
+    double("View context", blacklight_config: CatalogController.blacklight_config.deep_copy)
   end
 
   let(:group) do
@@ -82,10 +89,6 @@
   end
 end
 
-def create_response(response, params = {})
-  Blacklight::Solr::Response.new(response, params)
-end
-
 def sample_response
   { "responseHeader" => { "params" => { "rows" => 3, "group.limit" => 5 } },
     "grouped" =>

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

@@ -7,8 +7,10 @@
     group.groups.first
   end
 
+  let(:search_builder) { {} }
+
   let(:response) do
-    create_response(sample_response)
+    Blacklight::Solr::Response.new(sample_response, search_builder)
   end
 
   let(:group) do
@@ -51,10 +53,6 @@
   end
 end
 
-def create_response(response, params = {})
-  Blacklight::Solr::Response.new(response, params)
-end
-
 def sample_response
   { "responseHeader" => { "params" => { "rows" => 3, "group.limit" => 5 } },
     "grouped" =>

spec/views/catalog/index.atom.builder_spec.rb

@@ -14,13 +14,16 @@
   end
 
   let(:blacklight_config) { CatalogController.blacklight_config.deep_copy }
+  let(:search_builder) { Blacklight::SearchBuilder.new(view) }
+  let(:response) { Blacklight::Solr::Response.new({ response: { numFound: 30 } }, search_builder) }
 
   before do
-    @response = Blacklight::Solr::Response.new({ response: { numFound: 30 } }, start: 10, rows: 10)
+    allow(view).to receive_messages(action_name: 'index', blacklight_config: blacklight_config)
+    @response = response
     allow(controller).to receive(:search_state_class).and_return(Blacklight::SearchState)
-    allow(@response).to receive(:documents).and_return(document_list)
+    allow(search_builder).to receive_messages(start: 10, rows: 10)
+    allow(response).to receive(:documents).and_return(document_list)
     params['content_format'] = 'some_format'
-    allow(view).to receive_messages(action_name: 'index', blacklight_config: blacklight_config)
   end
 
   # We need to use rexml to test certain things that have_tag wont' test

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

@@ -20,12 +20,14 @@
     before do
       stub_template "catalog/_results_pagination.html.erb" => ""
       allow(view).to receive_messages(has_search_parameters?: true, blacklight_config: Blacklight::Configuration.new)
+      allow(search_builder).to receive_messages(start: 10, rows: 10)
       allow(controller).to receive_messages(blacklight_config: Blacklight::Configuration.new)
 
       @response = response
     end
 
-    let(:response) { Blacklight::Solr::Response.new({ response: { numFound: 30 } }, start: 10, rows: 10) }
+    let(:search_builder) { Blacklight::SearchBuilder.new(view) }
+    let(:response) { Blacklight::Solr::Response.new({ response: { numFound: 30 } }, search_builder) }
 
     it "renders the search_header partial" do
       render