Merge branch 'refs/heads/dev'

Conflicts:
	dev_requirements.txt

dev_requirements.txt

@@ -1,9 +1,10 @@
 -r requirements.txt
 coverage
-svn+http://code.djangoproject.com/svn/django/trunk#egg=django
+django-fixture-generator
 mock
-tox
 nose
-versiontools
 south
-Sphinx
+Sphinx
+svn+http://code.djangoproject.com/svn/django/trunk#egg=django
+tox
+versiontools

tests/settings.py

@@ -120,8 +120,9 @@
     'django.contrib.admin',
     'django.contrib.admindocs',
     'consent',
-    'test_consent',
+    'fixture_generator',
     'south',
+    'test_consent',
 )
 
 # A sample logging configuration. The only tangible logging

tests/test_consent/fixture_gen.py

@@ -0,0 +1,48 @@
+from datetime import datetime
+
+from django.contrib.auth.models import User
+from fixture_generator import fixture_generator
+
+from consent.models import Consent, Privilege
+
+
+@fixture_generator(User)
+def test_users():
+    User.objects.create(username="john")
+    User.objects.create(username="smith")
+
+
+@fixture_generator(Privilege)
+def test_privileges():
+    Privilege.objects.create(name="Email Newsletter", description="""
+    Send a bi-monthly news letter to the user.
+    """)
+    Privilege.objects.create(name="Marketing Emails", description="""
+    Allow us to give your email address to third party spammers.
+    """)
+    Privilege.objects.create(name="Post to Facebook", description="""
+    Send an update to Facebook when you upload a new picture.
+    """)
+    Privilege.objects.create(name="Post to Twitter", description="""
+    Send an update to Twitter when you upload a new picture.
+    """)
+
+
+@fixture_generator(Consent, requires=['test_consent.test_privileges', ])
+def test_consents():
+
+    newsletter, marketing, facebook, twitter = Privilege.objects.order_by('name')
+
+    smith, john = User.objects.order_by('username')
+
+    Consent.objects.create(user=smith, privilege=newsletter)
+    Consent.objects.create(user=smith, privilege=marketing,
+        granred_on=datetime(2011, 11, 01), revoked_on=datetime(2011, 11, 01),
+        revoked=True)
+    Consent.objects.create(user=smith, privilege=facebook)
+
+    Consent.objects.create(user=john, privilege=newsletter,
+        granred_on=datetime(2011, 10, 01), revoked_on=datetime(2011, 10, 01),
+        revoked=True)
+    Consent.objects.create(user=john, privilege=marketing)
+    Consent.objects.create(user=john, privilege=facebook)

tests/test_consent/fixtures/consent.json

@@ -0,0 +1 @@
+[{"pk": 1, "model": "consent.privilege", "fields": {"name": "Email Marketing", "description": "Permission to sent emails from marketing partners."}}, {"pk": 3, "model": "consent.privilege", "fields": {"name": "Post to Facebook", "description": "fg"}}, {"pk": 2, "model": "consent.privilege", "fields": {"name": "Post to Twitter", "description": "Permission to post updates to your twitter."}}, {"pk": 1, "model": "consent.consent", "fields": {"privilege": 1, "granted_on": "2011-12-10T04:39:38", "revoked": true, "user": 1, "revoked_on": "2011-12-10T06:37:59.477"}}, {"pk": 2, "model": "consent.consent", "fields": {"privilege": 2, "granted_on": "2011-12-10T04:39:46", "revoked": true, "user": 1, "revoked_on": "2011-12-10T06:37:59.477"}}, {"pk": 3, "model": "consent.consent", "fields": {"privilege": 3, "granted_on": "2011-12-10T06:22:55.452", "revoked": false, "user": 1, "revoked_on": null}}]

tests/test_consent/fixtures/users.json

@@ -0,0 +1 @@
+[{"pk": 22, "model": "auth.permission", "fields": {"codename": "add_logentry", "name": "Can add log entry", "content_type": 8}}, {"pk": 23, "model": "auth.permission", "fields": {"codename": "change_logentry", "name": "Can change log entry", "content_type": 8}}, {"pk": 24, "model": "auth.permission", "fields": {"codename": "delete_logentry", "name": "Can delete log entry", "content_type": 8}}, {"pk": 4, "model": "auth.permission", "fields": {"codename": "add_group", "name": "Can add group", "content_type": 2}}, {"pk": 5, "model": "auth.permission", "fields": {"codename": "change_group", "name": "Can change group", "content_type": 2}}, {"pk": 6, "model": "auth.permission", "fields": {"codename": "delete_group", "name": "Can delete group", "content_type": 2}}, {"pk": 10, "model": "auth.permission", "fields": {"codename": "add_message", "name": "Can add message", "content_type": 4}}, {"pk": 11, "model": "auth.permission", "fields": {"codename": "change_message", "name": "Can change message", "content_type": 4}}, {"pk": 12, "model": "auth.permission", "fields": {"codename": "delete_message", "name": "Can delete message", "content_type": 4}}, {"pk": 1, "model": "auth.permission", "fields": {"codename": "add_permission", "name": "Can add permission", "content_type": 1}}, {"pk": 2, "model": "auth.permission", "fields": {"codename": "change_permission", "name": "Can change permission", "content_type": 1}}, {"pk": 3, "model": "auth.permission", "fields": {"codename": "delete_permission", "name": "Can delete permission", "content_type": 1}}, {"pk": 7, "model": "auth.permission", "fields": {"codename": "add_user", "name": "Can add user", "content_type": 3}}, {"pk": 8, "model": "auth.permission", "fields": {"codename": "change_user", "name": "Can change user", "content_type": 3}}, {"pk": 9, "model": "auth.permission", "fields": {"codename": "delete_user", "name": "Can delete user", "content_type": 3}}, {"pk": 31, "model": "auth.permission", "fields": {"codename": "add_consent", "name": "Can add consent", "content_type": 11}}, {"pk": 32, "model": "auth.permission", "fields": {"codename": "change_consent", "name": "Can change consent", "content_type": 11}}, {"pk": 33, "model": "auth.permission", "fields": {"codename": "delete_consent", "name": "Can delete consent", "content_type": 11}}, {"pk": 28, "model": "auth.permission", "fields": {"codename": "add_privilege", "name": "Can add privilege", "content_type": 10}}, {"pk": 29, "model": "auth.permission", "fields": {"codename": "change_privilege", "name": "Can change privilege", "content_type": 10}}, {"pk": 30, "model": "auth.permission", "fields": {"codename": "delete_privilege", "name": "Can delete privilege", "content_type": 10}}, {"pk": 13, "model": "auth.permission", "fields": {"codename": "add_contenttype", "name": "Can add content type", "content_type": 5}}, {"pk": 14, "model": "auth.permission", "fields": {"codename": "change_contenttype", "name": "Can change content type", "content_type": 5}}, {"pk": 15, "model": "auth.permission", "fields": {"codename": "delete_contenttype", "name": "Can delete content type", "content_type": 5}}, {"pk": 16, "model": "auth.permission", "fields": {"codename": "add_session", "name": "Can add session", "content_type": 6}}, {"pk": 17, "model": "auth.permission", "fields": {"codename": "change_session", "name": "Can change session", "content_type": 6}}, {"pk": 18, "model": "auth.permission", "fields": {"codename": "delete_session", "name": "Can delete session", "content_type": 6}}, {"pk": 19, "model": "auth.permission", "fields": {"codename": "add_site", "name": "Can add site", "content_type": 7}}, {"pk": 20, "model": "auth.permission", "fields": {"codename": "change_site", "name": "Can change site", "content_type": 7}}, {"pk": 21, "model": "auth.permission", "fields": {"codename": "delete_site", "name": "Can delete site", "content_type": 7}}, {"pk": 25, "model": "auth.permission", "fields": {"codename": "add_migrationhistory", "name": "Can add migration history", "content_type": 9}}, {"pk": 26, "model": "auth.permission", "fields": {"codename": "change_migrationhistory", "name": "Can change migration history", "content_type": 9}}, {"pk": 27, "model": "auth.permission", "fields": {"codename": "delete_migrationhistory", "name": "Can delete migration history", "content_type": 9}}, {"pk": 1, "model": "auth.user", "fields": {"username": "admin", "first_name": "", "last_name": "", "is_active": true, "is_superuser": true, "is_staff": true, "last_login": "2011-12-10T04:38:25.771", "groups": [], "user_permissions": [], "password": "sha1$e765b$5c55a0e03cb493b82f859aa0a69fc5434dbff5dc", "email": "test@example.com", "date_joined": "2011-12-09T16:12:06.507"}}]