Test Rails 4 using AC::Parameters

projectblacklight · Jan 4, 2016 · 6891042 · 6891042
1 parent 61df7a0
commit 6891042
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 15 deletions.
diff --git a/spec/controllers/catalog_controller_spec.rb b/spec/controllers/catalog_controller_spec.rb
@@ -598,9 +598,7 @@ def export_as_mock
   end
 
   describe "current_search_session" do
-    let(:parameter_class) do
-      Rails.version >= '5.0.0' ? ActionController::Parameters : HashWithIndifferentAccess
-    end
+    let(:parameter_class) { ActionController::Parameters }
 
     it "should create a session if we're on an search action" do
       allow(controller).to receive_messages(:action_name => "index")

diff --git a/spec/helpers/deprecated_url_helper_behavior_spec.rb b/spec/helpers/deprecated_url_helper_behavior_spec.rb
@@ -7,9 +7,7 @@
     end
   end
 
-  let(:parameter_class) do
-    Rails.version >= '5.0.0' ? ActionController::Parameters : HashWithIndifferentAccess
-  end
+  let(:parameter_class) { ActionController::Parameters }
   let(:search_state) { Blacklight::SearchState.new(params, blacklight_config) }
   let(:params) { parameter_class.new }
   let(:blacklight_config) { Blacklight::Configuration.new }

diff --git a/spec/helpers/url_helper_spec.rb b/spec/helpers/url_helper_spec.rb
@@ -9,9 +9,7 @@
     end
   end
 
-  let(:parameter_class) do
-    Rails.version >= '5.0.0' ? ActionController::Parameters : HashWithIndifferentAccess
-  end
+  let(:parameter_class) { ActionController::Parameters }
 
   before do
     allow(helper).to receive(:search_action_path) do |*args|

diff --git a/spec/lib/blacklight/search_state_spec.rb b/spec/lib/blacklight/search_state_spec.rb
@@ -8,9 +8,7 @@
     end
   end
 
-  let(:parameter_class) do
-    Rails.version >= '5.0.0' ? ActionController::Parameters : HashWithIndifferentAccess
-  end
+  let(:parameter_class) { ActionController::Parameters }
   let(:helper) { described_class.new(params, blacklight_config) }
   let(:params) { parameter_class.new }
 

diff --git a/spec/presenters/document_presenter_spec.rb b/spec/presenters/document_presenter_spec.rb
@@ -7,9 +7,7 @@
 
   subject { presenter }
   let(:presenter) { Blacklight::DocumentPresenter.new(document, request_context, config) }
-  let(:parameter_class) do
-    Rails.version >= '5.0.0' ? ActionController::Parameters : HashWithIndifferentAccess
-  end
+  let(:parameter_class) { ActionController::Parameters }
   let(:params) { parameter_class.new }
   let(:search_state) { Blacklight::SearchState.new(params, config) }