about summary refs log tree commit diff
path: root/spec
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-06-03 14:54:30 +0200
committerThibaut Girka <thib@sitedethib.com>2019-06-03 14:54:30 +0200
commit76918554a6898f9b94d4ffde07face01754fd058 (patch)
treefa394c02128610793353c0a6ba8363d814147ea4 /spec
parent35c4ff07f4d61aaf7ade2ae17060298d62b3f643 (diff)
parentf2f5c1bd6d37ec2ba7d0f98a3c0f8fead6b78f1d (diff)
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
Diffstat (limited to 'spec')
-rw-r--r--spec/services/notify_service_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/notify_service_spec.rb b/spec/services/notify_service_spec.rb
index a68fdd8df..b09d335ba 100644
--- a/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
@@ -105,7 +105,7 @@ RSpec.describe NotifyService, type: :service do
     end
 
     it 'shows reblogs when disabled' do
-      recipient.follow!(sender, reblogs: true)
+      recipient.follow!(sender, reblogs: false)
       is_expected.to change(Notification, :count)
     end
   end