@@ -56,7 +56,7 @@ class FeedEvent < ActiveRecord::Base private def source_disabled_event? - source.respond_to?(:user) && source.user && !source.user.feed_event_enabled?(self.class) + self.class.user_can_enable_event? && source.respond_to?(:user) && source.user && !source.user.feed_event_enabled?(self.class) end def send_email FeedEventMailer.send "deliver_#{self.class.name.underscore[0..-7]}", self if self.class.can_send_email? && @@ -75,8 +75,7 @@ class FeedEvent < ActiveRecord::Base end def source_user_has_event_enabled - errors.add :source, "this event is disabled by the user of #{self.source.class}" if self.class.user_can_enable_event? && - source_disabled_event? + errors.add :source, "this event is disabled by the user of #{self.source.class}" if source_disabled_event? end end lib/feed_event.rb @@ -90,7 +90,7 @@ describe 'check event enabled when sending email' do before(:each) do TestFeedEvent.connection.stub!(:insert) - FeedEventMailer.stub!(:send).with(:new).and_return(stub('mailer', :test_feed => true)) + FeedEventMailer.stub!(:send).with(:new).and_return(stub('mailer', :test_feed => true, :not_disabable => true)) @user = mock_model(User, :subscribed_to_feed_event? => true, :subscribed_to_email? => true) Source.stub!(:base_class).and_return(Source) @source = mock_model(Source, :user => @user) @@ -109,9 +109,9 @@ describe 'check event enabled when sending email' do @event.save end - it "should send no email if user can't enable event" do - event = NotDisabableEvent.new :source => @user, :user => @user - FeedEventMailer.should_receive(:send).with('not_disabable', event).never + it "should send email if user can't disable event" do + event = NotDisabableEvent.new :source => @source, :user => @user + FeedEventMailer.should_receive(:send).with('deliver_not_disabable', event) event.save end end spec/models/feed_event_spec.rb e3a60b1da6752d6448121625a3d554f8d7d2f30f Thilo thilo@Silverchest.local http://github.com/langalex/social_feed/commit/5690c7e77960c3a1209716e615c89136095417de 5690c7e77960c3a1209716e615c89136095417de 2008-08-27T18:08:12-07:00 2008-08-27T18:08:12-07:00 fixed that the feed event don't send emails if the source user can't disable the feed event 279979f0dd1435b65bea45b5b4533beb5120d2f5 Thilo thilo@Silverchest.local