summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-16 18:09:09 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-16 18:09:09 +0000
commitb6b701cf9d08253d7c6f1e7500a09b1e373e18e3 (patch)
tree72da94c08ae78c7c7be1d9c1c362a894b10a0efb /spec/models
parent0e1756ac5c275f8d548c06693b15578baf189d56 (diff)
downloadgitlab-ce-b6b701cf9d08253d7c6f1e7500a09b1e373e18e3.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/concerns/web_hooks/has_web_hooks_spec.rb2
-rw-r--r--spec/models/hooks/project_hook_spec.rb2
-rw-r--r--spec/models/hooks/service_hook_spec.rb2
-rw-r--r--spec/models/hooks/system_hook_spec.rb2
-rw-r--r--spec/models/hooks/web_hook_log_spec.rb2
-rw-r--r--spec/models/hooks/web_hook_spec.rb2
6 files changed, 6 insertions, 6 deletions
diff --git a/spec/models/concerns/web_hooks/has_web_hooks_spec.rb b/spec/models/concerns/web_hooks/has_web_hooks_spec.rb
index afb2406a969..e24b0ac130b 100644
--- a/spec/models/concerns/web_hooks/has_web_hooks_spec.rb
+++ b/spec/models/concerns/web_hooks/has_web_hooks_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-RSpec.describe WebHooks::HasWebHooks, feature_category: :integrations do
+RSpec.describe WebHooks::HasWebHooks, feature_category: :webhooks do
let(:minimal_test_class) do
Class.new do
include WebHooks::HasWebHooks
diff --git a/spec/models/hooks/project_hook_spec.rb b/spec/models/hooks/project_hook_spec.rb
index c3484c4a42c..a4ebc3ec4ef 100644
--- a/spec/models/hooks/project_hook_spec.rb
+++ b/spec/models/hooks/project_hook_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-RSpec.describe ProjectHook, feature_category: :integrations do
+RSpec.describe ProjectHook, feature_category: :webhooks do
include_examples 'a hook that gets automatically disabled on failure' do
let_it_be(:project) { create(:project) }
diff --git a/spec/models/hooks/service_hook_spec.rb b/spec/models/hooks/service_hook_spec.rb
index e52af4a32b0..8a3bf91233a 100644
--- a/spec/models/hooks/service_hook_spec.rb
+++ b/spec/models/hooks/service_hook_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-RSpec.describe ServiceHook, feature_category: :integrations do
+RSpec.describe ServiceHook, feature_category: :webhooks do
it_behaves_like 'a hook that does not get automatically disabled on failure' do
let(:hook) { create(:service_hook) }
let(:hook_factory) { :service_hook }
diff --git a/spec/models/hooks/system_hook_spec.rb b/spec/models/hooks/system_hook_spec.rb
index edb307148b6..da4771d801d 100644
--- a/spec/models/hooks/system_hook_spec.rb
+++ b/spec/models/hooks/system_hook_spec.rb
@@ -2,7 +2,7 @@
require "spec_helper"
-RSpec.describe SystemHook, feature_category: :integrations do
+RSpec.describe SystemHook, feature_category: :webhooks do
it_behaves_like 'a hook that does not get automatically disabled on failure' do
let(:hook) { create(:system_hook) }
let(:hook_factory) { :system_hook }
diff --git a/spec/models/hooks/web_hook_log_spec.rb b/spec/models/hooks/web_hook_log_spec.rb
index 5be2b2d3bb0..4b88b3b3e65 100644
--- a/spec/models/hooks/web_hook_log_spec.rb
+++ b/spec/models/hooks/web_hook_log_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-RSpec.describe WebHookLog, feature_category: :integrations do
+RSpec.describe WebHookLog, feature_category: :webhooks do
it { is_expected.to belong_to(:web_hook) }
it { is_expected.to serialize(:request_headers).as(Hash) }
diff --git a/spec/models/hooks/web_hook_spec.rb b/spec/models/hooks/web_hook_spec.rb
index 254b8c2520b..82cfb3983f8 100644
--- a/spec/models/hooks/web_hook_spec.rb
+++ b/spec/models/hooks/web_hook_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-RSpec.describe WebHook, feature_category: :integrations do
+RSpec.describe WebHook, feature_category: :webhooks do
include AfterNextHelpers
let_it_be(:project) { create(:project) }