diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-15 01:06:19 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-15 01:06:19 +0300 |
commit | a16072c2f88191585b0a69825b4b0fe53984cc80 (patch) | |
tree | acc57b77209fd7a54512e75324b174e4cff6198a /spec/helpers/version_check_helper_spec.rb | |
parent | 045e5c9a98f55302c35a50ff184d436ca3c3c0e3 (diff) |
Add latest changes from gitlab-org/gitlab@15-8-stable-ee
Diffstat (limited to 'spec/helpers/version_check_helper_spec.rb')
-rw-r--r-- | spec/helpers/version_check_helper_spec.rb | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/spec/helpers/version_check_helper_spec.rb b/spec/helpers/version_check_helper_spec.rb index c76eb08820a..1c8eacf088a 100644 --- a/spec/helpers/version_check_helper_spec.rb +++ b/spec/helpers/version_check_helper_spec.rb @@ -49,26 +49,29 @@ RSpec.describe VersionCheckHelper do describe '#show_security_patch_upgrade_alert?' do describe 'return conditions' do - where(:feature_enabled, :show_version_check, :gitlab_version_check, :result) do + where(:show_version_check, :gitlab_version_check, :result) do [ - [false, false, nil, false], - [false, false, { "severity" => "success" }, false], - [false, false, { "severity" => "danger" }, false], - [false, true, nil, false], - [false, true, { "severity" => "success" }, false], - [false, true, { "severity" => "danger" }, false], - [true, false, nil, false], - [true, false, { "severity" => "success" }, false], - [true, false, { "severity" => "danger" }, false], - [true, true, nil, false], - [true, true, { "severity" => "success" }, false], - [true, true, { "severity" => "danger" }, true] + [false, nil, false], + [false, { "severity" => "success" }, false], + [false, { "severity" => "danger" }, false], + [false, { "severity" => "danger", "critical_vulnerability" => 'some text' }, false], + [false, { "severity" => "danger", "critical_vulnerability" => 'false' }, false], + [false, { "severity" => "danger", "critical_vulnerability" => false }, false], + [false, { "severity" => "danger", "critical_vulnerability" => 'true' }, false], + [false, { "severity" => "danger", "critical_vulnerability" => true }, false], + [true, nil, false], + [true, { "severity" => "success" }, nil], + [true, { "severity" => "danger" }, nil], + [true, { "severity" => "danger", "critical_vulnerability" => 'some text' }, nil], + [true, { "severity" => "danger", "critical_vulnerability" => 'false' }, false], + [true, { "severity" => "danger", "critical_vulnerability" => false }, false], + [true, { "severity" => "danger", "critical_vulnerability" => 'true' }, true], + [true, { "severity" => "danger", "critical_vulnerability" => true }, true] ] end with_them do before do - stub_feature_flags(critical_security_alert: feature_enabled) allow(helper).to receive(:show_version_check?).and_return(show_version_check) allow(helper).to receive(:gitlab_version_check).and_return(gitlab_version_check) end |