Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 0 deletions

diff --git a/spec/frontend/fixtures/users.rb b/spec/frontend/fixtures/users.rb
index 6271aa87b9a..0e9d7475bf9 100644
--- a/spec/frontend/fixtures/users.rb
+++ b/spec/frontend/fixtures/users.rb
@@ -12,9 +12,11 @@ RSpec.describe 'Users (GraphQL fixtures)', feature_category: :user_profile do
 
     context 'for user achievements' do
       let_it_be(:group) { create(:group, :public) }
+      let_it_be(:private_group) { create(:group, :private) }
       let_it_be(:achievement1) { create(:achievement, namespace: group) }
       let_it_be(:achievement2) { create(:achievement, namespace: group) }
       let_it_be(:achievement3) { create(:achievement, namespace: group) }
+      let_it_be(:achievement_from_private_group) { create(:achievement, namespace: private_group) }
       let_it_be(:achievement_with_avatar_and_description) do
         create(:achievement,
           namespace: group,
@@ -51,6 +53,14 @@ RSpec.describe 'Users (GraphQL fixtures)', feature_category: :user_profile do
         expect_graphql_errors_to_be_empty
       end
 
+      it 'graphql/get_user_achievements_from_private_group.json' do
+        create(:user_achievement, user: user, achievement: achievement_from_private_group)
+
+        post_graphql(query, current_user: user, variables: { id: user.to_global_id })
+
+        expect_graphql_errors_to_be_empty
+      end
+
       it "graphql/get_user_achievements_long_response.json" do
         [achievement1, achievement2, achievement3, achievement_with_avatar_and_description].each do |achievement|
           create(:user_achievement, user: user, achievement: achievement)