diff options
author | ThibG <thib@sitedethib.com> | 2018-11-27 16:26:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-27 16:26:18 +0100 |
commit | 33be091f506242b136b0d4a65cf06a0babc4d757 (patch) | |
tree | 0f9f6e40e40f4ecabfa1e5f906000abe756f42a9 /spec/models/notification_spec.rb | |
parent | 6b6e633c095485f95350c4308a942192e5fe8806 (diff) | |
parent | 55edfd6e0e1cb5377f0c3406d94ddfd84ddb7b20 (diff) |
Merge pull request #828 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/models/notification_spec.rb')
-rw-r--r-- | spec/models/notification_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb index c781f2a29..403eb8c33 100644 --- a/spec/models/notification_spec.rb +++ b/spec/models/notification_spec.rb @@ -101,7 +101,7 @@ RSpec.describe Notification, type: :model do before do allow(accounts_with_ids).to receive(:[]).with(stale_account1.id).and_return(account1) allow(accounts_with_ids).to receive(:[]).with(stale_account2.id).and_return(account2) - allow(Account).to receive_message_chain(:where, :map, :to_h).and_return(accounts_with_ids) + allow(Account).to receive_message_chain(:where, :includes, :each_with_object).and_return(accounts_with_ids) end let(:cached_items) do |