Skip to content
Snippets Groups Projects
Unverified Commit 2408519e authored by Francisco Javier López's avatar Francisco Javier López
Browse files

Changing the hook test action to use POST

parent 65f27de7
No related branches found
No related tags found
1 merge request!10495Merge Requests - Assignee
Loading
Loading
@@ -10,7 +10,7 @@ module HooksHelper
 
trigger_human_name = trigger.to_s.tr('_', ' ').camelize
 
link_to path, rel: 'nofollow' do
link_to path, rel: 'nofollow', method: :post do
content_tag(:span, trigger_human_name)
end
end
Loading
Loading
---
title: Adding CSRF protection to Hooks test action
merge_request:
author:
type: security
Loading
Loading
@@ -54,7 +54,7 @@ namespace :admin do
 
resources :hooks, only: [:index, :create, :edit, :update, :destroy] do
member do
get :test
post :test
end
 
resources :hook_logs, only: [:show] do
Loading
Loading
Loading
Loading
@@ -301,7 +301,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
 
resources :hooks, only: [:index, :create, :edit, :update, :destroy], constraints: { id: /\d+/ } do
member do
get :test
post :test
end
 
resources :hook_logs, only: [:show] do
Loading
Loading
Loading
Loading
@@ -79,7 +79,7 @@ end
# edit_admin_hook GET /admin/hooks/:id(.:format) admin/hooks#edit
describe Admin::HooksController, "routing" do
it "to #test" do
expect(get("/admin/hooks/1/test")).to route_to('admin/hooks#test', id: '1')
expect(post("/admin/hooks/1/test")).to route_to('admin/hooks#test', id: '1')
end
 
it "to #index" do
Loading
Loading
Loading
Loading
@@ -389,7 +389,7 @@ describe 'project routing' do
# DELETE /:project_id/hooks/:id(.:format) hooks#destroy
describe Projects::HooksController, 'routing' do
it 'to #test' do
expect(get('/gitlab/gitlabhq/hooks/1/test')).to route_to('projects/hooks#test', namespace_id: 'gitlab', project_id: 'gitlabhq', id: '1')
expect(post('/gitlab/gitlabhq/hooks/1/test')).to route_to('projects/hooks#test', namespace_id: 'gitlab', project_id: 'gitlabhq', id: '1')
end
 
it_behaves_like 'RESTful project resources' do
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment