extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-05-21 18:00:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #442 from reduxionist/pr/420-merge-corrections

Browse Source 
cleanup build-breaking whitespace merge errors
This commit is contained in:
Jonathan Barratt 2016-10-29 15:04:39 +07:00 committed by GitHub
commit cbbad8d370
3 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
helpdesk/management/commands/get_email.py
View File

@ -61,17 +61,6 @@ class Command(BaseCommand):
def __init__(self): def __init__(self):
BaseCommand.__init__(self) BaseCommand.__init__(self)
# Django 1.7 uses different way to specify options than 1.8+
if VERSION < (1, 8):
self.option_list += (
make_option(
'--quiet',
default=False,
action='store_true',
dest='quiet',
help='Hide details about each queue/message as they are processed'),
)
help = 'Process django-helpdesk queues and process e-mails via POP3/IMAP or ' \ help = 'Process django-helpdesk queues and process e-mails via POP3/IMAP or ' \
'from a local mailbox directory as required, feeding them into the helpdesk.' 'from a local mailbox directory as required, feeding them into the helpdesk.'

6
helpdesk/tests/test_get_email.py
View File

@ -20,8 +20,9 @@ except ImportError:
# Python < 3.3 # Python < 3.3
import mock import mock
class GetEmailTestCase(TestCase): class GetEmailTestCase(TestCase):
#fixtures = ['emailtemplate.json'] # may don't need this, not testing templates here # fixtures = ['emailtemplate.json'] # may not need this, not testing templates here
def setUp(self): def setUp(self):
self.queue_public = Queue.objects.create(title='Queue 1', slug='QQ', allow_public_submission=True, allow_email_submission=True, email_box_type='local', email_box_local_dir='/var/lib/mail/helpdesk/') self.queue_public = Queue.objects.create(title='Queue 1', slug='QQ', allow_public_submission=True, allow_email_submission=True, email_box_type='local', email_box_local_dir='/var/lib/mail/helpdesk/')
@ -56,6 +57,3 @@ class GetEmailTestCase(TestCase):
ticket2 = get_object_or_404(Ticket, pk=2) ticket2 = get_object_or_404(Ticket, pk=2)
self.assertEqual(ticket2.ticket_for_url, "QQ-%s" % ticket2.id) self.assertEqual(ticket2.ticket_for_url, "QQ-%s" % ticket2.id)
self.assertEqual(ticket2.description, "This is the helpdesk comment via email.") self.assertEqual(ticket2.description, "This is the helpdesk comment via email.")