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

1 files changed, 18 insertions, 30 deletions

diff --git a/spec/lib/gitlab/visibility_level_spec.rb b/spec/lib/gitlab/visibility_level_spec.rb
index 2ac343cd1e7..63c31c82d59 100644
--- a/spec/lib/gitlab/visibility_level_spec.rb
+++ b/spec/lib/gitlab/visibility_level_spec.rb
@@ -22,13 +22,25 @@ RSpec.describe Gitlab::VisibilityLevel do
   end
 
   describe '.levels_for_user' do
-    it 'returns all levels for an admin' do
-      user = build(:user, :admin)
+    context 'when admin mode is enabled', :enable_admin_mode do
+      it 'returns all levels for an admin' do
+        user = build(:user, :admin)
+
+        expect(described_class.levels_for_user(user))
+          .to eq([Gitlab::VisibilityLevel::PRIVATE,
+                  Gitlab::VisibilityLevel::INTERNAL,
+                  Gitlab::VisibilityLevel::PUBLIC])
+      end
+    end
 
-      expect(described_class.levels_for_user(user))
-        .to eq([Gitlab::VisibilityLevel::PRIVATE,
-                Gitlab::VisibilityLevel::INTERNAL,
-                Gitlab::VisibilityLevel::PUBLIC])
+    context 'when admin mode is disabled' do
+      it 'returns INTERNAL and PUBLIC for an admin' do
+        user = build(:user, :admin)
+
+        expect(described_class.levels_for_user(user))
+            .to eq([Gitlab::VisibilityLevel::INTERNAL,
+                    Gitlab::VisibilityLevel::PUBLIC])
+      end
     end
 
     it 'returns INTERNAL and PUBLIC for internal users' do
@@ -119,28 +131,4 @@ RSpec.describe Gitlab::VisibilityLevel do
       end
     end
   end
-
-  describe '#visibility_level_decreased?' do
-    let(:project) { create(:project, :internal) }
-
-    context 'when visibility level decreases' do
-      before do
-        project.update!(visibility_level: described_class::PRIVATE)
-      end
-
-      it 'returns true' do
-        expect(project.visibility_level_decreased?).to be(true)
-      end
-    end
-
-    context 'when visibility level does not decrease' do
-      before do
-        project.update!(visibility_level: described_class::PUBLIC)
-      end
-
-      it 'returns false' do
-        expect(project.visibility_level_decreased?).to be(false)
-      end
-    end
-  end
 end