diff options
author | Ash McKenzie <amckenzie@gitlab.com> | 2019-01-14 15:09:01 +1100 |
---|---|---|
committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-01-16 19:14:46 +1100 |
commit | c0a5b628c896d59691b3d3a3a050d53d8a49f729 (patch) | |
tree | b8a8f4f05b86f5d8e898bbb5dafacd5bfe43b3d3 /spec/lib/gitlab/middleware/read_only_spec.rb | |
parent | a2b26577220643a865212cb297a2bf12338176ea (diff) | |
download | gitlab-ce-c0a5b628c896d59691b3d3a3a050d53d8a49f729.tar.gz |
Allow sidekiq admin requests, regardless of root
Diffstat (limited to 'spec/lib/gitlab/middleware/read_only_spec.rb')
-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 |