From 1c9a96e2aade0a13276de3b0904b54dcce4cdd44 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sun, 20 Nov 2011 01:06:45 +0100 Subject: [PATCH] Fixed relayable specs --- spec/controllers/conversations_controller_spec.rb | 2 +- spec/integration/dispatching_spec.rb | 1 - spec/shared_behaviors/relayable.rb | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/spec/controllers/conversations_controller_spec.rb b/spec/controllers/conversations_controller_spec.rb index 6a48dd68a..4057527d4 100644 --- a/spec/controllers/conversations_controller_spec.rb +++ b/spec/controllers/conversations_controller_spec.rb @@ -95,7 +95,7 @@ describe ConversationsController do ) p = Postzord::Dispatcher.build(alice, cnv) - Postzord::Dispatcher.stub!(:new).and_return(p) + p.class.stub!(:new).and_return(p) p.should_receive(:post) post :create, @hash end diff --git a/spec/integration/dispatching_spec.rb b/spec/integration/dispatching_spec.rb index a4cd2ee06..e5fe283b9 100644 --- a/spec/integration/dispatching_spec.rb +++ b/spec/integration/dispatching_spec.rb @@ -3,7 +3,6 @@ require 'spec_helper' describe "Dispatching" do context "a comment retraction on a public post" do it "should trigger a private dispatch" do - pending "Running this causes test failures in the relayable specs. If you can figure out why, you'll be OUR HERO. <3 <3" luke, leia, raph = set_up_friends # Luke has a public post and comments on it diff --git a/spec/shared_behaviors/relayable.rb b/spec/shared_behaviors/relayable.rb index 7bf27b68d..085e13ef9 100644 --- a/spec/shared_behaviors/relayable.rb +++ b/spec/shared_behaviors/relayable.rb @@ -57,7 +57,7 @@ describe Diaspora::Relayable do it 'dispatches when the person receiving is the parent author' do p = Postzord::Dispatcher.build(@local_luke, @object_by_recipient) p.should_receive(:post) - Postzord::Dispatcher.stub!(:new).and_return(p) + p.class.stub!(:new).and_return(p) @object_by_recipient.receive(@local_luke, @local_leia.person) end