diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /spec/lib/gitlab/middleware | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'spec/lib/gitlab/middleware')
-rw-r--r-- | spec/lib/gitlab/middleware/rails_queue_duration_spec.rb | 11 | ||||
-rw-r--r-- | spec/lib/gitlab/middleware/read_only_spec.rb | 13 |
2 files changed, 15 insertions, 9 deletions
diff --git a/spec/lib/gitlab/middleware/rails_queue_duration_spec.rb b/spec/lib/gitlab/middleware/rails_queue_duration_spec.rb index 8f9b0aec9eb..cdb48024531 100644 --- a/spec/lib/gitlab/middleware/rails_queue_duration_spec.rb +++ b/spec/lib/gitlab/middleware/rails_queue_duration_spec.rb @@ -29,26 +29,19 @@ RSpec.describe Gitlab::Middleware::RailsQueueDuration do it 'sets proxy_flight_time and calls the app when the header is present' do env['HTTP_GITLAB_WORKHORSE_PROXY_START'] = '123' - expect(transaction).to receive(:set).with(:rails_queue_duration, an_instance_of(Float)) + expect(transaction).to receive(:set).with(:gitlab_transaction_rails_queue_duration_total, an_instance_of(Float)) expect(middleware.call(env)).to eq('yay') end it 'observes rails queue duration metrics and calls the app when the header is present' do env['HTTP_GITLAB_WORKHORSE_PROXY_START'] = '2000000000' - expect(middleware.send(:metric_rails_queue_duration_seconds)).to receive(:observe).with(transaction.labels, 1) + expect(transaction).to receive(:observe).with(:gitlab_rails_queue_duration_seconds, 1) Timecop.freeze(Time.at(3)) do expect(middleware.call(env)).to eq('yay') end end - - it 'creates a metric with a docstring' do - metric = middleware.send(:metric_rails_queue_duration_seconds) - - expect(metric).to be_instance_of(Prometheus::Client::Histogram) - expect(metric.docstring).to eq('Measures latency between GitLab Workhorse forwarding a request to Rails') - end end end end diff --git a/spec/lib/gitlab/middleware/read_only_spec.rb b/spec/lib/gitlab/middleware/read_only_spec.rb index 3bdf2a5077f..50dd38278b9 100644 --- a/spec/lib/gitlab/middleware/read_only_spec.rb +++ b/spec/lib/gitlab/middleware/read_only_spec.rb @@ -110,6 +110,19 @@ RSpec.describe Gitlab::Middleware::ReadOnly do expect(subject).not_to disallow_request end + context 'relative URL is configured' do + before do + stub_config_setting(relative_url_root: '/gitlab') + end + + it 'expects a graphql request to be allowed' do + response = request.post("/gitlab/api/graphql") + + expect(response).not_to be_redirect + expect(subject).not_to disallow_request + end + end + context 'sidekiq admin requests' do where(:mounted_at) do [ |