Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-06-28 15:13:13 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-06-28 15:13:40 +0300
commita325d3a2c05b8f664a76912c5ac32d0a8e45e562 (patch)
tree6840627ef29240e1f4da01c36334f9a43549cd65 /spec/models/hooks/web_hook_spec.rb
parentc49ef67dc34ca5770ca16ce3df17786f82cfbcb2 (diff)
Add latest changes from gitlab-org/security/gitlab@16-1-stable-ee
Diffstat (limited to 'spec/models/hooks/web_hook_spec.rb')
-rw-r--r--spec/models/hooks/web_hook_spec.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/spec/models/hooks/web_hook_spec.rb b/spec/models/hooks/web_hook_spec.rb
index 82cfb3983f8..308e16328d7 100644
--- a/spec/models/hooks/web_hook_spec.rb
+++ b/spec/models/hooks/web_hook_spec.rb
@@ -258,6 +258,13 @@ RSpec.describe WebHook, feature_category: :webhooks do
expect(hook.url_variables).to eq({})
end
+ it 'resets url variables if url variables are overwritten' do
+ hook.url_variables = hook.url_variables.merge('abc' => 'baz')
+
+ expect(hook).not_to be_valid
+ expect(hook.url_variables).to eq({})
+ end
+
it 'does not reset url variables if both url and url variables are changed' do
hook.url = 'http://example.com/{one}/{two}'
hook.url_variables = { 'one' => 'foo', 'two' => 'bar' }