From 3a25b40d5572a1de4220a9bd284025bf5be1d16b Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 28 Nov 2022 15:09:27 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/controllers/projects/hooks_controller_spec.rb | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'spec/controllers/projects/hooks_controller_spec.rb') diff --git a/spec/controllers/projects/hooks_controller_spec.rb b/spec/controllers/projects/hooks_controller_spec.rb index 18f16937505..0045262a4af 100644 --- a/spec/controllers/projects/hooks_controller_spec.rb +++ b/spec/controllers/projects/hooks_controller_spec.rb @@ -154,28 +154,6 @@ RSpec.describe Projects::HooksController do expect(flash[:alert]).to be_blank end - it 'ignores branch_filter_strategy when flag is disabled' do - stub_feature_flags(enhanced_webhook_support_regex: false) - hook_params = { - url: 'http://example.com', - branch_filter_strategy: 'regex', - push_events: true - } - params = { namespace_id: project.namespace, project_id: project, hook: hook_params } - - expect { post :create, params: params }.to change(ProjectHook, :count).by(1) - - project_hook = ProjectHook.order_id_desc.take - - expect(project_hook).to have_attributes( - url: 'http://example.com', - branch_filter_strategy: 'wildcard' - ) - - expect(response).to have_gitlab_http_status(:found) - expect(flash[:alert]).to be_blank - end - it 'alerts the user if the new hook is invalid' do hook_params = { token: "TEST\nTOKEN", -- cgit v1.2.1