From 371a26c62c2285e49f2e57207cdb6d7bf012141d Mon Sep 17 00:00:00 2001 From: Robert Kolner Date: Wed, 17 Apr 2013 21:53:15 +0200 Subject: [PATCH] Removed fixtures. Who needs them anyway? --- dusken/main/api/membersbygroup.py | 4 +- dusken/main/fixtures/testdata.json | 1118 --------------------------- dusken/main/models.py | 6 - dusken/main/tests/__init__.py | 1 + dusken/main/tests/member.py | 11 +- dusken/main/tests/membersbygroup.py | 28 + 6 files changed, 36 insertions(+), 1132 deletions(-) delete mode 100644 dusken/main/fixtures/testdata.json create mode 100644 dusken/main/tests/membersbygroup.py diff --git a/dusken/main/api/membersbygroup.py b/dusken/main/api/membersbygroup.py index baf8d1d..ae06e3a 100644 --- a/dusken/main/api/membersbygroup.py +++ b/dusken/main/api/membersbygroup.py @@ -56,9 +56,7 @@ class MembersByGroupResource(Resource): return obj def obj_create(self, request=None, **kwargs): - group = Group.objects.get(id=group_id) - member = Member.objects.get(id=user_id) - group.user_set.add(member) + pass # TODO def obj_update(self, bundle, request=None, **kwargs): pass # We can't update. diff --git a/dusken/main/fixtures/testdata.json b/dusken/main/fixtures/testdata.json deleted file mode 100644 index 66b8291..0000000 --- a/dusken/main/fixtures/testdata.json +++ /dev/null @@ -1,1118 +0,0 @@ -[ - { - "fields": { - "app_label": "auth", - "model": "permission", - "name": "permission" - }, - "model": "contenttypes.contenttype", - "pk": 1 - }, - { - "fields": { - "app_label": "auth", - "model": "group", - "name": "group" - }, - "model": "contenttypes.contenttype", - "pk": 2 - }, - { - "fields": { - "app_label": "auth", - "model": "user", - "name": "user" - }, - "model": "contenttypes.contenttype", - "pk": 3 - }, - { - "fields": { - "app_label": "contenttypes", - "model": "contenttype", - "name": "content type" - }, - "model": "contenttypes.contenttype", - "pk": 4 - }, - { - "fields": { - "app_label": "sessions", - "model": "session", - "name": "session" - }, - "model": "contenttypes.contenttype", - "pk": 5 - }, - { - "fields": { - "app_label": "sites", - "model": "site", - "name": "site" - }, - "model": "contenttypes.contenttype", - "pk": 6 - }, - { - "fields": { - "app_label": "admin", - "model": "logentry", - "name": "log entry" - }, - "model": "contenttypes.contenttype", - "pk": 7 - }, - { - "fields": { - "app_label": "main", - "model": "country", - "name": "country" - }, - "model": "contenttypes.contenttype", - "pk": 8 - }, - { - "fields": { - "app_label": "main", - "model": "address", - "name": "address" - }, - "model": "contenttypes.contenttype", - "pk": 9 - }, - { - "fields": { - "app_label": "main", - "model": "institution", - "name": "institution" - }, - "model": "contenttypes.contenttype", - "pk": 10 - }, - { - "fields": { - "app_label": "main", - "model": "placeofstudy", - "name": "place of study" - }, - "model": "contenttypes.contenttype", - "pk": 11 - }, - { - "fields": { - "app_label": "main", - "model": "member", - "name": "user" - }, - "model": "contenttypes.contenttype", - "pk": 12 - }, - { - "fields": { - "app_label": "main", - "model": "facebookauth", - "name": "facebook auth" - }, - "model": "contenttypes.contenttype", - "pk": 13 - }, - { - "fields": { - "app_label": "main", - "model": "googleauth", - "name": "google auth" - }, - "model": "contenttypes.contenttype", - "pk": 14 - }, - { - "fields": { - "app_label": "main", - "model": "extendedmemberdetail", - "name": "extended member detail" - }, - "model": "contenttypes.contenttype", - "pk": 15 - }, - { - "fields": { - "app_label": "main", - "model": "paymentformembership", - "name": "payment for membership" - }, - "model": "contenttypes.contenttype", - "pk": 16 - }, - { - "fields": { - "app_label": "main", - "model": "membershiptype", - "name": "membership type" - }, - "model": "contenttypes.contenttype", - "pk": 17 - }, - { - "fields": { - "app_label": "main", - "model": "membership", - "name": "membership" - }, - "model": "contenttypes.contenttype", - "pk": 18 - }, - { - "fields": { - "app_label": "main", - "model": "group", - "name": "group" - }, - "model": "contenttypes.contenttype", - "pk": 19 - }, - { - "fields": { - "app_label": "main", - "model": "groupmembership", - "name": "group membership" - }, - "model": "contenttypes.contenttype", - "pk": 20 - }, - { - "fields": { - "app_label": "tastypie", - "model": "apiaccess", - "name": "api access" - }, - "model": "contenttypes.contenttype", - "pk": 21 - }, - { - "fields": { - "app_label": "tastypie", - "model": "apikey", - "name": "api key" - }, - "model": "contenttypes.contenttype", - "pk": 22 - }, - { - "fields": { - "domain": "example.com", - "name": "example.com" - }, - "model": "sites.site", - "pk": 1 - }, - { - "fields": { - "created": "2013-03-21T13:37:54Z", - "duration_months": 12, - "end_day_of_month": 1, - "end_month": 8, - "name": "Medlem av DNS", - "updated": "2013-03-21T13:37:54Z" - }, - "model": "main.membershiptype", - "pk": 1 - }, - { - "fields": { - "codename": "add_permission", - "content_type": [ - "auth", - "permission" - ], - "name": "Can add permission" - }, - "model": "auth.permission", - "pk": 1 - }, - { - "fields": { - "codename": "change_permission", - "content_type": [ - "auth", - "permission" - ], - "name": "Can change permission" - }, - "model": "auth.permission", - "pk": 2 - }, - { - "fields": { - "codename": "delete_permission", - "content_type": [ - "auth", - "permission" - ], - "name": "Can delete permission" - }, - "model": "auth.permission", - "pk": 3 - }, - { - "fields": { - "codename": "add_group", - "content_type": [ - "auth", - "group" - ], - "name": "Can add group" - }, - "model": "auth.permission", - "pk": 4 - }, - { - "fields": { - "codename": "change_group", - "content_type": [ - "auth", - "group" - ], - "name": "Can change group" - }, - "model": "auth.permission", - "pk": 5 - }, - { - "fields": { - "codename": "delete_group", - "content_type": [ - "auth", - "group" - ], - "name": "Can delete group" - }, - "model": "auth.permission", - "pk": 6 - }, - { - "fields": { - "codename": "add_user", - "content_type": [ - "auth", - "user" - ], - "name": "Can add user" - }, - "model": "auth.permission", - "pk": 7 - }, - { - "fields": { - "codename": "change_user", - "content_type": [ - "auth", - "user" - ], - "name": "Can change user" - }, - "model": "auth.permission", - "pk": 8 - }, - { - "fields": { - "codename": "delete_user", - "content_type": [ - "auth", - "user" - ], - "name": "Can delete user" - }, - "model": "auth.permission", - "pk": 9 - }, - { - "fields": { - "codename": "add_contenttype", - "content_type": [ - "contenttypes", - "contenttype" - ], - "name": "Can add content type" - }, - "model": "auth.permission", - "pk": 10 - }, - { - "fields": { - "codename": "change_contenttype", - "content_type": [ - "contenttypes", - "contenttype" - ], - "name": "Can change content type" - }, - "model": "auth.permission", - "pk": 11 - }, - { - "fields": { - "codename": "delete_contenttype", - "content_type": [ - "contenttypes", - "contenttype" - ], - "name": "Can delete content type" - }, - "model": "auth.permission", - "pk": 12 - }, - { - "fields": { - "codename": "add_session", - "content_type": [ - "sessions", - "session" - ], - "name": "Can add session" - }, - "model": "auth.permission", - "pk": 13 - }, - { - "fields": { - "codename": "change_session", - "content_type": [ - "sessions", - "session" - ], - "name": "Can change session" - }, - "model": "auth.permission", - "pk": 14 - }, - { - "fields": { - "codename": "delete_session", - "content_type": [ - "sessions", - "session" - ], - "name": "Can delete session" - }, - "model": "auth.permission", - "pk": 15 - }, - { - "fields": { - "codename": "add_site", - "content_type": [ - "sites", - "site" - ], - "name": "Can add site" - }, - "model": "auth.permission", - "pk": 16 - }, - { - "fields": { - "codename": "change_site", - "content_type": [ - "sites", - "site" - ], - "name": "Can change site" - }, - "model": "auth.permission", - "pk": 17 - }, - { - "fields": { - "codename": "delete_site", - "content_type": [ - "sites", - "site" - ], - "name": "Can delete site" - }, - "model": "auth.permission", - "pk": 18 - }, - { - "fields": { - "codename": "add_logentry", - "content_type": [ - "admin", - "logentry" - ], - "name": "Can add log entry" - }, - "model": "auth.permission", - "pk": 19 - }, - { - "fields": { - "codename": "change_logentry", - "content_type": [ - "admin", - "logentry" - ], - "name": "Can change log entry" - }, - "model": "auth.permission", - "pk": 20 - }, - { - "fields": { - "codename": "delete_logentry", - "content_type": [ - "admin", - "logentry" - ], - "name": "Can delete log entry" - }, - "model": "auth.permission", - "pk": 21 - }, - { - "fields": { - "codename": "add_country", - "content_type": [ - "main", - "country" - ], - "name": "Can add country" - }, - "model": "auth.permission", - "pk": 22 - }, - { - "fields": { - "codename": "change_country", - "content_type": [ - "main", - "country" - ], - "name": "Can change country" - }, - "model": "auth.permission", - "pk": 23 - }, - { - "fields": { - "codename": "delete_country", - "content_type": [ - "main", - "country" - ], - "name": "Can delete country" - }, - "model": "auth.permission", - "pk": 24 - }, - { - "fields": { - "codename": "add_address", - "content_type": [ - "main", - "address" - ], - "name": "Can add address" - }, - "model": "auth.permission", - "pk": 25 - }, - { - "fields": { - "codename": "change_address", - "content_type": [ - "main", - "address" - ], - "name": "Can change address" - }, - "model": "auth.permission", - "pk": 26 - }, - { - "fields": { - "codename": "delete_address", - "content_type": [ - "main", - "address" - ], - "name": "Can delete address" - }, - "model": "auth.permission", - "pk": 27 - }, - { - "fields": { - "codename": "add_institution", - "content_type": [ - "main", - "institution" - ], - "name": "Can add institution" - }, - "model": "auth.permission", - "pk": 28 - }, - { - "fields": { - "codename": "change_institution", - "content_type": [ - "main", - "institution" - ], - "name": "Can change institution" - }, - "model": "auth.permission", - "pk": 29 - }, - { - "fields": { - "codename": "delete_institution", - "content_type": [ - "main", - "institution" - ], - "name": "Can delete institution" - }, - "model": "auth.permission", - "pk": 30 - }, - { - "fields": { - "codename": "add_placeofstudy", - "content_type": [ - "main", - "placeofstudy" - ], - "name": "Can add place of study" - }, - "model": "auth.permission", - "pk": 31 - }, - { - "fields": { - "codename": "change_placeofstudy", - "content_type": [ - "main", - "placeofstudy" - ], - "name": "Can change place of study" - }, - "model": "auth.permission", - "pk": 32 - }, - { - "fields": { - "codename": "delete_placeofstudy", - "content_type": [ - "main", - "placeofstudy" - ], - "name": "Can delete place of study" - }, - "model": "auth.permission", - "pk": 33 - }, - { - "fields": { - "codename": "add_member", - "content_type": [ - "main", - "member" - ], - "name": "Can add user" - }, - "model": "auth.permission", - "pk": 34 - }, - { - "fields": { - "codename": "change_member", - "content_type": [ - "main", - "member" - ], - "name": "Can change user" - }, - "model": "auth.permission", - "pk": 35 - }, - { - "fields": { - "codename": "delete_member", - "content_type": [ - "main", - "member" - ], - "name": "Can delete user" - }, - "model": "auth.permission", - "pk": 36 - }, - { - "fields": { - "codename": "add_facebookauth", - "content_type": [ - "main", - "facebookauth" - ], - "name": "Can add facebook auth" - }, - "model": "auth.permission", - "pk": 37 - }, - { - "fields": { - "codename": "change_facebookauth", - "content_type": [ - "main", - "facebookauth" - ], - "name": "Can change facebook auth" - }, - "model": "auth.permission", - "pk": 38 - }, - { - "fields": { - "codename": "delete_facebookauth", - "content_type": [ - "main", - "facebookauth" - ], - "name": "Can delete facebook auth" - }, - "model": "auth.permission", - "pk": 39 - }, - { - "fields": { - "codename": "add_googleauth", - "content_type": [ - "main", - "googleauth" - ], - "name": "Can add google auth" - }, - "model": "auth.permission", - "pk": 40 - }, - { - "fields": { - "codename": "change_googleauth", - "content_type": [ - "main", - "googleauth" - ], - "name": "Can change google auth" - }, - "model": "auth.permission", - "pk": 41 - }, - { - "fields": { - "codename": "delete_googleauth", - "content_type": [ - "main", - "googleauth" - ], - "name": "Can delete google auth" - }, - "model": "auth.permission", - "pk": 42 - }, - { - "fields": { - "codename": "add_extendedmemberdetail", - "content_type": [ - "main", - "extendedmemberdetail" - ], - "name": "Can add extended member detail" - }, - "model": "auth.permission", - "pk": 43 - }, - { - "fields": { - "codename": "change_extendedmemberdetail", - "content_type": [ - "main", - "extendedmemberdetail" - ], - "name": "Can change extended member detail" - }, - "model": "auth.permission", - "pk": 44 - }, - { - "fields": { - "codename": "delete_extendedmemberdetail", - "content_type": [ - "main", - "extendedmemberdetail" - ], - "name": "Can delete extended member detail" - }, - "model": "auth.permission", - "pk": 45 - }, - { - "fields": { - "codename": "add_paymentformembership", - "content_type": [ - "main", - "paymentformembership" - ], - "name": "Can add payment for membership" - }, - "model": "auth.permission", - "pk": 46 - }, - { - "fields": { - "codename": "change_paymentformembership", - "content_type": [ - "main", - "paymentformembership" - ], - "name": "Can change payment for membership" - }, - "model": "auth.permission", - "pk": 47 - }, - { - "fields": { - "codename": "delete_paymentformembership", - "content_type": [ - "main", - "paymentformembership" - ], - "name": "Can delete payment for membership" - }, - "model": "auth.permission", - "pk": 48 - }, - { - "fields": { - "codename": "add_membershiptype", - "content_type": [ - "main", - "membershiptype" - ], - "name": "Can add membership type" - }, - "model": "auth.permission", - "pk": 49 - }, - { - "fields": { - "codename": "change_membershiptype", - "content_type": [ - "main", - "membershiptype" - ], - "name": "Can change membership type" - }, - "model": "auth.permission", - "pk": 50 - }, - { - "fields": { - "codename": "delete_membershiptype", - "content_type": [ - "main", - "membershiptype" - ], - "name": "Can delete membership type" - }, - "model": "auth.permission", - "pk": 51 - }, - { - "fields": { - "codename": "add_membership", - "content_type": [ - "main", - "membership" - ], - "name": "Can add membership" - }, - "model": "auth.permission", - "pk": 52 - }, - { - "fields": { - "codename": "change_membership", - "content_type": [ - "main", - "membership" - ], - "name": "Can change membership" - }, - "model": "auth.permission", - "pk": 53 - }, - { - "fields": { - "codename": "delete_membership", - "content_type": [ - "main", - "membership" - ], - "name": "Can delete membership" - }, - "model": "auth.permission", - "pk": 54 - }, - { - "fields": { - "codename": "add_group", - "content_type": [ - "main", - "group" - ], - "name": "Can add group" - }, - "model": "auth.permission", - "pk": 55 - }, - { - "fields": { - "codename": "change_group", - "content_type": [ - "main", - "group" - ], - "name": "Can change group" - }, - "model": "auth.permission", - "pk": 56 - }, - { - "fields": { - "codename": "delete_group", - "content_type": [ - "main", - "group" - ], - "name": "Can delete group" - }, - "model": "auth.permission", - "pk": 57 - }, - { - "fields": { - "codename": "add_groupmembership", - "content_type": [ - "main", - "groupmembership" - ], - "name": "Can add group membership" - }, - "model": "auth.permission", - "pk": 58 - }, - { - "fields": { - "codename": "change_groupmembership", - "content_type": [ - "main", - "groupmembership" - ], - "name": "Can change group membership" - }, - "model": "auth.permission", - "pk": 59 - }, - { - "fields": { - "codename": "delete_groupmembership", - "content_type": [ - "main", - "groupmembership" - ], - "name": "Can delete group membership" - }, - "model": "auth.permission", - "pk": 60 - }, - { - "fields": { - "codename": "add_apiaccess", - "content_type": [ - "tastypie", - "apiaccess" - ], - "name": "Can add api access" - }, - "model": "auth.permission", - "pk": 61 - }, - { - "fields": { - "codename": "change_apiaccess", - "content_type": [ - "tastypie", - "apiaccess" - ], - "name": "Can change api access" - }, - "model": "auth.permission", - "pk": 62 - }, - { - "fields": { - "codename": "delete_apiaccess", - "content_type": [ - "tastypie", - "apiaccess" - ], - "name": "Can delete api access" - }, - "model": "auth.permission", - "pk": 63 - }, - { - "fields": { - "codename": "add_apikey", - "content_type": [ - "tastypie", - "apikey" - ], - "name": "Can add api key" - }, - "model": "auth.permission", - "pk": 64 - }, - { - "fields": { - "codename": "change_apikey", - "content_type": [ - "tastypie", - "apikey" - ], - "name": "Can change api key" - }, - "model": "auth.permission", - "pk": 65 - }, - { - "fields": { - "codename": "delete_apikey", - "content_type": [ - "tastypie", - "apikey" - ], - "name": "Can delete api key" - }, - "model": "auth.permission", - "pk": 66 - }, - { - "fields": { - "name": "KAK: EDB", - "permissions": [] - }, - "model": "auth.group", - "pk": 1 - }, - { - "fields": { - "date_joined": "2013-03-21T12:36:31Z", - "email": "robert.kolner@gmail.com", - "first_name": "Robert", - "groups": [ - [ - "KAK: EDB" - ] - ], - "is_active": true, - "is_staff": false, - "is_superuser": false, - "last_login": "2013-03-21T12:36:31Z", - "last_name": "Kolner", - "password": "", - "user_permissions": [], - "username": "robert" - }, - "model": "auth.user", - "pk": 1 - }, - { - "fields": { - "date_joined": "2013-03-21T12:36:31Z", - "email": "", - "first_name": "", - "groups": [], - "is_active": true, - "is_staff": false, - "is_superuser": false, - "last_login": "2013-03-21T12:36:31Z", - "last_name": "", - "password": "", - "user_permissions": [], - "username": "testersen" - }, - "model": "auth.user", - "pk": 2 - }, - { - "fields": { - "address": null, - "created": "2013-03-21T12:36:31Z", - "date_of_birth": null, - "groups": [ - [ - "KAK: EDB" - ] - ], - "legacy_id": null, - "phone_number": 90567268, - "place_of_study": [], - "updated": "2013-03-21T12:36:31Z", - "user_permissions": [] - }, - "model": "main.member", - "pk": 1 - }, - { - "fields": { - "address": null, - "created": "2013-03-21T12:36:31Z", - "date_of_birth": null, - "groups": [], - "legacy_id": null, - "phone_number": null, - "place_of_study": [], - "updated": "2013-03-21T12:36:31Z", - "user_permissions": [] - }, - "model": "main.member", - "pk": 2 - }, - { - "fields": { - "created": "2013-03-21T13:38:08Z", - "member": [ - "robert" - ], - "mtype": 1, - "payment": null, - "start_date": "2013-01-01", - "updated": "2013-03-21T13:38:08Z" - }, - "model": "main.membership", - "pk": 1 - }, - { - "fields": { - "created": "2013-03-21T13:37:18Z", - "permissions": [], - "posix_name": "edb", - "updated": "2013-03-21T13:37:18Z" - }, - "model": "main.group", - "pk": 1 - } -] diff --git a/dusken/main/models.py b/dusken/main/models.py index d00c8a1..dee0f1d 100644 --- a/dusken/main/models.py +++ b/dusken/main/models.py @@ -104,9 +104,3 @@ class Group(django.contrib.auth.models.Group): created = models.DateTimeField(auto_now_add=True) updated = models.DateTimeField(auto_now=True) -class GroupMembership(models.Model): - start_date = models.DateField() - member = models.ForeignKey(Member) - group = models.ForeignKey(Group) - created = models.DateTimeField(auto_now_add=True) - updated = models.DateTimeField(auto_now=True) diff --git a/dusken/main/tests/__init__.py b/dusken/main/tests/__init__.py index 2eadad9..3d6c5f8 100644 --- a/dusken/main/tests/__init__.py +++ b/dusken/main/tests/__init__.py @@ -1,2 +1,3 @@ from member import * from group import * +from membersbygroup import * diff --git a/dusken/main/tests/member.py b/dusken/main/tests/member.py index 063f9cd..ff27214 100644 --- a/dusken/main/tests/member.py +++ b/dusken/main/tests/member.py @@ -4,9 +4,6 @@ from support.test import ResourceTestCase from main.models import Member class MemberTest(ResourceTestCase): - fixtures = [ 'testdata.json' ] - standard_username = 'robert' - def assertValidMemberData(self, member): self.assertEquals(type(member), dict) self.assertKeys(member, [ @@ -33,7 +30,11 @@ class MemberTest(ResourceTestCase): # Get the preloaded member, which will be used for # comparison with fetched object. - self.member = Member.objects.get(username=self.standard_username) + self.member = Member(username='robert', email='robert.kolner@gmail.com', phone_number=90567268) + self.member.save() + + self.member2 = Member(username='test', email='test@test.com') + self.member2.save() # URI to get the existing member. We'll probably # need it at one point or another. @@ -146,7 +147,7 @@ class MemberTest(ResourceTestCase): self.assertHttpAccepted(resp) # Check if user was actually updated: - user = Member.objects.get(username=self.standard_username) + user = Member.objects.get(username=self.member.username) self.assertNotEquals(user.password, data['password']) # just to ensure that it's encrypted self.assertEquals(user.email, data['email']) self.assertEquals(user.phone_number, data['phone_number']) diff --git a/dusken/main/tests/membersbygroup.py b/dusken/main/tests/membersbygroup.py new file mode 100644 index 0000000..6c908ed --- /dev/null +++ b/dusken/main/tests/membersbygroup.py @@ -0,0 +1,28 @@ +import logging + +from support.test import ResourceTestCase +from main.models import Group, Member + +class MembersByGroupTest(ResourceTestCase): + def setUp(self): + super(MembersByGroupTest, self).setUp() + + # URI to get all groups + self.url = '/api/v1/membersbygroup/' + + def test_request_types(self): + """ + Tests that the endpoint responds to correct types of requests. + """ + resp = self.api_client.get(self.url, format='json') + self.assertHttpMethodNotAllowed(resp) + + resp = self.api_client.post(self.url) + self.assertNotEquals(resp.status_code, 405) + + resp = self.api_client.put(self.url) + self.assertHttpMethodNotAllowed(resp) + + resp = self.api_client.delete(self.url) + self.assertHttpMethodNotAllowed(resp) +