Fix the specs with the Rails 5 branch and the clear search button (#671)

Fix clear search button to work with Rails 5

Appraisals

@@ -1,5 +1,6 @@
 appraise "sass-3-4" do
   gem "sass", "3.4.0"
+  gem "rails-controller-testing"
 end
 
 appraise "rails42" do

app/helpers/administrate/application_helper.rb

@@ -36,5 +36,9 @@ def svg_tag(asset, svg_id, options = {})
     def sanitized_order_params
       params.permit(:search, :id, :order, :page, :per_page, :direction)
     end
+
+    def clear_search_params
+      params.except(:search, :page).permit(:order, :direction, :per_page)
+    end
   end
 end

app/views/administrate/application/_search.html.erb

@@ -14,7 +14,7 @@
     Press enter to search
   </span>
   <span class="search__clear">
-    <%= link_to params.except(:search) do %>
+    <%= link_to clear_search_params do %>
       <%= svg_tag "administrate/cancel.svg", "cancel-search", width: 16, height: 16 %>
     <% end %>
   </span>

gemfiles/rails42.gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 gem "administrate-field-image", :git => "https://github.com/thoughtbot/administrate-field-image.git", :branch => "rails-5"
 gem "bourbon", "~> 4.2"
 gem "delayed_job_active_record"
+gem "faker"
 gem "high_voltage"
 gem "markdown-rails"
 gem "pg"
@@ -23,7 +24,6 @@ group :development, :test do
   gem "byebug"
   gem "dotenv-rails"
   gem "factory_girl_rails"
-  gem "faker"
   gem "i18n-tasks"
   gem "pry-rails"
   gem "rspec-rails", "~> 3.5.0"

gemfiles/rails50.gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 gem "administrate-field-image", :git => "https://github.com/thoughtbot/administrate-field-image.git", :branch => "rails-5"
 gem "bourbon", "~> 4.2"
 gem "delayed_job_active_record"
+gem "faker"
 gem "high_voltage"
 gem "markdown-rails"
 gem "pg"
@@ -24,7 +25,6 @@ group :development, :test do
   gem "byebug"
   gem "dotenv-rails"
   gem "factory_girl_rails"
-  gem "faker"
   gem "i18n-tasks"
   gem "pry-rails"
   gem "rspec-rails", "~> 3.5.0"

gemfiles/sass_3_4.gemfile

@@ -5,12 +5,14 @@ source "https://rubygems.org"
 gem "administrate-field-image", :git => "https://github.com/thoughtbot/administrate-field-image.git", :branch => "rails-5"
 gem "bourbon", "~> 4.2"
 gem "delayed_job_active_record"
+gem "faker"
 gem "high_voltage"
 gem "markdown-rails"
 gem "pg"
 gem "redcarpet"
 gem "unicorn"
 gem "sass", "3.4.0"
+gem "rails-controller-testing"
 
 group :development do
   gem "web-console", ">= 2.1.3"
@@ -23,7 +25,6 @@ group :development, :test do
   gem "byebug"
   gem "dotenv-rails"
   gem "factory_girl_rails"
-  gem "faker"
   gem "i18n-tasks"
   gem "pry-rails"
   gem "rspec-rails", "~> 3.5.0"

spec/example_app/config/application.rb

@@ -28,11 +28,7 @@ class Application < Rails::Application
       generate.view_specs false
     end
 
-    if Rails::VERSION::MAJOR < 5
-      config.action_controller.action_on_unpermitted_parameters = :raise
-    else
-      config.action_controller.action_on_unpermitted_parameters = :log
-    end
+    config.action_controller.action_on_unpermitted_parameters = :raise
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers