diff options
author | Rémy Coutable <remy@rymai.me> | 2016-06-08 16:57:58 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-06-08 16:57:58 +0300 |
commit | 99ea32714bb307421ff81ad17983c1b0dce0eac4 (patch) | |
tree | 7d22ac6ec07413b5bfb505097cdeb9d56bd013b6 /spec | |
parent | 8d6c4b307c2c0ecffc57aaf4ebd0e5a23eae0a66 (diff) | |
parent | 3b50d96b8aaa7e18efded9a80c7641d1364de5c9 (diff) |
Merge branch 'fix-endless-redirect' into 'master'
Fix endless redirections when accessing user OAuth applications when they are disabled
## What does this MR do?
This MR fixes a bug where the browser would be redirect endlessly when attempting to access the user's OAuth applications when an admin has disabled this system-wide setting.
## Are there points in the code the reviewer needs to double check?
I assume disabling the nav button is better than showing a page that says, "OAuth applications are disabled by the admin."
## Why was this MR needed?
Lots of users were confused when they hit endless redirect errors.
## What are the relevant issue numbers?
#14770
See merge request !4525
Diffstat (limited to 'spec')
-rw-r--r-- | spec/controllers/oauth/applications_controller_spec.rb | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/spec/controllers/oauth/applications_controller_spec.rb b/spec/controllers/oauth/applications_controller_spec.rb new file mode 100644 index 00000000000..af378304893 --- /dev/null +++ b/spec/controllers/oauth/applications_controller_spec.rb @@ -0,0 +1,29 @@ +require 'spec_helper' + +describe Oauth::ApplicationsController do + let(:user) { create(:user) } + + context 'project members' do + before do + sign_in(user) + end + + describe 'GET #index' do + it 'shows list of applications' do + get :index + + expect(response.status).to eq(200) + end + + it 'redirects back to profile page if OAuth applications are disabled' do + settings = double(user_oauth_applications?: false) + allow_any_instance_of(Gitlab::CurrentSettings).to receive(:current_application_settings).and_return(settings) + + get :index + + expect(response.status).to eq(302) + expect(response).to redirect_to(profile_path) + end + end + end +end |