Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkhall <kevinmichaelhall@gmail.com>2014-08-26 00:34:27 +0400
committerkhall <kevinmichaelhall@gmail.com>2014-08-27 04:10:29 +0400
commit4edd824d3c896f5bb8dffac30729de3627202956 (patch)
tree141b66dc220406233000928c82be9ff179884c8b /spec/workers
parentc42916df279e23cdc5715885977709502412978a (diff)
No deprecation warnings, but one spec still fails (but only when I run all the specs, not when I run just the one spec)
Diffstat (limited to 'spec/workers')
-rw-r--r--spec/workers/http_multi_spec.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/workers/http_multi_spec.rb b/spec/workers/http_multi_spec.rb
index 05e70d2f2..594f107eb 100644
--- a/spec/workers/http_multi_spec.rb
+++ b/spec/workers/http_multi_spec.rb
@@ -132,8 +132,7 @@ describe Workers::HttpMulti do
person.serialized_public_key = "-----BEGIN RSA PUBLIC KEY-----\nPsych!\n-----END RSA PUBLIC KEY-----"
person.save
- # Should be possible to drop when converting should_receive to expect(...).to
- RSpec::Mocks.proxy_for(Salmon::EncryptedSlap).reset
+ allow(@salmon).to receive(:xml_for).and_call_original
Typhoeus.stub(person.receive_url).and_return @response
Typhoeus.stub(@people[1].receive_url).and_return @response