Add latest changes from gitlab-org/gitlab@master

1 files changed, 23 insertions, 18 deletions

diff --git a/spec/lib/version_check_spec.rb b/spec/lib/version_check_spec.rb
index f14b38c55dd..1803dd66ba7 100644
--- a/spec/lib/version_check_spec.rb
+++ b/spec/lib/version_check_spec.rb
@@ -2,9 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe VersionCheck, :use_clean_rails_memory_store_caching do
-  include ReactiveCachingHelpers
-
+RSpec.describe VersionCheck do
   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+})
@@ -32,7 +30,7 @@ RSpec.describe VersionCheck, :use_clean_rails_memory_store_caching do
       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
 
@@ -41,31 +39,38 @@ RSpec.describe VersionCheck, :use_clean_rails_memory_store_caching do
         stub_request(:get, described_class.url).to_return(status: 500, body: nil, headers: {})
       end
 
-      it 'returns an error hash' do
-        expect(described_class.new.calculate_reactive_cache).to eq({ error: 'version check failed', status: 500 })
+      it 'returns nil' do
+        expect(described_class.new.calculate_reactive_cache).to be(nil)
       end
     end
   end
 
   describe '#response' do
     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)
+      let(:response) { { "severity" => "success" }.to_json }
 
-        expect(version_check.response).to eq(data)
+      before do
+        allow_next_instance_of(described_class) do |instance|
+          allow(instance).to receive(:with_reactive_cache).and_return(response)
+        end
+      end
+
+      it 'returns the response object' do
+        expect(described_class.new.response).to be(response)
       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')
+    context 'cache returns nil' do
+      let(:response) { nil }
+
+      before do
+        allow_next_instance_of(described_class) do |instance|
+          allow(instance).to receive(:with_reactive_cache).and_return(response)
+        end
+      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
+      it 'returns nil' do
+        expect(described_class.new.response).to be(nil)
       end
     end
   end