Fix a Grape deprecation, use #request_method instead of #route_method

Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
Rémy Coutable 2016-12-23 17:03:25 +01:00
parent 5866f7b30e
commit 1b109c99a4
No known key found for this signature in database
GPG key ID: 46DF07E5CD9E96AB
3 changed files with 7 additions and 3 deletions

View file

@ -0,0 +1,4 @@
---
title: Fix a Grape deprecation, use `#request_method` instead of `#route_method`
merge_request:
author:

View file

@ -96,7 +96,7 @@ module API
end
def authenticate_non_get!
authenticate! unless %w[GET HEAD].include?(route.route_method)
authenticate! unless %w[GET HEAD].include?(route.request_method)
end
def authenticate_by_gitlab_shell_token!

View file

@ -396,7 +396,7 @@ describe API::Helpers, api: true do
%w[HEAD GET].each do |method_name|
context "method is #{method_name}" do
before do
expect_any_instance_of(self.class).to receive(:route).and_return(double(route_method: method_name))
expect_any_instance_of(self.class).to receive(:route).and_return(double(request_method: method_name))
end
it 'does not raise an error' do
@ -410,7 +410,7 @@ describe API::Helpers, api: true do
%w[POST PUT PATCH DELETE].each do |method_name|
context "method is #{method_name}" do
before do
expect_any_instance_of(self.class).to receive(:route).and_return(double(route_method: method_name))
expect_any_instance_of(self.class).to receive(:route).and_return(double(request_method: method_name))
end
it 'calls authenticate!' do