diff --git a/.gitignore b/.gitignore index a789335..e00f2dc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ settings.py build docs/_build db.sqlite3 +dusken.db diff --git a/dusken/tests/__init__.py b/dusken/tests/__init__.py index 3d6c5f8..2eadad9 100644 --- a/dusken/tests/__init__.py +++ b/dusken/tests/__init__.py @@ -1,3 +1,2 @@ from member import * from group import * -from membersbygroup import * diff --git a/dusken/tests/membersbygroup.py b/dusken/tests/membersbygroup.py deleted file mode 100644 index bd0a7eb..0000000 --- a/dusken/tests/membersbygroup.py +++ /dev/null @@ -1,59 +0,0 @@ -import logging - -from support.test import ResourceTestCase -from dusken.models import Group, Member - -class MembersByGroupTest(ResourceTestCase): - def setUp(self): - super(MembersByGroupTest, self).setUp() - - self.member = Member(username='robert', email='robert.kolner@gmail.com', phone_number=90567268) - self.member.save() - - self.group = Group(name="EDB", posix_name="edb") - self.group.save() - self.group.user_set.add(self.member) - self.group.save() - - # URI to get all members by group relations (not functional, needs more things at the end) - self.url = '/api/v1/group/{member_id}/member/'.format(member_id=self.group.id) - - def test_get_all_relations(self): - url = self.url + str(self.member.id) + "/" - resp = self.api_client.get(url, format="json") - self.assertValidJSONResponse(resp) - data = self.deserialize(resp) - - groupmembers = data['objects'] - - self.assertEquals(len(groupmembers), self.group.user_set.count()) - self.assertEquals(int(groupmembers[0]['member_id']), self.member.pk) - - def test_get_a_relation(self): - url = self.url + str(self.group.pk) +"/" - resp = self.api_client.get(url, format='json') - self.assertValidJSONResponse(resp) - - def test_create_relation(self): - group = Group(name="Design", posix_name="design") - - data = { - 'member_id': self.member.pk, - 'group_id': group.pk - } - resp = self.api_client.post(self.url, format='json', data=data) - self.assertHttpCreated(resp) - self.assertNotEquals(self.member.groups.filter(name=group.name).count(), 0) - - def test_remove_relation(self): - data = { - 'member_id': self.member.pk, - 'group_id': self.group.pk - } - resp = self.api_client.delete(self.url, format='json', data=data) - self.assertHttpAccepted(resp) - self.assertEquals(self.member.groups.filter(name=group.name).count(), 0) - - resp = self.api_client.delete(self.url, format='json', data=data) - self.assertHttpGone(resp) - diff --git a/requirements.txt b/requirements.txt index a3423dd..398e727 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ Django==1.5 -MySQL-python==1.2.4 South==0.7.6 django-tastypie==0.9.14 psycopg2==2.4.5