From c2b5ff1fe34d5b52a54e0349fbf8faa5b59efbc4 Mon Sep 17 00:00:00 2001
From: Chris Beer <chris@cbeer.info>
Date: Tue, 13 Jun 2017 08:03:50 -0700
Subject: [PATCH] Update to test against Rails 5.1

---
 Gemfile                                                         | 1 +
 .../blacklight_advanced_search/advanced_helper_behavior.rb      | 2 +-
 lib/blacklight_advanced_search/engine.rb                        | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 69cafd9..df2c740 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,6 +31,7 @@ else
     gem 'responders', '~> 2.0'
     gem 'sass-rails', '>= 5.0'
     gem 'coffee-rails', '~> 4.1.0'
+    gem 'json', '~> 1.8'
   when /^4.[01]/
     gem 'sass-rails', '< 5.0'
   end
diff --git a/app/helpers/blacklight_advanced_search/advanced_helper_behavior.rb b/app/helpers/blacklight_advanced_search/advanced_helper_behavior.rb
index 0d5a172..4396b0f 100644
--- a/app/helpers/blacklight_advanced_search/advanced_helper_behavior.rb
+++ b/app/helpers/blacklight_advanced_search/advanced_helper_behavior.rb
@@ -32,7 +32,7 @@ def select_menu_for_field_operator
     # Current params without fields that will be over-written by adv. search,
     # or other fields we don't want.
     def advanced_search_context
-      my_params = params.except :page, :commit, :f_inclusive, :q, :search_field, :op, :action, :index, :sort, :controller, :utf8
+      my_params = search_state.params_for_search.except :page, :f_inclusive, :q, :search_field, :op, :index, :sort
 
       my_params.except!(*search_fields_for_advanced_search.map { |_key, field_def| field_def[:key] })
     end
diff --git a/lib/blacklight_advanced_search/engine.rb b/lib/blacklight_advanced_search/engine.rb
index 8f8dee3..ad85aee 100644
--- a/lib/blacklight_advanced_search/engine.rb
+++ b/lib/blacklight_advanced_search/engine.rb
@@ -2,5 +2,6 @@
 
 module BlacklightAdvancedSearch
   class Engine < Rails::Engine
+    require 'jquery-rails'
   end
 end