Fix #exhibit_search_facet_url regression from to_unsafe_h; fixes #1550

app/controllers/concerns/spotlight/controller.rb

@@ -82,7 +82,7 @@ def exhibit_search_action_url(*args)
 
     def exhibit_search_facet_url(*args)
       options = args.extract_options!
-      options = params.to_unsafe_h.merge(options).except(:exhibit_id, :only_path)
+      options = Blacklight::Parameters.sanitize(params.to_unsafe_h.with_indifferent_access).merge(options).except(:exhibit_id, :only_path)
       spotlight.facet_exhibit_catalog_url(current_exhibit, *args, options)
     end
   end

spec/lib/spotlight/controller_spec.rb

@@ -6,8 +6,10 @@ class MockController < ActionController::Base
 
   subject { MockController.new }
 
+  let(:params) { { action: 'show' } }
+
   before do
-    allow(subject).to receive_messages(params: { action: 'show' })
+    allow(subject).to receive_messages(params: ActionController::Parameters.new(params))
   end
 
   describe '#current_exhibit' do
@@ -82,4 +84,17 @@ class MockController < ActionController::Base
       expect(subject.resource_masthead?).to eq false
     end
   end
+
+  describe '#exhibit_search_facet_url' do
+    let(:exhibit) { FactoryGirl.create(:exhibit) }
+    let(:params) { { action: 'index', q: 'xyz' } }
+
+    before do
+      allow(subject).to receive(:current_exhibit).and_return(exhibit)
+    end
+    it 'adds the current exhibit context to the route' do
+      expect(subject.spotlight).to receive(:facet_exhibit_catalog_url).with(exhibit, id: 'some_field', q: 'xyz')
+      subject.exhibit_search_facet_url(id: 'some_field')
+    end
+  end
 end