Skip to content

Commit 2d57364

Browse files
committed
update auth_helper to use the hash format for process
1 parent 04dd25b commit 2d57364

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

spec/support/auth_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module Authorization
22
def request_with(user, http_method, action, parameters = {}, session = {}, flash = {} )
33
warden.set_user user
4-
process action, http_method.to_s.upcase, parameters, session, flash
4+
process action, method: http_method.to_s.upcase, params: parameters, session: session, flash: flash
55
end
66

77
[:get, :put, :post, :delete].each do |method|

spec/support/warden.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ def _catch_warden(&block)
3838
if result.is_a?(Hash) && !warden.custom_failure? && !@controller.send(:performed?)
3939
result[:action] ||= :unauthenticated
4040

41-
env = @controller.request.env
42-
env['PATH_INFO'] = "/#{result[:action]}"
43-
env['warden.options'] = result
44-
Warden::Manager._run_callbacks(:before_failure, env, result)
41+
request_env = @controller.request.env
42+
request_env['PATH_INFO'] = "/#{result[:action]}"
43+
request_env['warden.options'] = result
44+
Warden::Manager._run_callbacks(:before_failure, request_env, result)
4545

46-
status, headers, body = warden.config[:failure_app].call(env).to_a
46+
status, headers, body = warden.config[:failure_app].call(request_env).to_a
4747
@controller.send :render, :status => status, :text => body,
4848
:content_type => headers['Content-Type'], :location => headers['Location']
4949

0 commit comments

Comments
 (0)