diff --git a/spec/controllers/publics_controller_spec.rb b/spec/controllers/publics_controller_spec.rb index 136eff689..d3efbb17b 100644 --- a/spec/controllers/publics_controller_spec.rb +++ b/spec/controllers/publics_controller_spec.rb @@ -101,15 +101,11 @@ describe PublicsController do context 'intergration tests that should not be in this file' do describe 'friend requests' do before do - deliverable = Object.new - deliverable.stub!(:deliver) - Notifier.stub!(:new_request).and_return(deliverable) req.delete user2.reload user2.pending_requests.count.should be 1 end - it 'should accept a post from another node and save the information' do pending message = user2.build_post(:status_message, :message => "hi") diff --git a/spec/lib/diaspora/parser_spec.rb b/spec/lib/diaspora/parser_spec.rb index 2b396f517..7548bc03b 100644 --- a/spec/lib/diaspora/parser_spec.rb +++ b/spec/lib/diaspora/parser_spec.rb @@ -37,12 +37,6 @@ describe Diaspora::Parser do context "friending" do let(:good_request) { FakeHttpRequest.new(:success)} - before do - deliverable = Object.new - deliverable.stub!(:deliver) - Notifier.stub!(:new_request).and_return(deliverable) - end - it "should create a new person upon getting a person request" do new_person = Factory.build(:person) diff --git a/spec/models/user/friending_spec.rb b/spec/models/user/friending_spec.rb index 1bc13b31f..e6c8ada99 100644 --- a/spec/models/user/friending_spec.rb +++ b/spec/models/user/friending_spec.rb @@ -18,16 +18,6 @@ describe Diaspora::UserModules::Friending do let(:user2) { make_user } let(:aspect2) { user2.aspects.create(:name => "aspect two") } - before do - deliverable = Object.new - deliverable.stub!(:deliver) - Notifier.stub!(:new_request).and_return(deliverable) - Notifier.stub!(:request_accepted).and_return(deliverable) - end - - - - context 'friend requesting' do it "should assign a request to a aspect for the user that sent it out" do aspect.requests.size.should == 0