summaryrefslogtreecommitdiff
path: root/tests/model_forms/models.py
diff options
context:
space:
mode:
authorFlorian Apolloner <florian@apolloner.eu>2013-03-13 23:25:26 +0100
committerFlorian Apolloner <florian@apolloner.eu>2013-03-13 23:25:26 +0100
commit22b7870e40a3ecf022b423de6cd867dcb35a6940 (patch)
tree4c9930270b83bebf3947ca00166462022024c4f2 /tests/model_forms/models.py
parent1059da8de675442e84381d6366c0be254681753e (diff)
downloaddjango-22b7870e40a3ecf022b423de6cd867dcb35a6940.tar.gz
Began implementing a shared set of test models to speed up tests.
Diffstat (limited to 'tests/model_forms/models.py')
-rw-r--r--tests/model_forms/models.py27
1 files changed, 5 insertions, 22 deletions
diff --git a/tests/model_forms/models.py b/tests/model_forms/models.py
index 383a10584b..25c780f1c2 100644
--- a/tests/model_forms/models.py
+++ b/tests/model_forms/models.py
@@ -16,6 +16,7 @@ from django.db import models
from django.utils import six
from django.utils.encoding import python_2_unicode_compatible
+from shared_models.models import Author, Book
temp_storage_dir = tempfile.mkdtemp(dir=os.environ['DJANGO_TEST_TEMP_DIR'])
temp_storage = FileSystemStorage(temp_storage_dir)
@@ -45,22 +46,12 @@ class Category(models.Model):
return self.__str__()
@python_2_unicode_compatible
-class Writer(models.Model):
- name = models.CharField(max_length=50, help_text='Use both first and last names.')
-
- class Meta:
- ordering = ('name',)
-
- def __str__(self):
- return self.name
-
-@python_2_unicode_compatible
class Article(models.Model):
headline = models.CharField(max_length=50)
slug = models.SlugField()
pub_date = models.DateField()
created = models.DateField(editable=False)
- writer = models.ForeignKey(Writer)
+ writer = models.ForeignKey(Author)
article = models.TextField()
categories = models.ManyToManyField(Category, blank=True)
status = models.PositiveIntegerField(choices=ARTICLE_STATUS, blank=True, null=True)
@@ -80,12 +71,12 @@ class ImprovedArticle(models.Model):
class ImprovedArticleWithParentLink(models.Model):
article = models.OneToOneField(Article, parent_link=True)
-class BetterWriter(Writer):
+class BetterAuthor(Author):
score = models.IntegerField()
@python_2_unicode_compatible
-class WriterProfile(models.Model):
- writer = models.OneToOneField(Writer, primary_key=True)
+class AuthorProfile(models.Model):
+ writer = models.OneToOneField(Author, primary_key=True)
age = models.PositiveIntegerField()
def __str__(self):
@@ -192,14 +183,6 @@ class Inventory(models.Model):
def __repr__(self):
return self.__str__()
-class Book(models.Model):
- title = models.CharField(max_length=40)
- author = models.ForeignKey(Writer, blank=True, null=True)
- special_id = models.IntegerField(blank=True, null=True, unique=True)
-
- class Meta:
- unique_together = ('title', 'author')
-
class BookXtra(models.Model):
isbn = models.CharField(max_length=16, unique=True)
suffix1 = models.IntegerField(blank=True, default=0)