1 files changed, 58 insertions, 21 deletions

diff --git a/spec/lib/version_check_spec.rb b/spec/lib/version_check_spec.rb
index 1803dd66ba7..4aa8975b7cf 100644
--- a/spec/lib/version_check_spec.rb
+++ b/spec/lib/version_check_spec.rb
@@ -2,7 +2,9 @@
 
 require 'spec_helper'
 
-RSpec.describe VersionCheck do
+RSpec.describe VersionCheck, :use_clean_rails_memory_store_caching do
+  include ReactiveCachingHelpers
+
   describe '.url' do
     it 'returns the correct URL' do
       expect(described_class.url).to match(%r{\A#{Regexp.escape(described_class.host)}/check\.json\?gitlab_info=\w+})
@@ -24,13 +26,25 @@ RSpec.describe VersionCheck do
   end
 
   describe '#calculate_reactive_cache' do
-    context 'response code is 200' do
+    context 'response code is 200 with valid body' do
       before do
         stub_request(:get, described_class.url).to_return(status: 200, body: '{ "status": "success" }', headers: {})
       end
 
       it 'returns the response object' do
-        expect(described_class.new.calculate_reactive_cache).to eq("{ \"status\": \"success\" }")
+        expect(described_class.new.calculate_reactive_cache).to eq({ "status" => "success" })
+      end
+    end
+
+    context 'response code is 200 with invalid body' do
+      before do
+        stub_request(:get, described_class.url).to_return(status: 200, body: '{ "invalid: json" }', headers: {})
+      end
+
+      it 'returns an error hash' do
+        expect(described_class.new.calculate_reactive_cache).to eq(
+          { error: 'parsing version check response failed', status: 200 }
+        )
       end
     end
 
@@ -39,38 +53,61 @@ RSpec.describe VersionCheck do
         stub_request(:get, described_class.url).to_return(status: 500, body: nil, headers: {})
       end
 
-      it 'returns nil' do
-        expect(described_class.new.calculate_reactive_cache).to be(nil)
+      it 'returns an error hash' do
+        expect(described_class.new.calculate_reactive_cache).to eq({ error: 'version check failed', status: 500 })
       end
     end
   end
 
   describe '#response' do
-    context 'cache returns value' do
-      let(:response) { { "severity" => "success" }.to_json }
-
+    # see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106254
+    context "with old string value in cache" do
       before do
-        allow_next_instance_of(described_class) do |instance|
-          allow(instance).to receive(:with_reactive_cache).and_return(response)
-        end
+        old_version_check = described_class.new
+        allow(old_version_check).to receive(:id).and_return(Gitlab::VERSION)
+        write_reactive_cache(old_version_check,
+          "{\"latest_stable_versions\":[],\"latest_version\":\"15.6.2\",\"severity\":\"success\",\"details\":\"\"}"
+        )
       end
 
-      it 'returns the response object' do
-        expect(described_class.new.response).to be(response)
+      it 'returns nil' do
+        version_check = described_class.new
+        expect(version_check.response).to be_nil
       end
     end
 
-    context 'cache returns nil' do
-      let(:response) { nil }
+    # see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106254
+    context "with non-hash value in cache" do
+      it 'returns nil and invalidates the reactive cache' do
+        version_check = described_class.new
+        stub_reactive_cache(version_check,
+          "{\"latest_stable_versions\":[],\"latest_version\":\"15.6.2\",\"severity\":\"success\",\"details\":\"\"}"
+        )
 
-      before do
-        allow_next_instance_of(described_class) do |instance|
-          allow(instance).to receive(:with_reactive_cache).and_return(response)
-        end
+        expect(version_check).to receive(:refresh_reactive_cache!).and_call_original
+        expect(version_check.response).to be_nil
+        expect(read_reactive_cache(version_check)).to be_nil
       end
+    end
 
-      it 'returns nil' do
-        expect(described_class.new.response).to be(nil)
+    context 'cache returns value' do
+      it 'returns the response object' do
+        version_check = described_class.new
+        data = { status: 'success' }
+        stub_reactive_cache(version_check, data)
+
+        expect(version_check.response).to eq(data)
+      end
+    end
+
+    context 'cache returns error' do
+      it 'returns nil and invalidates the reactive cache' do
+        version_check = described_class.new
+        stub_reactive_cache(version_check, error: 'version check failed')
+
+        expect(version_check).to receive(:refresh_reactive_cache!).and_call_original
+        expect(version_check.response).to be_nil
+        expect(read_reactive_cache(version_check)).to be_nil
       end
     end
   end