Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

1 files changed, 6 insertions, 0 deletions

diff --git a/spec/controllers/projects/starrers_controller_spec.rb b/spec/controllers/projects/starrers_controller_spec.rb
index 8d03600cd58..2148f495c31 100644
--- a/spec/controllers/projects/starrers_controller_spec.rb
+++ b/spec/controllers/projects/starrers_controller_spec.rb
@@ -6,6 +6,7 @@ RSpec.describe Projects::StarrersController do
   let(:user_1) { create(:user, name: 'John') }
   let(:user_2) { create(:user, name: 'Michael') }
   let(:private_user) { create(:user, name: 'Michael Douglas', private_profile: true) }
+  let(:blocked_user) { create(:user, state: 'blocked') }
   let(:admin) { create(:user, admin: true) }
   let(:project) { create(:project, :public) }
 
@@ -13,6 +14,7 @@ RSpec.describe Projects::StarrersController do
     user_1.toggle_star(project)
     user_2.toggle_star(project)
     private_user.toggle_star(project)
+    blocked_user.toggle_star(project)
   end
 
   describe 'GET index' do
@@ -61,6 +63,10 @@ RSpec.describe Projects::StarrersController do
             expect(user_ids).to contain_exactly(user_1.id, user_2.id)
           end
 
+          it 'non-active users are not visible' do
+            expect(user_ids).not_to include(blocked_user.id)
+          end
+
           include_examples 'starrers counts'
         end