JsonPresenter has facets_from_request available to itself

projectblacklight · Jul 20, 2018 · 1cf2f5e · 1cf2f5e
1 parent 89f71c2
commit 1cf2f5e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/app/controllers/concerns/blacklight/catalog.rb b/app/controllers/concerns/blacklight/catalog.rb
@@ -33,7 +33,6 @@ def index
       format.atom { render layout: false }
       format.json do
         @presenter = Blacklight::JsonPresenter.new(@response,
-                                                   facets_from_request,
                                                    blacklight_config)
       end
       additional_response_formats(format)

diff --git a/app/presenters/blacklight/json_presenter.rb b/app/presenters/blacklight/json_presenter.rb
@@ -5,9 +5,8 @@ class JsonPresenter
 
     # @param [Solr::Response] response raw solr response.
     # @param [Array] facets list of facets
-    def initialize(response, facets, blacklight_config)
+    def initialize(response, blacklight_config)
       @response = response
-      @facets = facets
       @blacklight_config = blacklight_config
     end
 
@@ -18,7 +17,7 @@ def documents
     end
 
     def search_facets_as_json
-      @facets.as_json.each do |f|
+      facets_from_request.as_json.each do |f|
         f.stringify_keys!
         f.delete "options"
         f["label"] = facet_configuration_for_field(f["name"]).label

diff --git a/spec/views/catalog/index.json.jbuilder_spec.rb b/spec/views/catalog/index.json.jbuilder_spec.rb
@@ -8,13 +8,12 @@
        SolrDocument.new(id: '456', title_tsim: 'Book2', author_tsim: 'Rosie')
      ]
   end
-  let(:facets) { double("facets") }
   let(:config) do
     Blacklight::Configuration.new do |config|
       config.add_index_field 'title_tsim', label: 'Title:'
     end
   end
-  let(:presenter) { Blacklight::JsonPresenter.new(response, facets, config) }
+  let(:presenter) { Blacklight::JsonPresenter.new(response, config) }
 
   let(:hash) do
     render template: "catalog/index.json", format: :json