From 971578ca345c3d3bae7fd93b87c41d43483b6f05 Mon Sep 17 00:00:00 2001 From: Andreas Pelme Date: Sun, 2 Mar 2014 12:40:30 +0100 Subject: Support for running the test suite with py.test * Get rid of runtests.py * Moved test code from rest_framework/tests and rest_framework/runtests to tests * Invoke py.test from setup.py * Invoke py.test from Travis * Invoke py.test from tox * Changed setUpClass to be just plain setUp in test_permissions.py * Updated contribution guideline to show how to invoke py.test --- tests/accounts/__init__.py | 0 tests/accounts/models.py | 8 ++++++++ tests/accounts/serializers.py | 11 +++++++++++ 3 files changed, 19 insertions(+) create mode 100644 tests/accounts/__init__.py create mode 100644 tests/accounts/models.py create mode 100644 tests/accounts/serializers.py (limited to 'tests/accounts') diff --git a/tests/accounts/__init__.py b/tests/accounts/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/accounts/models.py b/tests/accounts/models.py new file mode 100644 index 00000000..3bf4a0c3 --- /dev/null +++ b/tests/accounts/models.py @@ -0,0 +1,8 @@ +from django.db import models + +from tests.users.models import User + + +class Account(models.Model): + owner = models.ForeignKey(User, related_name='accounts_owned') + admins = models.ManyToManyField(User, blank=True, null=True, related_name='accounts_administered') diff --git a/tests/accounts/serializers.py b/tests/accounts/serializers.py new file mode 100644 index 00000000..57a91b92 --- /dev/null +++ b/tests/accounts/serializers.py @@ -0,0 +1,11 @@ +from rest_framework import serializers + +from tests.accounts.models import Account +from tests.users.serializers import UserSerializer + + +class AccountSerializer(serializers.ModelSerializer): + admins = UserSerializer(many=True) + + class Meta: + model = Account -- cgit v1.2.3