Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42

1 files changed, 7 insertions, 7 deletions

diff --git a/spec/controllers/groups/settings/integrations_controller_spec.rb b/spec/controllers/groups/settings/integrations_controller_spec.rb
index 4f1f6dcaae4..ef8f9f69710 100644
--- a/spec/controllers/groups/settings/integrations_controller_spec.rb
+++ b/spec/controllers/groups/settings/integrations_controller_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe Groups::Settings::IntegrationsController do
   describe '#edit' do
     context 'when user is not owner' do
       it 'renders not_found' do
-        get :edit, params: { group_id: group, id: Integration.available_services_names(include_project_specific: false).sample }
+        get :edit, params: { group_id: group, id: Integration.available_integration_names(include_project_specific: false).sample }
 
         expect(response).to have_gitlab_http_status(:not_found)
       end
@@ -47,8 +47,8 @@ RSpec.describe Groups::Settings::IntegrationsController do
         group.add_owner(user)
       end
 
-      Integration.available_services_names(include_project_specific: false).each do |integration_name|
-        context "#{integration_name}" do
+      Integration.available_integration_names(include_project_specific: false).each do |integration_name|
+        context integration_name do
           it 'successfully displays the template' do
             get :edit, params: { group_id: group, id: integration_name }
 
@@ -63,11 +63,11 @@ RSpec.describe Groups::Settings::IntegrationsController do
   describe '#update' do
     include JiraServiceHelper
 
-    let(:integration) { create(:jira_service, project: nil, group_id: group.id) }
+    let(:integration) { create(:jira_integration, project: nil, group_id: group.id) }
 
     before do
       group.add_owner(user)
-      stub_jira_service_test
+      stub_jira_integration_test
 
       put :update, params: { group_id: group, id: integration.class.to_param, service: { url: url } }
     end
@@ -93,8 +93,8 @@ RSpec.describe Groups::Settings::IntegrationsController do
   end
 
   describe '#reset' do
-    let_it_be(:integration) { create(:jira_service, group: group, project: nil) }
-    let_it_be(:inheriting_integration) { create(:jira_service, inherit_from_id: integration.id) }
+    let_it_be(:integration) { create(:jira_integration, group: group, project: nil) }
+    let_it_be(:inheriting_integration) { create(:jira_integration, inherit_from_id: integration.id) }
 
     subject do
       post :reset, params: { group_id: group, id: integration.class.to_param }