Fix #search_action_url for Rails 5 compatibility

projectblacklight · Sep 1, 2016 · 8f63bd5 · 8f63bd5
1 parent d914c53
commit 8f63bd5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/app/controllers/concerns/blacklight/catalog.rb b/app/controllers/concerns/blacklight/catalog.rb
@@ -178,9 +178,6 @@ def render_document_export_format format_name
     # By default, any search action from a Blacklight::Catalog controller
     # should use the current controller when constructing the route.
     def search_action_url options = {}
-      raise ArgumentError, "Options was not a hash (#{options.class}" unless options.is_a? Hash
-      # We don't want to permit here because one of the options could be :only_path, which is an option, but not a parameter
-      # options.permit!
       url_for(options.merge(action: 'index'))
     end
 

diff --git a/spec/controllers/catalog_controller_spec.rb b/spec/controllers/catalog_controller_spec.rb
@@ -647,7 +647,7 @@ def export_as_mock
   describe "search_action_url" do
     it "is the same as the catalog url" do
       get :index, params: { page: 1 }
-      expect(controller.send(:search_action_url, q: "xyz")).to eq root_url(q: "xyz")
+      expect(controller.send(:search_action_url, ActionController::Parameters.new(q: "xyz"))).to eq root_url(q: "xyz")
     end
   end