14988: Removes almost all pending deprecated warnings on functional tests.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index 08cf436f6342cd911c19a0992aeb9b1376087188..30c5bfce83b4e8f182248ca19db52b8369b50335 100644 (file)
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -58,6 +58,7 @@ group :test, :performance do
   gem 'simplecov', '~> 0.7', require: false
   gem 'simplecov-rcov', require: false
   gem 'mocha', require: false
+  gem 'rails-controller-testing'
 end
 
 gem 'jquery-rails'

diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index d1ea71a8507faaac1327d82885b71486040e315f..a4c9c24b6b36529a6388ec56bb3e6bc8bd4e85c3 100644 (file)
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -228,6 +228,10 @@ GEM
       bundler (>= 1.3.0)
       railties (= 5.0.7.2)
       sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.4)
+      actionpack (>= 5.0.1.x)
+      actionview (>= 5.0.1.x)
+      activesupport (>= 5.0.1.x)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
@@ -348,6 +352,7 @@ DEPENDENCIES
   poltergeist (~> 1.5.1)
   rack-mini-profiler
   rails (~> 5.0.0)
+  rails-controller-testing
   rails-perftest
   raphael-rails
   responders (~> 2.0)

diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index 7e9e292332acd4933f0b92ffb16f1630419d818f..065dce5219d7ea6cfc4d818509bf15e7ace68cf3 100644 (file)
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -14,8 +14,8 @@ class ActionsController < ApplicationController
     params['uuid'] and
     model_class.in?([Collection, Group, Job, PipelineInstance, PipelineTemplate])
   }
-  skip_filter :require_thread_api_token, only: [:report_issue_popup, :report_issue]
-  skip_filter :check_user_agreements, only: [:report_issue_popup, :report_issue]
+  skip_around_action :require_thread_api_token, only: [:report_issue_popup, :report_issue]
+  skip_before_action :check_user_agreements, only: [:report_issue_popup, :report_issue]
 
   @@exposed_actions = {}
   def self.expose_action method, &block

diff --git a/apps/workbench/app/models/arvados_base.rb b/apps/workbench/app/models/arvados_base.rb
index 5dd585152eb727eb18e05b29d9ce53ed42a8e8bc..aa25ac4390eb983b3fdccda1eba90da01dac492c 100644 (file)
--- a/apps/workbench/app/models/arvados_base.rb
+++ b/apps/workbench/app/models/arvados_base.rb
@@ -185,6 +185,9 @@ class ArvadosBase < ApplicationRecord
     # The following permit! is necessary even with
     # "ActionController::Parameters.permit_all_parameters = true",
     # because permit_all does not permit nested attributes.
+    if raw_params.is_a? ActionController::Parameters
+      raw_params = raw_params.to_unsafe_h
+    end
     ActionController::Parameters.new(raw_params).permit!
   end