summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorSimon Knox <psimyn@gmail.com>2017-08-15 11:15:28 +1000
committerSimon Knox <psimyn@gmail.com>2017-08-15 11:15:28 +1000
commit193ac8fa2e002ed04cd3373007cc0aaef131da48 (patch)
tree94dd201a86d2c8c0f343b6ff106b956e64a24919 /spec
parent30ee60766a191e97b71b147d09a3a31a3669b548 (diff)
downloadgitlab-ce-193ac8fa2e002ed04cd3373007cc0aaef131da48.tar.gz
Revert "Merge branch 'broadcast-messages-cache' into 'master'"
This reverts commit c19ea197c7195771ddd68fa298f72c28612cadd8, reversing changes made to 0887a2bd10c3d774299b5b779d0335ddcb5064de.
Diffstat (limited to 'spec')
-rw-r--r--spec/models/broadcast_message_spec.rb20
1 files changed, 1 insertions, 19 deletions
diff --git a/spec/models/broadcast_message_spec.rb b/spec/models/broadcast_message_spec.rb
index 3369aef1d3e..a8ca1d110e4 100644
--- a/spec/models/broadcast_message_spec.rb
+++ b/spec/models/broadcast_message_spec.rb
@@ -20,7 +20,7 @@ describe BroadcastMessage do
it { is_expected.not_to allow_value('000').for(:font) }
end
- describe '.current', :use_clean_rails_memory_store_caching do
+ describe '.current' do
it 'returns message if time match' do
message = create(:broadcast_message)
@@ -45,14 +45,6 @@ describe BroadcastMessage do
expect(described_class.current).to be_empty
end
-
- it 'caches the output of the query' do
- create(:broadcast_message)
-
- expect(described_class).to receive(:where).and_call_original.once
-
- 2.times { described_class.current }
- end
end
describe '#active?' do
@@ -110,14 +102,4 @@ describe BroadcastMessage do
end
end
end
-
- describe '#flush_redis_cache' do
- it 'flushes the Redis cache' do
- message = create(:broadcast_message)
-
- expect(Rails.cache).to receive(:delete).with(described_class::CACHE_KEY)
-
- message.flush_redis_cache
- end
- end
end