Merge lp:~ricardokirkner/django-adminaudit/no-empty-reports into lp:django-adminaudit

[Ricardo Kirkner]

do not send out emails when no data has changed

[Michael Nelson (michael.nelson)]

LGTM

review: Approve

=== modified file 'adminaudit/management/commands/adminaudit_email_report.py'
--- adminaudit/management/commands/adminaudit_email_report.py	2012-01-16 19:48:22 +0000
+++ adminaudit/management/commands/adminaudit_email_report.py	2014-01-02 15:57:01 +0000
@@ -27,8 +27,13 @@
 
         if not recipients:
             print "No admin audit summary recipients configured."
+            return
 
         context = self.context_data()
+        if not context['users']:
+            print "Nothing to report."
+            return
+
         for recipient in recipients:
             context['recipient'] = recipient
             print "Sending e-email to", recipient,

=== modified file 'adminaudit/tests.py'
--- adminaudit/tests.py	2013-06-07 19:07:05 +0000
+++ adminaudit/tests.py	2014-01-02 15:57:01 +0000
@@ -254,7 +254,11 @@
 class AdminAuditEmailReportTestCase(TestCase):
 
     def setUp(self):
-        AuditLog.objects.all().delete()
+        self.user = User.objects.create_user('user1', '[e-mail]')
+        self.auditlog = AuditLog.create(self.user, self.user, 'update',
+                                        self.user)
+        self.auditlog.created_at = self.auditlog.created_at - timedelta(days=1)
+        self.auditlog.save()
 
     def test_report_date_returns_yesterday(self):
         report_date = EmailCommand().report_date()
@@ -277,23 +281,26 @@
 
         self.assertEquals(0, len(mail.outbox))
 
+    def test_no_mails_are_sent_when_there_are_no_changs(self):
+        recipients = ['{0}@example.com'.format(c) for c in 'abcdefghijk']
+        settings.ADMINAUDIT_EMAILS_RECIPIENTS = recipients
+
+        AuditLog.objects.all().delete()
+        EmailCommand().handle()
+
+        self.assertEquals(0, len(mail.outbox))
+
     def test_data_for_user(self):
-        user1 = User.objects.create_user('user1', '[e-mail]')
         user2 = User.objects.create_user('user2', '[e-mail]')
-        AuditLog.create(user1, user1, 'update', user1)
-        AuditLog.create(user2, user1, 'update', user1)
+        AuditLog.create(user2, self.user, 'update', self.user)
 
-        data = EmailCommand().data_for_user(user1.pk, AuditLog.objects.all())
+        data = EmailCommand().data_for_user(self.user.pk,
+                                            AuditLog.objects.all())
 
         self.assertEquals(1, data['auditlogs'].count())
         self.assertTrue('user1' in data['caption'])
 
     def test_context_data(self):
-        user1 = User.objects.create_user('user1', '[e-mail]')
-        auditlog = AuditLog.create(user1, user1, 'update', user1)
-        auditlog.created_at = auditlog.created_at - timedelta(days=1)
-        auditlog.save()
-
         context = EmailCommand().context_data()
 
         self.assertEquals(1, len(context['users']))