Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

5 files changed, 25 insertions, 4 deletions

diff --git a/spec/graphql/resolvers/ci/job_token_scope_resolver_spec.rb b/spec/graphql/resolvers/ci/job_token_scope_resolver_spec.rb
index 59616815de0..ac7cef20df4 100644
--- a/spec/graphql/resolvers/ci/job_token_scope_resolver_spec.rb
+++ b/spec/graphql/resolvers/ci/job_token_scope_resolver_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe Resolvers::Ci::JobTokenScopeResolver do
   describe '#resolve' do
     context 'with access to scope' do
       before do
-        project.add_user(current_user, :maintainer)
+        project.add_member(current_user, :maintainer)
       end
 
       it 'returns nil when scope is not enabled' do
@@ -51,7 +51,7 @@ RSpec.describe Resolvers::Ci::JobTokenScopeResolver do
 
     context 'without access to scope' do
       before do
-        project.add_user(current_user, :developer)
+        project.add_member(current_user, :developer)
       end
 
       it 'generates an error' do
diff --git a/spec/graphql/resolvers/ci/runners_resolver_spec.rb b/spec/graphql/resolvers/ci/runners_resolver_spec.rb
index b1f5f7b3e43..8586d359336 100644
--- a/spec/graphql/resolvers/ci/runners_resolver_spec.rb
+++ b/spec/graphql/resolvers/ci/runners_resolver_spec.rb
@@ -52,6 +52,7 @@ RSpec.describe Resolvers::Ci::RunnersResolver do
           {
             active: true,
             status: 'active',
+            upgrade_status: 'recommended',
             type: :instance_type,
             tag_list: ['active_runner'],
             search: 'abc',
@@ -63,6 +64,7 @@ RSpec.describe Resolvers::Ci::RunnersResolver do
           {
             active: true,
             status_status: 'active',
+            upgrade_status: 'recommended',
             type_type: :instance_type,
             tag_name: ['active_runner'],
             preload: { tag_name: nil },
diff --git a/spec/graphql/resolvers/container_repositories_resolver_spec.rb b/spec/graphql/resolvers/container_repositories_resolver_spec.rb
index d7aa761320f..ed922259903 100644
--- a/spec/graphql/resolvers/container_repositories_resolver_spec.rb
+++ b/spec/graphql/resolvers/container_repositories_resolver_spec.rb
@@ -62,7 +62,7 @@ RSpec.describe Resolvers::ContainerRepositoriesResolver do
 
     context 'with authorized user' do
       before do
-        group.add_user(user, :maintainer)
+        group.add_member(user, :maintainer)
       end
 
       context 'when the object is a project' do
diff --git a/spec/graphql/resolvers/todo_resolver_spec.rb b/spec/graphql/resolvers/todos_resolver_spec.rb
index 0760935a2fe..40ca2de0385 100644
--- a/spec/graphql/resolvers/todo_resolver_spec.rb
+++ b/spec/graphql/resolvers/todos_resolver_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Resolvers::TodoResolver do
+RSpec.describe Resolvers::TodosResolver do
   include GraphqlHelpers
   include DesignManagementTestHelpers
 
diff --git a/spec/graphql/resolvers/users/groups_resolver_spec.rb b/spec/graphql/resolvers/users/groups_resolver_spec.rb
index bbe9b6371cf..1e0e001fbf7 100644
--- a/spec/graphql/resolvers/users/groups_resolver_spec.rb
+++ b/spec/graphql/resolvers/users/groups_resolver_spec.rb
@@ -12,6 +12,7 @@ RSpec.describe Resolvers::Users::GroupsResolver do
     let_it_be(:private_maintainer_group) { create(:group, :private, name: 'b private maintainer', path: 'b-private-maintainer') }
     let_it_be(:public_developer_group) { create(:group, project_creation_level: nil, name: 'c public developer', path: 'c-public-developer') }
     let_it_be(:public_maintainer_group) { create(:group, name: 'a public maintainer', path: 'a-public-maintainer') }
+    let_it_be(:public_owner_group) { create(:group, name: 'a public owner', path: 'a-public-owner') }
 
     subject(:resolved_items) { resolve_groups(args: group_arguments, current_user: current_user, obj: resolver_object) }
 
@@ -24,6 +25,7 @@ RSpec.describe Resolvers::Users::GroupsResolver do
       private_maintainer_group.add_maintainer(user)
       public_developer_group.add_developer(user)
       public_maintainer_group.add_maintainer(user)
+      public_owner_group.add_owner(user)
     end
 
     context 'when resolver object is current user' do
@@ -34,6 +36,7 @@ RSpec.describe Resolvers::Users::GroupsResolver do
           is_expected.to match(
             [
               public_maintainer_group,
+              public_owner_group,
               private_maintainer_group,
               public_developer_group
             ]
@@ -41,10 +44,25 @@ RSpec.describe Resolvers::Users::GroupsResolver do
         end
       end
 
+      context 'when permission is :transfer_projects' do
+        let(:group_arguments) { { permission_scope: :transfer_projects } }
+
+        specify do
+          is_expected.to match(
+            [
+              public_maintainer_group,
+              public_owner_group,
+              private_maintainer_group
+            ]
+          )
+        end
+      end
+
       specify do
         is_expected.to match(
           [
             public_maintainer_group,
+            public_owner_group,
             private_maintainer_group,
             public_developer_group,
             guest_group
@@ -82,6 +100,7 @@ RSpec.describe Resolvers::Users::GroupsResolver do
           is_expected.to match(
             [
               public_maintainer_group,
+              public_owner_group,
               private_maintainer_group,
               public_developer_group,
               guest_group