From 630bc1d40455686cd9556a0ff498da0a1c71f3fc Mon Sep 17 00:00:00 2001 From: Mark Polak Date: Wed, 21 Aug 2013 20:53:24 +0200 Subject: [PATCH] Small refactoring of the member test classes --- dusken/tests/member.py | 56 ++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/dusken/tests/member.py b/dusken/tests/member.py index bd3316d..e04b7b4 100644 --- a/dusken/tests/member.py +++ b/dusken/tests/member.py @@ -3,7 +3,26 @@ import logging from support.test import ResourceTestCase from dusken.models import Member -class MemberTest(ResourceTestCase): +class MemberTestBase(ResourceTestCase): + + def setUp(self): + super(MemberTestBase, self).setUp() + + # TODO use fixtures for this + # Get the preloaded member, which will be used for + # comparison with fetched object. + 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() + + # URIs to the member api + self.all_members_url = '/api/v1/member/' + self.member_url = self.all_members_url + '{}/'.format(self.member.pk) + + +class MemberTest(MemberTestBase): def assertValidMemberData(self, member): self.assertEquals(type(member), dict) self.assertKeys(member, [ @@ -24,23 +43,7 @@ class MemberTest(ResourceTestCase): self.assertNotEquals(None,member['email']) self.assertNotEquals(None,member['created']) self.assertNotEquals(None,member['updated']) - self.assertNotEquals(None,member['resource_uri']) - - def setUp(self): - super(MemberTest, self).setUp() - - # Get the preloaded member, which will be used for - # comparison with fetched object. - 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. - self.all_members_url = '/api/v1/member/' - self.member_url = self.all_members_url + '{}/'.format(self.member.pk) + self.assertNotEquals(None,member['resource_uri']) def test_get_member(self): """ @@ -157,3 +160,20 @@ class MemberTest(ResourceTestCase): except Member.DoesNotExist: pass # ...the test. +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +class MemberAdressTest(MemberTestBase): + + def test_member_update_address(self): + data = { + "api_client": "v1", + "address": { + "street" : "somestreet", + } + } + + resp = self.api_client.patch(self.member_url, + format='json', + data=data) + + print resp +