Removed fixtures. Who needs them anyway?

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.

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)

dusken/main/tests/__init__.py

@@ -1,2 +1,3 @@
 from member import *
 from group import *
+from membersbygroup import *

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'])

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)
+