diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-08-09 20:52:40 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-08-09 20:52:40 +0000 |
| commit | 43b9be9d6cf59a02ea86795a1734848615d38a26 (patch) | |
| tree | 307fad04fccdfdb75488a42ca780bc14580576f9 | |
| parent | 4b10592b8161df6fc323274bd36c84d3eac258c4 (diff) | |
| parent | 3fcb70b3cd90047cdbf6598cdadd2929561c506c (diff) | |
| download | gitlab-ce-43b9be9d6cf59a02ea86795a1734848615d38a26.tar.gz | |
Merge branch 'spec-differences' into 'master'
Backport EE code for OAuth applications spec
See merge request gitlab-org/gitlab-ce!31670
| -rw-r--r-- | spec/controllers/oauth/applications_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/oauth/applications_controller_spec.rb b/spec/controllers/oauth/applications_controller_spec.rb index 228c97d591d..df836c2c3e3 100644 --- a/spec/controllers/oauth/applications_controller_spec.rb +++ b/spec/controllers/oauth/applications_controller_spec.rb @@ -17,7 +17,7 @@ describe Oauth::ApplicationsController do expect(response).to have_gitlab_http_status(200) end - it 'shows list of applications' do + it 'redirects back to profile page if OAuth applications are disabled' do disable_user_oauth get :index |