Commit 78869030 authored by Ash McKenzie's avatar Ash McKenzie

Merge branch '63510-error-parsing-true-boolean-in-gitlab-jsoncache' into 'master'

Gitlab::JsonCache#parse_value ensure string

Closes #63510

See merge request gitlab-org/gitlab-ce!29885
parents c79a9f40 03220c00
...@@ -58,7 +58,7 @@ module Gitlab ...@@ -58,7 +58,7 @@ module Gitlab
private private
def parse_value(raw, klass) def parse_value(raw, klass)
value = ActiveSupport::JSON.decode(raw) value = ActiveSupport::JSON.decode(raw.to_s)
case value case value
when Hash then parse_entry(value, klass) when Hash then parse_entry(value, klass)
......
...@@ -106,6 +106,16 @@ describe Gitlab::JsonCache do ...@@ -106,6 +106,16 @@ describe Gitlab::JsonCache do
expect(cache.read(key)).to be_nil expect(cache.read(key)).to be_nil
end end
context 'when the cached value is a boolean' do
it 'parses the cached value' do
allow(backend).to receive(:read)
.with(expanded_key)
.and_return(true)
expect(cache.read(key, BroadcastMessage)).to eq(true)
end
end
context 'when the cached value is a hash' do context 'when the cached value is a hash' do
it 'parses the cached value' do it 'parses the cached value' do
allow(backend).to receive(:read) allow(backend).to receive(:read)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment