diff options
author | Stan Hu <stanhu@gmail.com> | 2019-01-16 20:12:54 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-01-16 20:12:54 +0000 |
commit | dbe11b9ca5de936b4db30322832694676bafa0ce (patch) | |
tree | 12f523bcf2152ba66bf08ef184878b597825c72a /spec/lib/gitlab | |
parent | 906c24e46399d5111201714c89156dbfd8826b10 (diff) | |
parent | 61111d4c0d0bbe232a983611a86607af6d9e9a66 (diff) | |
download | gitlab-ce-dbe11b9ca5de936b4db30322832694676bafa0ce.tar.gz |
Merge branch '56309-read-only-controller-doesn-t-account-for-relative-paths-for-admin-sidekiq-route' into 'master'
Allow sidekiq admin requests, regardless of root
Closes #56309
See merge request gitlab-org/gitlab-ce!24352
Diffstat (limited to 'spec/lib/gitlab')
-rw-r--r-- | spec/lib/gitlab/middleware/read_only_spec.rb | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/spec/lib/gitlab/middleware/read_only_spec.rb b/spec/lib/gitlab/middleware/read_only_spec.rb index bdb1f34d2f6..24d49a049b6 100644 --- a/spec/lib/gitlab/middleware/read_only_spec.rb +++ b/spec/lib/gitlab/middleware/read_only_spec.rb @@ -101,16 +101,36 @@ describe Gitlab::Middleware::ReadOnly do expect(subject).not_to disallow_request end - it 'expects requests to sidekiq admin to be allowed' do - response = request.post('/admin/sidekiq') + context 'sidekiq admin requests' do + where(:mounted_at) do + [ + '', + '/', + '/gitlab', + '/gitlab/', + '/gitlab/gitlab', + '/gitlab/gitlab/' + ] + end - expect(response).not_to be_redirect - expect(subject).not_to disallow_request + with_them do + before do + stub_config_setting(relative_url_root: mounted_at) + end - response = request.get('/admin/sidekiq') + it 'allows requests' do + path = File.join(mounted_at, 'admin/sidekiq') + response = request.post(path) - expect(response).not_to be_redirect - expect(subject).not_to disallow_request + expect(response).not_to be_redirect + expect(subject).not_to disallow_request + + response = request.get(path) + + expect(response).not_to be_redirect + expect(subject).not_to disallow_request + end + end end where(:description, :path) do |