Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

1 files changed, 29 insertions, 9 deletions

diff --git a/spec/finders/group_projects_finder_spec.rb b/spec/finders/group_projects_finder_spec.rb
index c66fdb19260..3fc4393df5d 100644
--- a/spec/finders/group_projects_finder_spec.rb
+++ b/spec/finders/group_projects_finder_spec.rb
@@ -142,20 +142,40 @@ RSpec.describe GroupProjectsFinder do
   describe 'with an admin current user' do
     let(:current_user) { create(:admin) }
 
-    context "only shared" do
-      let(:options) { { only_shared: true } }
+    context 'when admin mode is enabled', :enable_admin_mode do
+      context "only shared" do
+        let(:options) { { only_shared: true } }
 
-      it            { is_expected.to eq([shared_project_3, shared_project_2, shared_project_1]) }
-    end
+        it            { is_expected.to contain_exactly(shared_project_3, shared_project_2, shared_project_1) }
+      end
 
-    context "only owned" do
-      let(:options) { { only_owned: true } }
+      context "only owned" do
+        let(:options) { { only_owned: true } }
+
+        it            { is_expected.to contain_exactly(private_project, public_project) }
+      end
 
-      it            { is_expected.to eq([private_project, public_project]) }
+      context "all" do
+        it { is_expected.to contain_exactly(shared_project_3, shared_project_2, shared_project_1, private_project, public_project) }
+      end
     end
 
-    context "all" do
-      it { is_expected.to eq([shared_project_3, shared_project_2, shared_project_1, private_project, public_project]) }
+    context 'when admin mode is disabled' do
+      context "only shared" do
+        let(:options) { { only_shared: true } }
+
+        it            { is_expected.to contain_exactly(shared_project_3, shared_project_1) }
+      end
+
+      context "only owned" do
+        let(:options) { { only_owned: true } }
+
+        it            { is_expected.to contain_exactly(public_project) }
+      end
+
+      context "all" do
+        it { is_expected.to contain_exactly(shared_project_3, shared_project_1, public_project) }
+      end
     end
   end