Add latest changes from gitlab-org/gitlab@13-1-stable-ee

2 files changed, 64 insertions, 0 deletions

diff --git a/spec/requests/api/graphql/user/group_member_query_spec.rb b/spec/requests/api/graphql/user/group_member_query_spec.rb
new file mode 100644
index 00000000000..022ee79297c
--- /dev/null
+++ b/spec/requests/api/graphql/user/group_member_query_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'GroupMember' do
+  include GraphqlHelpers
+
+  let_it_be(:member) { create(:group_member, :developer) }
+  let_it_be(:fields) do
+    <<~HEREDOC
+      nodes {
+        accessLevel {
+          integerValue
+          stringValue
+        }
+        group {
+          id
+        }
+      }
+    HEREDOC
+  end
+  let_it_be(:query) do
+    graphql_query_for('user', { id: member.user.to_global_id.to_s }, query_graphql_field("groupMemberships", {}, fields))
+  end
+
+  before do
+    post_graphql(query, current_user: member.user)
+  end
+
+  it_behaves_like 'a working graphql query'
+  it_behaves_like 'a working membership object query'
+end
diff --git a/spec/requests/api/graphql/user/project_member_query_spec.rb b/spec/requests/api/graphql/user/project_member_query_spec.rb
new file mode 100644
index 00000000000..397d2872189
--- /dev/null
+++ b/spec/requests/api/graphql/user/project_member_query_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'ProjectMember' do
+  include GraphqlHelpers
+
+  let_it_be(:member) { create(:project_member, :developer) }
+  let_it_be(:fields) do
+    <<~HEREDOC
+      nodes {
+        accessLevel {
+          integerValue
+          stringValue
+        }
+        project {
+          id
+        }
+      }
+    HEREDOC
+  end
+  let_it_be(:query) do
+    graphql_query_for('user', { id: member.user.to_global_id.to_s }, query_graphql_field("projectMemberships", {}, fields))
+  end
+
+  before do
+    post_graphql(query, current_user: member.user)
+  end
+
+  it_behaves_like 'a working graphql query'
+  it_behaves_like 'a working membership object query'
+end