about summary refs log tree commit diff
path: root/spec/services
diff options
context:
space:
mode:
authorAndré Lewin <andre.charles.lewin@gmail.com>2017-04-05 20:28:58 +0200
committerGitHub <noreply@github.com>2017-04-05 20:28:58 +0200
commitbf7cefa516075b480fd5da5ea4b1385d7d17bdd5 (patch)
tree45bc6b379f5d06553d0a3e5bf4c0e2b452b7552f /spec/services
parent8736ef50ad13d5506bd6a673d4fcb96c33b609a3 (diff)
parentd13d169922c7efeb6e6c20ef6a271eeda552275f (diff)
Merge branch 'master' into master
Diffstat (limited to 'spec/services')
-rw-r--r--spec/services/block_domain_service_spec.rb2
-rw-r--r--spec/services/fan_out_on_write_service_spec.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/spec/services/block_domain_service_spec.rb b/spec/services/block_domain_service_spec.rb
index d88b3b55c..8e71d4542 100644
--- a/spec/services/block_domain_service_spec.rb
+++ b/spec/services/block_domain_service_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe BlockDomainService do
     bad_status2
     bad_attachment
 
-    subject.call('evil.org', :suspend)
+    subject.call(DomainBlock.create!(domain: 'evil.org', severity: :suspend))
   end
 
   it 'creates a domain block' do
diff --git a/spec/services/fan_out_on_write_service_spec.rb b/spec/services/fan_out_on_write_service_spec.rb
index 07f8c2dc8..6ee225c4c 100644
--- a/spec/services/fan_out_on_write_service_spec.rb
+++ b/spec/services/fan_out_on_write_service_spec.rb
@@ -23,6 +23,7 @@ RSpec.describe FanOutOnWriteService do
   end
 
   it 'delivers status to local followers' do
+    pending 'some sort of problem in test environment causes this to sometimes fail'
     expect(Feed.new(:home, follower).get(10).map(&:id)).to include status.id
   end