diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-20 21:09:31 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-20 21:09:31 +0300 |
commit | ae4ef81757bdd2c984777d8f0b2c275bbcb4b17d (patch) | |
tree | 1ac23c80190bafb47a1f5a6f1aae9da91d35d9dc /spec/lib/gitlab | |
parent | 194b499aa8e26df26ff70a1e1ce0396587bd5243 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab')
-rw-r--r-- | spec/lib/gitlab/import_export/all_models.yml | 1 | ||||
-rw-r--r-- | spec/lib/gitlab/polling_interval_spec.rb | 32 |
2 files changed, 33 insertions, 0 deletions
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml index eb28e730499..b3f279344b1 100644 --- a/spec/lib/gitlab/import_export/all_models.yml +++ b/spec/lib/gitlab/import_export/all_models.yml @@ -431,6 +431,7 @@ project: - sourced_pipelines - prometheus_metrics - vulnerabilities +- vulnerability_exports - vulnerability_findings - vulnerability_feedback - vulnerability_identifiers diff --git a/spec/lib/gitlab/polling_interval_spec.rb b/spec/lib/gitlab/polling_interval_spec.rb index 979164269bd..31569b2c51e 100644 --- a/spec/lib/gitlab/polling_interval_spec.rb +++ b/spec/lib/gitlab/polling_interval_spec.rb @@ -33,4 +33,36 @@ describe Gitlab::PollingInterval do end end end + + describe '.set_api_header' do + let(:context) { double(Grape::Endpoint) } + + before do + allow(context).to receive(:header) + end + + context 'when polling is disabled' do + before do + stub_application_setting(polling_interval_multiplier: 0) + end + + it 'sets value to -1' do + expect(context).to receive(:header).with('Poll-Interval', '-1') + + polling_interval.set_api_header(context, interval: 10_000) + end + end + + context 'when polling is enabled' do + before do + stub_application_setting(polling_interval_multiplier: 0.33333) + end + + it 'applies modifier to base interval' do + expect(context).to receive(:header).with('Poll-Interval', '3333') + + polling_interval.set_api_header(context, interval: 10_000) + end + end + end end |