diff options
author | Andreas Brandl <abrandl@gitlab.com> | 2019-04-05 14:28:34 +0000 |
---|---|---|
committer | Andreas Brandl <abrandl@gitlab.com> | 2019-04-05 14:28:34 +0000 |
commit | 0cf23a7f50d51d91066cafc3d55bb846f7af3489 (patch) | |
tree | aea2704199d2b5c8b9e2767ae42288637322743b /spec/controllers/projects_controller_spec.rb | |
parent | 6d25cd06acaa2f0f2c1cb422b613997c67eafc35 (diff) | |
parent | 46b1b9c1d61c269588bd3cd4203420608ddd7f0b (diff) | |
download | gitlab-ce-0cf23a7f50d51d91066cafc3d55bb846f7af3489.tar.gz |
Merge branch 'revert-3962b00b' into 'master'
Revert "Merge branch 'if-57131-external_auth_to_ce' into 'master'"
See merge request gitlab-org/gitlab-ce!27051
Diffstat (limited to 'spec/controllers/projects_controller_spec.rb')
-rw-r--r-- | spec/controllers/projects_controller_spec.rb | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb index 1ce06bc877c..af437c5561b 100644 --- a/spec/controllers/projects_controller_spec.rb +++ b/spec/controllers/projects_controller_spec.rb @@ -1,7 +1,6 @@ require('spec_helper') describe ProjectsController do - include ExternalAuthorizationServiceHelpers include ProjectForksHelper let(:project) { create(:project) } @@ -412,37 +411,6 @@ describe ProjectsController do it_behaves_like 'updating a project' end - - context 'as maintainer' do - before do - project.add_maintainer(user) - sign_in(user) - end - - it_behaves_like 'unauthorized when external service denies access' do - subject do - put :update, - params: { - namespace_id: project.namespace, - id: project, - project: { description: 'Hello world' } - } - project.reload - end - - it 'updates when the service allows access' do - external_service_allow_access(user, project) - - expect { subject }.to change(project, :description) - end - - it 'does not update when the service rejects access' do - external_service_deny_access(user, project) - - expect { subject }.not_to change(project, :description) - end - end - end end describe '#transfer' do |