From a99f444e96a5593a45e081b0515b4792dc732199 Mon Sep 17 00:00:00 2001
From: Matt Molyneaux <moggers87+git@moggers87.co.uk>
Date: Thu, 5 Jun 2014 00:42:58 +0100
Subject: [PATCH 1/4] Fix missing bits of test

Travis will now grab the newest point releases of Django, including 1.6.5

Also added 'bootstrapform' to test settings to reduce failing tests to actual bugs
---
 .travis.yml  | 7 ++++---
 quicktest.py | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7846c696..e026412e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,10 @@ python:
     - "2.6"
     - "2.7"
 env:
-    - DJANGO=1.4.3
-    - DJANGO=1.3.5
-    - DJANGO=1.5.0
+    - DJANGO=1.3.7
+    - DJANGO=1.4.13
+    - DJANGO=1.5.8
+    - DJANGO=1.6.5
 install:
     - pip install argparse --use-mirrors
     - pip install -q Django==$DJANGO --use-mirrors
diff --git a/quicktest.py b/quicktest.py
index d2d3de81..71b3e86b 100644
--- a/quicktest.py
+++ b/quicktest.py
@@ -22,6 +22,7 @@ class QuickDjangoTest(object):
         'django.contrib.admin',
         'django.contrib.staticfiles',
         'django.contrib.messages',
+        'bootstrapform',
     )
 
     def __init__(self, *args, **kwargs):

From b41eae040db80b2d80f6d4c1aeca03fb7480b54a Mon Sep 17 00:00:00 2001
From: Matt Molyneaux <moggers87+git@moggers87.co.uk>
Date: Thu, 5 Jun 2014 00:49:57 +0100
Subject: [PATCH 2/4] Remove --use-mirrors

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e026412e..cd12cfdd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,6 @@ env:
     - DJANGO=1.5.8
     - DJANGO=1.6.5
 install:
-    - pip install argparse --use-mirrors
-    - pip install -q Django==$DJANGO --use-mirrors
+    - pip install argparse
+    - pip install -q Django==$DJANGO
 script: python quicktest.py helpdesk

From 8b2489d87d235b4675c7d4005854c5b45db96a90 Mon Sep 17 00:00:00 2001
From: Matt Molyneaux <moggers87+git@moggers87.co.uk>
Date: Thu, 5 Jun 2014 00:54:03 +0100
Subject: [PATCH 3/4] Grab requirements.txt for tests and remove Django 1.3
 testing (requirements.txt asks for Django>1.4)

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cd12cfdd..abe9a0d8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,11 +3,11 @@ python:
     - "2.6"
     - "2.7"
 env:
-    - DJANGO=1.3.7
     - DJANGO=1.4.13
     - DJANGO=1.5.8
     - DJANGO=1.6.5
 install:
     - pip install argparse
     - pip install -q Django==$DJANGO
+    - pip install -q -r requirements.txt
 script: python quicktest.py helpdesk

From 28c3690da7f6262a430b32433d5a766504f43af1 Mon Sep 17 00:00:00 2001
From: Matt Molyneaux <moggers87+git@moggers87.co.uk>
Date: Thu, 5 Jun 2014 01:19:46 +0100
Subject: [PATCH 4/4] Give CustomField.empty_selection_list a default value

BooleanField defaults to False <1.6 and to None >=1.6, causing tests to fail on 1.6
---
 helpdesk/models.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/helpdesk/models.py b/helpdesk/models.py
index bb0643e0..e0c8e6c8 100644
--- a/helpdesk/models.py
+++ b/helpdesk/models.py
@@ -1194,6 +1194,7 @@ class CustomField(models.Model):
         
     empty_selection_list = models.BooleanField(
         _('Add empty first choice to List?'),
+        default=False,
         help_text=_('Only for List: adds an empty first entry to the choices list, which enforces that the user makes an active choice.'),
         )