From 6438df3a1e0fb944485cebf07976160184697d72 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Wed, 20 Jan 2021 13:34:23 -0600 Subject: Add latest changes from gitlab-org/gitlab@13-8-stable-ee --- spec/serializers/deploy_key_entity_spec.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'spec/serializers/deploy_key_entity_spec.rb') diff --git a/spec/serializers/deploy_key_entity_spec.rb b/spec/serializers/deploy_key_entity_spec.rb index 3404d27a23c..e8d9701be67 100644 --- a/spec/serializers/deploy_key_entity_spec.rb +++ b/spec/serializers/deploy_key_entity_spec.rb @@ -52,7 +52,13 @@ RSpec.describe DeployKeyEntity do context 'user is an admin' do let(:user) { create(:user, :admin) } - it { expect(entity.as_json).to include(can_edit: true) } + context 'when admin mode is enabled', :enable_admin_mode do + it { expect(entity.as_json).to include(can_edit: true) } + end + + context 'when admin mode is disabled' do + it { expect(entity.as_json).not_to include(can_edit: true) } + end end context 'user is a project maintainer' do -- cgit v1.2.1