2 files changed, 55 insertions, 1 deletions
diff --git a/spec/models/track_mailer_spec.rb b/spec/models/track_mailer_spec.rb
index b90ca7e52..6612641c1 100644
--- a/spec/models/track_mailer_spec.rb
+++ b/spec/models/track_mailer_spec.rb
@@ -22,7 +22,8 @@ describe TrackMailer do
                                          :last_daily_track_email= => true,
                                          :save! => true,
                                          :url_name => 'test-name',
-                                         :get_locale => 'en')
+                                         :get_locale => 'en',
+                                         :should_be_emailed? => true)
                 User.stub!(:find).and_return([@user])
                 @user.stub!(:no_xapian_reindex=)
             end
@@ -110,6 +111,36 @@ describe TrackMailer do
 
         end
 
+        describe 'when a user should not be emailed' do
+            before do
+                @user = mock_model(User, :no_xapian_reindex= => false,
+                                         :last_daily_track_email= => true,
+                                         :save! => true,
+                                         :url_name => 'test-name',
+                                         :should_be_emailed? => false)
+                User.stub!(:find).and_return([@user])
+                @user.stub!(:no_xapian_reindex=)
+            end
+
+            it 'should not ask for any daily track things for the user' do
+                expected_conditions = [ "tracking_user_id = ? and track_medium = ?", @user.id, 'email_daily' ]
+                TrackThing.should_not_receive(:find).with(:all, :conditions => expected_conditions).and_return([])
+                TrackMailer.alert_tracks
+            end
+
+
+            it 'should not set the no_xapian_reindex flag on the user' do
+                @user.should_not_receive(:no_xapian_reindex=).with(true)
+                TrackMailer.alert_tracks
+            end
+
+            it 'should not update the time of the user\'s last daily tracking email' do
+                @user.should_not_receive(:last_daily_track_email=).with(Time.now)
+                @user.should_not_receive(:save!)
+                TrackMailer.alert_tracks
+            end
+        end
+
     end
 
     describe 'delivering the email' do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index ee6916ffc..751a61060 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -282,3 +282,26 @@ describe User, "when setting a profile photo" do
 #    end
 end
 
+describe User, "when unconfirmed" do
+    fixtures :users
+
+    before do
+        @user = users(:unconfirmed_user)
+    end
+
+    it "should not be emailed" do
+        @user.should_be_emailed?.should be_false
+    end
+end
+
+describe User, "when emails have bounced" do
+    fixtures :users
+
+    it "should record bounces" do
+        User.record_bounce_for_email("bob@localhost", "The reason we think the email bounced (e.g. a bounce message)")
+        
+        user = User.find_user_by_email("bob@localhost")
+        user.email_bounced_at.should_not be_nil
+        user.email_bounce_message.should == "The reason we think the email bounced (e.g. a bounce message)"
+    end
+end