Fix cache_collection crashing when given an empty collection (#15921)
* Fix cache_collection crashing when given an empty collection * Add testsmaster
parent
43eff898a0
commit
5027abecd1
@ -0,0 +1,40 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
require 'rails_helper' |
||||
|
||||
RSpec.describe CacheConcern, type: :controller do |
||||
controller(ApplicationController) do |
||||
include CacheConcern |
||||
|
||||
def empty_array |
||||
render plain: cache_collection([], Status).size |
||||
end |
||||
|
||||
def empty_relation |
||||
render plain: cache_collection(Status.none, Status).size |
||||
end |
||||
end |
||||
|
||||
before do |
||||
routes.draw do |
||||
get 'empty_array' => 'anonymous#empty_array' |
||||
post 'empty_relation' => 'anonymous#empty_relation' |
||||
end |
||||
end |
||||
|
||||
describe '#cache_collection' do |
||||
context 'given an empty array' do |
||||
it 'returns an empty array' do |
||||
get :empty_array |
||||
expect(response.body).to eq '0' |
||||
end |
||||
end |
||||
|
||||
context 'given an empty relation' do |
||||
it 'returns an empty array' do |
||||
get :empty_relation |
||||
expect(response.body).to eq '0' |
||||
end |
||||
end |
||||
end |
||||
end |
@ -0,0 +1,19 @@ |
||||
require 'rails_helper' |
||||
|
||||
RSpec.describe EntityCache do |
||||
let(:local_account) { Fabricate(:account, domain: nil, username: 'alice') } |
||||
let(:remote_account) { Fabricate(:account, domain: 'remote.test', username: 'bob', url: 'https://remote.test/') } |
||||
|
||||
describe '#emoji' do |
||||
subject { EntityCache.instance.emoji(shortcodes, domain) } |
||||
|
||||
context 'called with an empty list of shortcodes' do |
||||
let(:shortcodes) { [] } |
||||
let(:domain) { 'example.org' } |
||||
|
||||
it 'returns an empty array' do |
||||
is_expected.to eq [] |
||||
end |
||||
end |
||||
end |
||||
end |
Loading…
Reference in new issue