Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42

3 files changed, 25 insertions, 7 deletions

diff --git a/spec/controllers/groups/children_controller_spec.rb b/spec/controllers/groups/children_controller_spec.rb
index e97fe50c468..04cf7785f1e 100644
--- a/spec/controllers/groups/children_controller_spec.rb
+++ b/spec/controllers/groups/children_controller_spec.rb
@@ -227,8 +227,8 @@ RSpec.describe Groups::ChildrenController do
 
         context 'when rendering hierarchies' do
           # When loading hierarchies we load the all the ancestors for matched projects
-          # in 1 separate query
-          let(:extra_queries_for_hierarchies) { 1 }
+          # in 2 separate queries
+          let(:extra_queries_for_hierarchies) { 2 }
 
           def get_filtered_list
             get :index, params: { group_id: group.to_param, filter: 'filter' }, format: :json
diff --git a/spec/controllers/groups/runners_controller_spec.rb b/spec/controllers/groups/runners_controller_spec.rb
index 1808969cd60..a8830efe653 100644
--- a/spec/controllers/groups/runners_controller_spec.rb
+++ b/spec/controllers/groups/runners_controller_spec.rb
@@ -3,11 +3,13 @@
 require 'spec_helper'
 
 RSpec.describe Groups::RunnersController do
-  let(:user)   { create(:user) }
-  let(:group)  { create(:group) }
-  let(:runner) { create(:ci_runner, :group, groups: [group]) }
-  let(:project) { create(:project, group: group) }
-  let(:runner_project) { create(:ci_runner, :project, projects: [project]) }
+  let_it_be(:user)   { create(:user) }
+  let_it_be(:group)  { create(:group) }
+  let_it_be(:project) { create(:project, group: group) }
+
+  let!(:runner) { create(:ci_runner, :group, groups: [group]) }
+  let!(:runner_project) { create(:ci_runner, :project, projects: [project]) }
+
   let(:params_runner_project) { { group_id: group, id: runner_project } }
   let(:params) { { group_id: group, id: runner } }
 
@@ -26,6 +28,7 @@ RSpec.describe Groups::RunnersController do
 
         expect(response).to have_gitlab_http_status(:ok)
         expect(response).to render_template(:index)
+        expect(assigns(:group_runners_limited_count)).to be(2)
       end
     end
 
diff --git a/spec/controllers/groups/settings/integrations_controller_spec.rb b/spec/controllers/groups/settings/integrations_controller_spec.rb
index 931e726850a..31d1946652d 100644
--- a/spec/controllers/groups/settings/integrations_controller_spec.rb
+++ b/spec/controllers/groups/settings/integrations_controller_spec.rb
@@ -10,6 +10,21 @@ RSpec.describe Groups::Settings::IntegrationsController do
     sign_in(user)
   end
 
+  it_behaves_like IntegrationsActions do
+    let(:integration_attributes) { { group: group, project: nil } }
+
+    let(:routing_params) do
+      {
+        group_id: group,
+        id: integration.to_param
+      }
+    end
+
+    before do
+      group.add_owner(user)
+    end
+  end
+
   describe '#index' do
     context 'when user is not owner' do
       it 'renders not_found' do