Merge branch 'master' into glitch-soc/merge-upstream

2018-10-30 11:22:25 +01:00
parent 7ec3f6022d 6771e8c88c
commit 94ad76a5b9
6 changed files with 34 additions and 32 deletions
--- a/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
@@ -124,9 +124,9 @@ RSpec.describe NotifyService, type: :service do
      is_expected.to change(Notification, :count)
    end

-    it 'hides reblogs when disabled' do
-      recipient.follow!(sender, reblogs: false)
-      is_expected.to_not change(Notification, :count)
+    it 'shows reblogs when disabled' do
+      recipient.follow!(sender, reblogs: true)
+      is_expected.to change(Notification, :count)
    end
  end