55521590d1
This addresses a bug in the email content history table where "Unknown" was displayed in the number of emails sent column if any sort of failure occurred during email sending. This behavior has been editted so now the number of emails that failed to send is displayed, along with the number of emails that were successfully sent. If the email task is still pending, "0 sent" is displayed. As a small addition, the table now also includes the authors of previously sent emails, and the modal window for an email also displays its author.
94 lines
2.7 KiB
Python
94 lines
2.7 KiB
Python
"""
|
|
Utilities for instructor unit tests
|
|
"""
|
|
import datetime
|
|
import json
|
|
import random
|
|
from django.utils.timezone import utc
|
|
from util.date_utils import get_default_time_display
|
|
|
|
|
|
class FakeInfo(object):
|
|
"""Parent class for faking objects used in tests"""
|
|
FEATURES = []
|
|
|
|
def __init__(self):
|
|
for feature in self.FEATURES:
|
|
setattr(self, feature, u'expected')
|
|
|
|
def to_dict(self):
|
|
""" Returns a dict representation of the object """
|
|
return {key: getattr(self, key) for key in self.FEATURES}
|
|
|
|
|
|
class FakeContentTask(FakeInfo):
|
|
""" Fake task info needed for email content list """
|
|
FEATURES = [
|
|
'task_input',
|
|
'task_output',
|
|
'requester',
|
|
]
|
|
|
|
def __init__(self, email_id, num_sent, num_failed, sent_to):
|
|
super(FakeContentTask, self).__init__()
|
|
self.task_input = {'email_id': email_id, 'to_option': sent_to}
|
|
self.task_input = json.dumps(self.task_input)
|
|
self.task_output = {'succeeded': num_sent, 'failed': num_failed}
|
|
self.task_output = json.dumps(self.task_output)
|
|
self.requester = 'expected'
|
|
|
|
def make_invalid_input(self):
|
|
"""Corrupt the task input field to test errors"""
|
|
self.task_input = "THIS IS INVALID JSON"
|
|
|
|
|
|
class FakeEmail(FakeInfo):
|
|
""" Corresponding fake email for a fake task """
|
|
FEATURES = [
|
|
'subject',
|
|
'html_message',
|
|
'id',
|
|
'created',
|
|
]
|
|
|
|
def __init__(self, email_id):
|
|
super(FakeEmail, self).__init__()
|
|
self.id = unicode(email_id) # pylint: disable=invalid-name
|
|
# Select a random data for create field
|
|
year = random.choice(range(1950, 2000))
|
|
month = random.choice(range(1, 12))
|
|
day = random.choice(range(1, 28))
|
|
hour = random.choice(range(0, 23))
|
|
minute = random.choice(range(0, 59))
|
|
self.created = datetime.datetime(year, month, day, hour, minute, tzinfo=utc)
|
|
|
|
|
|
class FakeEmailInfo(FakeInfo):
|
|
""" Fake email information object """
|
|
FEATURES = [
|
|
u'created',
|
|
u'sent_to',
|
|
u'email',
|
|
u'number_sent',
|
|
u'requester',
|
|
]
|
|
|
|
EMAIL_FEATURES = [
|
|
u'subject',
|
|
u'html_message',
|
|
u'id'
|
|
]
|
|
|
|
def __init__(self, fake_email, num_sent, num_failed):
|
|
super(FakeEmailInfo, self).__init__()
|
|
self.created = get_default_time_display(fake_email.created)
|
|
|
|
number_sent = str(num_sent) + ' sent'
|
|
if num_failed > 0:
|
|
number_sent += ', ' + str(num_failed) + " failed"
|
|
|
|
self.number_sent = number_sent
|
|
fake_email_dict = fake_email.to_dict()
|
|
self.email = {feature: fake_email_dict[feature] for feature in self.EMAIL_FEATURES}
|
|
self.requester = u'expected'
|