From f47c4f9e8bc3e4d68e85a5e13b7989a4140c45e5 Mon Sep 17 00:00:00 2001
From: Bryan Veloso <bryan@revyver.com>
Date: Mon, 31 Oct 2011 23:23:50 +0900
Subject: [PATCH] Tests now run again.

---
 tests/core/models.py | 14 --------------
 tests/core/specs.py  | 34 ----------------------------------
 tests/core/tests.py  |  6 ++++--
 tests/settings.py    |  9 +++++++++
 4 files changed, 13 insertions(+), 50 deletions(-)
 delete mode 100644 tests/core/specs.py

diff --git a/tests/core/models.py b/tests/core/models.py
index 2f153bd..e69de29 100644
--- a/tests/core/models.py
+++ b/tests/core/models.py
@@ -1,14 +0,0 @@
-from django.db import models
-
-from imagekit.models import ImageModel
-
-
-class TestPhoto(ImageModel):
-    """
-    Minimal ImageModel class for testing.
-
-    """
-    image = models.ImageField(upload_to='images')
-
-    class IKOptions:
-        spec_module = 'core.specs'
diff --git a/tests/core/specs.py b/tests/core/specs.py
deleted file mode 100644
index 503f5ac..0000000
--- a/tests/core/specs.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from imagekit import processors
-from imagekit.specs import ImageSpec
-
-
-class ResizeToWidth(processors.Resize):
-    width = 100
-
-
-class ResizeToHeight(processors.Resize):
-    height = 100
-
-
-class ResizeToFit(processors.Resize):
-    width = 100
-    height = 100
-
-
-class ResizeCropped(ResizeToFit):
-    crop = ('center', 'center')
-
-
-class TestResizeToWidth(ImageSpec):
-    access_as = 'to_width'
-    processors = [ResizeToWidth]
-
-
-class TestResizeToHeight(ImageSpec):
-    access_as = 'to_height'
-    processors = [ResizeToHeight]
-
-
-class TestResizeCropped(ImageSpec):
-    access_as = 'cropped'
-    processors = [ResizeCropped]
diff --git a/tests/core/tests.py b/tests/core/tests.py
index 0591ab1..dd83fce 100644
--- a/tests/core/tests.py
+++ b/tests/core/tests.py
@@ -1,12 +1,14 @@
 import os
 import tempfile
-import Image
+
 from django.core.files.base import ContentFile
 from django.db import models
 from django.test import TestCase
+
+from imagekit.lib import Image
 from imagekit.models import ImageSpec
-from imagekit.processors.resize import Crop
 from imagekit.processors import Adjust
+from imagekit.processors.resize import Crop
 
 
 class Photo(models.Model):
diff --git a/tests/settings.py b/tests/settings.py
index 082adb9..f034e9c 100644
--- a/tests/settings.py
+++ b/tests/settings.py
@@ -8,10 +8,19 @@ BASE_PATH = os.path.abspath(os.path.dirname(__file__))
 
 MEDIA_ROOT = os.path.normpath(os.path.join(BASE_PATH, 'media'))
 
+# Django <= 1.2
 DATABASE_ENGINE = 'sqlite3'
 DATABASE_NAME = 'imagekit.db'
 TEST_DATABASE_NAME = 'imagekit-test.db'
 
+# Django >= 1.3
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': 'imagekit.db',
+    },
+}
+
 INSTALLED_APPS = [
     'django.contrib.auth',
     'django.contrib.contenttypes',