diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-07-16 07:43:16 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-07-16 07:43:16 +0000 |
commit | 6cc6a918b4f36dbad445a5756f174b767e4ad61b (patch) | |
tree | 87704465c1a28284c466744eb6418cbd8adb1e22 /test/test_helper.rb | |
parent | 11c85279ab2a8e660666e2c0c80025e2e2513940 (diff) | |
download | redmine-6cc6a918b4f36dbad445a5756f174b767e4ad61b.tar.gz redmine-6cc6a918b4f36dbad445a5756f174b767e4ad61b.zip |
Pass parameters with :params in controller tests.
git-svn-id: http://svn.redmine.org/redmine/trunk@15666 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/test_helper.rb')
-rw-r--r-- | test/test_helper.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/test_helper.rb b/test/test_helper.rb index 918832bdf..5ad64517b 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -278,10 +278,10 @@ module Redmine end class ControllerTest < ActionController::TestCase - def process(method, path, parameters={}, options={}, flash={}) - if parameters.key?(:params) - raise ArgumentError if options.present? - super method, path, parameters[:params], parameters.except(:params) + def process(method, path, parameters={}, session={}, flash={}) + if parameters.key?(:params) || parameters.key?(:session) + raise ArgumentError if session.present? + super method, path, parameters[:params], parameters[:session], parameters.except(:params, :session) else super end |