From 3043cf9efabfb521137a46e147fadc9176a81f23 Mon Sep 17 00:00:00 2001
From: Ben Firshman
Date: Mon, 25 Jan 2010 00:00:12 +0000
Subject: Fixed test case not running

---
 src/shorturls/tests/__init__.py         | 4 ++--
 src/shorturls/tests/test_templatetag.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/shorturls/tests/__init__.py b/src/shorturls/tests/__init__.py
index 6687828..a1c5afe 100644
--- a/src/shorturls/tests/__init__.py
+++ b/src/shorturls/tests/__init__.py
@@ -1,4 +1,4 @@
 from shorturls.tests.models import *
-from shorturls.tests.test_views import *
+from shorturls.tests.test_baseconv import *
 from shorturls.tests.test_templatetag import *
-from shorturls.tests.test_baseconv import *
\ No newline at end of file
+from shorturls.tests.test_views import *
diff --git a/src/shorturls/tests/test_templatetag.py b/src/shorturls/tests/test_templatetag.py
index 2127817..ec91908 100644
--- a/src/shorturls/tests/test_templatetag.py
+++ b/src/shorturls/tests/test_templatetag.py
@@ -3,7 +3,7 @@ from django.conf import settings
 from django.test import TestCase
 from shorturls.tests.models import Animal, Vegetable, Mineral
 
-class RedirectViewTestCase(TestCase):
+class TemplateTagTestCase(TestCase):
     urls = 'shorturls.urls'
     fixtures = ['shorturls-test-data.json']
 
-- 
cgit v1.2.3


From 0451c3f39e3cde5e7921a67975f759b0f2b062a3 Mon Sep 17 00:00:00 2001
From: Mjumbe Wawatu Poe
Date: Thu, 15 Mar 2012 18:17:25 -0400
Subject: Add a config file for Travis (see http://travis-ci.org)

---
 .travis.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..a3c4df7
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,16 @@
+language: python
+python:
+  - "2.5"
+  - "2.6"
+  - "2.7"
+
+env:
+  - DJANGO="Django==1.2"
+  - DJANGO="Django==1.3"
+  - DJANGO="git+git://github.com/django/django.git@master#egg=django==1.4c2"
+
+# command to install dependencies
+install: pip install $DJANGO --use-mirrors
+
+# command to run tests
+script: django-admin.py test --pythonpath=src/shorturls/ --settings=testsettings
-- 
cgit v1.2.3


From 2b6c9226593104583fda8e17654a7d6de6534e41 Mon Sep 17 00:00:00 2001
From: Mjumbe Wawatu Poe
Date: Thu, 15 Mar 2012 18:28:37 -0400
Subject: Add test settings to work in Django 1.4

---
 .travis.yml                   |  2 +-
 src/shorturls/testsettings.py | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a3c4df7..5b3789b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,4 +13,4 @@ env:
 install: pip install $DJANGO --use-mirrors
 
 # command to run tests
-script: django-admin.py test --pythonpath=src/shorturls/ --settings=testsettings
+script: django-admin.py test --pythonpath=src/ --settings=shorturls.testsettings
diff --git a/src/shorturls/testsettings.py b/src/shorturls/testsettings.py
index 2098abf..408ea8b 100644
--- a/src/shorturls/testsettings.py
+++ b/src/shorturls/testsettings.py
@@ -1,8 +1,18 @@
 import os
 
 DEBUG = TEMPLATE_DEBUG = True
+
+# For Pre-Django 1.3
 DATABASE_ENGINE = 'sqlite3'
 DATABASE_NAME = '/tmp/shorturls.db'
+
+# For Django 1.3 and beyond
+DATABASES = {
+  'default': {
+    'ENGINE': 'django.db.backends.sqlite3'
+  }
+}
+
 INSTALLED_APPS = ['shorturls']
 ROOT_URLCONF = ['shorturls.urls']
-TEMPLATE_DIRS = os.path.join(os.path.dirname(__file__), 'tests', 'templates')
\ No newline at end of file
+TEMPLATE_DIRS = os.path.join(os.path.dirname(__file__), 'tests', 'templates')
-- 
cgit v1.2.3


From ab261293772b36296ab6ac7cfa377df43c529697 Mon Sep 17 00:00:00 2001
From: Ben Firshman
Date: Sat, 20 Sep 2014 15:35:13 -0700
Subject: Remove Python 2.5

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

diff --git a/.travis.yml b/.travis.yml
index 5b3789b..5009140 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: python
 python:
-  - "2.5"
   - "2.6"
   - "2.7"
 
-- 
cgit v1.2.3


From a003ada5378e01c00e8f6405dc017f2d1e7376c8 Mon Sep 17 00:00:00 2001
From: Ben Firshman
Date: Sat, 20 Sep 2014 15:35:51 -0700
Subject: Update Django 1.4 version

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

diff --git a/.travis.yml b/.travis.yml
index 5009140..fa25cb8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ python:
 env:
   - DJANGO="Django==1.2"
   - DJANGO="Django==1.3"
-  - DJANGO="git+git://github.com/django/django.git@master#egg=django==1.4c2"
+  - DJANGO="Django==1.4.15"
 
 # command to install dependencies
 install: pip install $DJANGO --use-mirrors
-- 
cgit v1.2.3