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-05-14 06:09:30 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-14 06:09:30 +0300
commite0e9501a69a2d34f51b72c5f8ede345de69de22f (patch)
tree544d3f5bfea1fcf9324256f4e904ce0b6df8be7f /spec/controllers
parent5225ffb5ccfe2fe0e55a3327d43f28f4ed08ae63 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/jira_connect/app_descriptor_controller_spec.rb2
-rw-r--r--spec/controllers/jira_connect/branches_controller_spec.rb2
-rw-r--r--spec/controllers/jira_connect/events_controller_spec.rb2
-rw-r--r--spec/controllers/jira_connect/subscriptions_controller_spec.rb2
4 files changed, 4 insertions, 4 deletions
diff --git a/spec/controllers/jira_connect/app_descriptor_controller_spec.rb b/spec/controllers/jira_connect/app_descriptor_controller_spec.rb
index 4f8b2b90637..48b315646de 100644
--- a/spec/controllers/jira_connect/app_descriptor_controller_spec.rb
+++ b/spec/controllers/jira_connect/app_descriptor_controller_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-RSpec.describe JiraConnect::AppDescriptorController do
+RSpec.describe JiraConnect::AppDescriptorController, feature_category: :integrations do
describe '#show' do
let(:descriptor) do
json_response.deep_symbolize_keys
diff --git a/spec/controllers/jira_connect/branches_controller_spec.rb b/spec/controllers/jira_connect/branches_controller_spec.rb
index cf4dfaface6..1d3ddc2e33b 100644
--- a/spec/controllers/jira_connect/branches_controller_spec.rb
+++ b/spec/controllers/jira_connect/branches_controller_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-RSpec.describe JiraConnect::BranchesController do
+RSpec.describe JiraConnect::BranchesController, feature_category: :integrations do
describe '#new' do
context 'when logged in' do
let_it_be(:user) { create(:user) }
diff --git a/spec/controllers/jira_connect/events_controller_spec.rb b/spec/controllers/jira_connect/events_controller_spec.rb
index 7da9eb7ac16..ffad3aa7b02 100644
--- a/spec/controllers/jira_connect/events_controller_spec.rb
+++ b/spec/controllers/jira_connect/events_controller_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-RSpec.describe JiraConnect::EventsController do
+RSpec.describe JiraConnect::EventsController, feature_category: :integrations do
shared_examples 'verifies asymmetric JWT token' do
context 'when token is valid' do
include_context 'valid JWT token'
diff --git a/spec/controllers/jira_connect/subscriptions_controller_spec.rb b/spec/controllers/jira_connect/subscriptions_controller_spec.rb
index 7aa45ae379c..a05f18f1a16 100644
--- a/spec/controllers/jira_connect/subscriptions_controller_spec.rb
+++ b/spec/controllers/jira_connect/subscriptions_controller_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-RSpec.describe JiraConnect::SubscriptionsController do
+RSpec.describe JiraConnect::SubscriptionsController, feature_category: :integrations do
let_it_be(:installation) { create(:jira_connect_installation) }
describe '#index' do