Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 38 insertions, 0 deletions

diff --git a/spec/helpers/version_check_helper_spec.rb b/spec/helpers/version_check_helper_spec.rb
index 959c4a94a78..2bb85e7b6b8 100644
--- a/spec/helpers/version_check_helper_spec.rb
+++ b/spec/helpers/version_check_helper_spec.rb
@@ -34,4 +34,42 @@ RSpec.describe VersionCheckHelper do
       end
     end
   end
+
+  describe '#gitlab_version_check' do
+    before do
+      allow_next_instance_of(VersionCheck) do |instance|
+        allow(instance).to receive(:response).and_return({ "severity" => "success" })
+      end
+    end
+
+    it 'returns an instance of the VersionCheck class' do
+      expect(helper.gitlab_version_check).to eq({ "severity" => "success" })
+    end
+  end
+
+  describe '#show_security_patch_upgrade_alert?' do
+    describe 'return conditions' do
+      where(:show_version_check, :gitlab_version_check, :result) do
+        [
+          [false, nil, false],
+          [false, { "severity" => "success" }, false],
+          [false, { "severity" => "danger" }, false],
+          [true, nil, false],
+          [true, { "severity" => "success" }, false],
+          [true, { "severity" => "danger" }, true]
+        ]
+      end
+
+      with_them do
+        before do
+          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
+
+        it 'returns correct results' do
+          expect(helper.show_security_patch_upgrade_alert?).to eq result
+        end
+      end
+    end
+  end
 end