diff options
author | Ash McKenzie <amckenzie@gitlab.com> | 2019-06-20 18:00:44 +1000 |
---|---|---|
committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-06-20 18:00:44 +1000 |
commit | 03220c00d9cf3bc4ab05ef1ea16948ce47df3834 (patch) | |
tree | 85a27c6598df57796f62c9f70a9e23764e668d12 | |
parent | adeccba13676b831335e2f12f779f77602298b31 (diff) | |
download | gitlab-ce-03220c00d9cf3bc4ab05ef1ea16948ce47df3834.tar.gz |
Gitlab::JsonCache#parse_value ensure string63510-error-parsing-true-boolean-in-gitlab-jsoncache
-rw-r--r-- | lib/gitlab/json_cache.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/json_cache_spec.rb | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lib/gitlab/json_cache.rb b/lib/gitlab/json_cache.rb index e4bc437d787..9a0b2b35112 100644 --- a/lib/gitlab/json_cache.rb +++ b/lib/gitlab/json_cache.rb @@ -58,7 +58,7 @@ module Gitlab private def parse_value(raw, klass) - value = ActiveSupport::JSON.decode(raw) + value = ActiveSupport::JSON.decode(raw.to_s) case value when Hash then parse_entry(value, klass) diff --git a/spec/lib/gitlab/json_cache_spec.rb b/spec/lib/gitlab/json_cache_spec.rb index b82c09af306..c6a6042c65c 100644 --- a/spec/lib/gitlab/json_cache_spec.rb +++ b/spec/lib/gitlab/json_cache_spec.rb @@ -106,6 +106,16 @@ describe Gitlab::JsonCache do expect(cache.read(key)).to be_nil 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 it 'parses the cached value' do allow(backend).to receive(:read) |