edb/dusken-prototype
Archived
9
0 Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Minor

Browse Source
This commit is contained in:
nikolark committed 2014-01-26 17:29:31 +01:00
1 parent 63e3ac208c
commit 025c26997a
3 files changed
+14 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

dusken/settings-sample.py
+1
View File
@@ -109,6 +109,7 @@ AUTH_USER_MODEL = 'dusken.Member'
TASTYPIE_DEFAULT_FORMATS = ['json']
TASTYPIE_DATETIME_FORMATTING = 'iso-8601-strict' # no microseconds
TASTYPIE_ABSTRACT_APIKEY = True
#TASTYPIE_FULL_DEBUG = True
CORS_ORIGIN_ALLOW_ALL = True
dusken/tests/test_group.py
+5 -6
View File
@@ -1,8 +1,8 @@
from tastypie.models import ApiKey
from dusken.utils.tests import test_fixtures_group, do_get_request, do_post_request
from tastypie.test import ResourceTestCase
from dusken.authentication import create_access_token
from dusken.models import Member
from dusken.utils.tests import test_fixtures_group, do_get_request, do_post_request
class GroupTest(ResourceTestCase):
@@ -15,9 +15,8 @@ class GroupTest(ResourceTestCase):
def setUp(self):
self.member = Member.objects.get(pk=2)
self.creds = self.create_apikey(
username=self.member.username,
api_key=ApiKey.objects.get(user=self.member).key)
# Put OAuth2 Authorization in HTTP header
self.creds = create_access_token(self.member)
super(GroupTest, self).setUp()
dusken/tests/test_membership.py
+8 -8
View File
@@ -76,7 +76,7 @@ class MembershipTest(ResourceTestCase):
### JSON Responses
def expected_memberships(self):
return [{
u'created': u'2013-09-11T20:45:13.341000',
u'created': u'2013-09-11T20:45:13',
u'expires': u'2013-09-11',
u'id': 1,
u'member': 2,
@@ -84,12 +84,12 @@ class MembershipTest(ResourceTestCase):
u'payment': None,
u'resource_uri': u'/api/v1/membership/1/',
u'start_date': u'2013-09-11',
u'updated': u'2013-09-11T20:45:13.341000'
u'updated': u'2013-09-11T20:45:13'
},
{
u'membership_type': 1,
u'updated': u'2013-09-11T20:45:30.084000',
u'created': u'2013-09-11T20:45:30.084000',
u'updated': u'2013-09-11T20:45:30',
u'created': u'2013-09-11T20:45:30',
u'expires': u'2013-09-11',
u'id': 2, u'member': 2,
u'start_date': u'2013-09-15',
@@ -98,8 +98,8 @@ class MembershipTest(ResourceTestCase):
},
{
u'membership_type': 2,
u'updated': u'2013-09-11T20:45:53.522000',
u'created': u'2013-09-11T20:45:53.522000',
u'updated': u'2013-09-11T20:45:53',
u'created': u'2013-09-11T20:45:53',
u'expires': u'2013-09-11',
u'id': 3,
u'member': 2,
@@ -110,7 +110,7 @@ class MembershipTest(ResourceTestCase):
def expected_membership(self):
return {
u'created': u'2013-09-11T20:45:13.341000',
u'created': u'2013-09-11T20:45:13',
u'expires': u'2013-09-11',
u'id': 1,
u'member': 2,
@@ -118,7 +118,7 @@ class MembershipTest(ResourceTestCase):
u'payment': None,
u'resource_uri': u'/api/v1/membership/1/',
u'start_date': u'2013-09-11',
u'updated': u'2013-09-11T20:45:13.341000'
u'updated': u'2013-09-11T20:45:13'
}
def expected_membership_with_payment(self):