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

2019-08-08 08:44:33 +02:00
parent 86cfa2ea6c f51c7c105f
commit ebc0521ba8
27 changed files with 266 additions and 59 deletions
--- a/spec/services/unblock_domain_service_spec.rb
+++ b/spec/services/unblock_domain_service_spec.rb
@@ -31,7 +31,7 @@ describe UnblockDomainService, type: :service do
      subject.call(@domain_block)
      expect_deleted_domain_block
      expect(@suspended.reload.suspended?).to be false
-      expect(@silenced.reload.silenced?).to be true
+      expect(@silenced.reload.silenced?).to be false
      expect(@independently_suspended.reload.suspended?).to be true
      expect(@independently_silenced.reload.silenced?).to be true
    end