diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-15 08:19:13 +0000 |
---|---|---|
committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-06-16 11:52:56 -0500 |
commit | 3449ae5781e598ae323a3ad7bd942ce4974533ca (patch) | |
tree | 4a286c1d97006c2ae8598810cb08c7fe15f4ef03 | |
parent | fcd47b1a510a0dd78e9f8435191a0c7ddbf59755 (diff) | |
download | gitlab-ce-3449ae5781e598ae323a3ad7bd942ce4974533ca.tar.gz |
Merge branch 'dm-fix-parser-cache' into 'master'
Don't return nil for missing objects from parser cache
See merge request !12168
-rw-r--r-- | changelogs/unreleased/dm-fix-parser-cache.yml | 4 | ||||
-rw-r--r-- | lib/banzai/reference_parser/base_parser.rb | 2 | ||||
-rw-r--r-- | spec/lib/banzai/reference_parser/base_parser_spec.rb | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/changelogs/unreleased/dm-fix-parser-cache.yml b/changelogs/unreleased/dm-fix-parser-cache.yml new file mode 100644 index 00000000000..31c163b7272 --- /dev/null +++ b/changelogs/unreleased/dm-fix-parser-cache.yml @@ -0,0 +1,4 @@ +--- +title: Don't return nil for missing objects from parser cache +merge_request: +author: diff --git a/lib/banzai/reference_parser/base_parser.rb b/lib/banzai/reference_parser/base_parser.rb index 1e2536231d8..279fca8d043 100644 --- a/lib/banzai/reference_parser/base_parser.rb +++ b/lib/banzai/reference_parser/base_parser.rb @@ -171,7 +171,7 @@ module Banzai collection.where(id: to_query).each { |row| cache[row.id] = row } end - cache.values_at(*ids) + cache.values_at(*ids).compact else collection.where(id: ids) end diff --git a/spec/lib/banzai/reference_parser/base_parser_spec.rb b/spec/lib/banzai/reference_parser/base_parser_spec.rb index f4f42bfc3ed..76fab93821a 100644 --- a/spec/lib/banzai/reference_parser/base_parser_spec.rb +++ b/spec/lib/banzai/reference_parser/base_parser_spec.rb @@ -114,7 +114,7 @@ describe Banzai::ReferenceParser::BaseParser, lib: true do expect(hash).to eq({ link => user }) end - it 'returns an empty Hash when entry does not exist in the database' do + it 'returns an empty Hash when entry does not exist in the database', :request_store do link = double(:link) expect(link).to receive(:has_attribute?). |