diff options
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/container_registry/migration_spec.rb | 24 | ||||
-rw-r--r-- | spec/lib/gitlab/ci/reports/security/scanner_spec.rb | 2 |
2 files changed, 24 insertions, 2 deletions
diff --git a/spec/lib/container_registry/migration_spec.rb b/spec/lib/container_registry/migration_spec.rb index 654991fd61a..7e8fcd65930 100644 --- a/spec/lib/container_registry/migration_spec.rb +++ b/spec/lib/container_registry/migration_spec.rb @@ -158,6 +158,30 @@ RSpec.describe ContainerRegistry::Migration do end end + describe '.pre_import_timeout' do + let(:value) { 10.minutes } + + before do + stub_application_setting(container_registry_pre_import_timeout: value) + end + + it 'returns the matching application_setting' do + expect(described_class.pre_import_timeout).to eq(value) + end + end + + describe '.import_timeout' do + let(:value) { 10.minutes } + + before do + stub_application_setting(container_registry_import_timeout: value) + end + + it 'returns the matching application_setting' do + expect(described_class.import_timeout).to eq(value) + end + end + describe '.target_plans' do subject { described_class.target_plans } diff --git a/spec/lib/gitlab/ci/reports/security/scanner_spec.rb b/spec/lib/gitlab/ci/reports/security/scanner_spec.rb index eb406e01b24..d7ac82e3b53 100644 --- a/spec/lib/gitlab/ci/reports/security/scanner_spec.rb +++ b/spec/lib/gitlab/ci/reports/security/scanner_spec.rb @@ -103,8 +103,6 @@ RSpec.describe Gitlab::Ci::Reports::Security::Scanner do context 'when the `external_id` of the scanners are different' do where(:scanner_1_attributes, :scanner_2_attributes, :expected_comparison_result) do - { external_id: 'bundler_audit', name: 'foo', vendor: 'bar' } | { external_id: 'retire.js', name: 'foo', vendor: 'bar' } | -1 - { external_id: 'retire.js', name: 'foo', vendor: 'bar' } | { external_id: 'gemnasium', name: 'foo', vendor: 'bar' } | -1 { external_id: 'gemnasium', name: 'foo', vendor: 'bar' } | { external_id: 'gemnasium-maven', name: 'foo', vendor: 'bar' } | -1 { external_id: 'gemnasium-maven', name: 'foo', vendor: 'bar' } | { external_id: 'gemnasium-python', name: 'foo', vendor: 'bar' } | -1 { external_id: 'gemnasium-python', name: 'foo', vendor: 'bar' } | { external_id: 'bandit', name: 'foo', vendor: 'bar' } | 1 |