jbiason
/
Lunch-O
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix the test due the change on #6

master
Julio Biason 11 years ago
parent
16da4d0b4a
commit
e91c50a457
2 changed files with 24 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      tests/group_tests.py
  2. 24
      tests/users_tests.py

24
tests/group_tests.py
Unescape View File

@ -289,9 +289,9 @@ class TestUsersInGroup(LunchoTests):
request = {'usernames': [new_user.username]} request = {'usernames': [new_user.username]}
url = '/group/{group_id}/users/'.format(group_id=self.group.id) url = '/group/{group_id}/users/'.format(group_id=self.group.id)
rv = self.put(url, rv = self.post(url,
request, request,
token=self.user.token) token=self.user.token)
self.assertJsonOk(rv) self.assertJsonOk(rv)
return return
@ -307,9 +307,9 @@ class TestUsersInGroup(LunchoTests):
request = {'usernames': [new_user.username]} request = {'usernames': [new_user.username]}
url = '/group/{group_id}/users/'.format(group_id=self.group.id) url = '/group/{group_id}/users/'.format(group_id=self.group.id)
rv = self.put(url, rv = self.post(url,
request, request,
token=new_user.token) token=new_user.token)
self.assertJsonError(rv, 403, 'User is not admin') self.assertJsonError(rv, 403, 'User is not admin')
return return
@ -317,9 +317,9 @@ class TestUsersInGroup(LunchoTests):
"""Try to add an unknown user to the group.""" """Try to add an unknown user to the group."""
request = {'usernames': ['unknown']} request = {'usernames': ['unknown']}
url = '/group/{group_id}/users/'.format(group_id=self.group.id) url = '/group/{group_id}/users/'.format(group_id=self.group.id)
rv = self.put(url, rv = self.post(url,
request, request,
token=self.user.token) token=self.user.token)
# not finding users still returns a 200, but with the users in the # not finding users still returns a 200, but with the users in the
# "not_found" field # "not_found" field
@ -334,9 +334,9 @@ class TestUsersInGroup(LunchoTests):
# the usernames are worthless, group not found should kick first # the usernames are worthless, group not found should kick first
request = {'usernames': ['unkonwn']} request = {'usernames': ['unkonwn']}
group_id = self.group.id + 10 group_id = self.group.id + 10
rv = self.put('/group/{group_id}/users/'.format(group_id=group_id), rv = self.post('/group/{group_id}/users/'.format(group_id=group_id),
request, request,
token=self.user.token) token=self.user.token)
self.assertJsonError(rv, 404, 'Group not found') self.assertJsonError(rv, 404, 'Group not found')
return return

24
tests/users_tests.py
Unescape View File

@ -18,7 +18,7 @@ class TestUsers(LunchoTests):
request = {'username': 'username', request = {'username': 'username',
'full_name': 'full name', 'full_name': 'full name',
'password': 'hash'} 'password': 'hash'}
rv = self.put('/user/', request) rv = self.post('/user/', request)
self.assertJsonOk(rv) self.assertJsonOk(rv)
# db check # db check
@ -32,7 +32,7 @@ class TestUsers(LunchoTests):
request = {'username': 'username', request = {'username': 'username',
'full_name': 'full name', 'full_name': 'full name',
'password': 'hash'} 'password': 'hash'}
rv = self.put('/user/', data=request) rv = self.post('/user/', data=request)
self.assertJsonError(rv, 409, 'Username already exists') self.assertJsonError(rv, 409, 'Username already exists')
def test_no_json(self): def test_no_json(self):
@ -43,7 +43,7 @@ class TestUsers(LunchoTests):
def test_missing_fields(self): def test_missing_fields(self):
"""Send a request with missing fields.""" """Send a request with missing fields."""
request = {'password': 'hash'} request = {'password': 'hash'}
rv = self.put('/user/', request) rv = self.post('/user/', request)
self.assertJsonError(rv, 400, 'Missing fields', fields=['username', self.assertJsonError(rv, 400, 'Missing fields', fields=['username',
'full_name']) 'full_name'])
@ -66,9 +66,9 @@ class TestExistingUsers(LunchoTests):
"""Update user details.""" """Update user details."""
request = {'full_name': 'New User Name', request = {'full_name': 'New User Name',
'password': 'newhash'} 'password': 'newhash'}
rv = self.post('/user/', rv = self.put('/user/',
request, request,
self.user.token) self.user.token)
self.assertJsonOk(rv) self.assertJsonOk(rv)
@ -81,9 +81,9 @@ class TestExistingUsers(LunchoTests):
"""Send a request with an unexisting token.""" """Send a request with an unexisting token."""
request = {'full_name': 'New User Name', request = {'full_name': 'New User Name',
'password': 'newhash'} 'password': 'newhash'}
rv = self.post('/user/', rv = self.put('/user/',
request, request,
'no-token') 'no-token')
self.assertJsonError(rv, 404, 'User not found (via token)') self.assertJsonError(rv, 404, 'User not found (via token)')
@ -96,9 +96,9 @@ class TestExistingUsers(LunchoTests):
request = {'full_name': 'New User Name', request = {'full_name': 'New User Name',
'password': 'newhash'} 'password': 'newhash'}
rv = self.post('/user/', rv = self.put('/user/',
request, request,
self.user.token) self.user.token)
self.assertJsonError(rv, 400, 'Invalid token') self.assertJsonError(rv, 400, 'Invalid token')

Write Preview
Loading…
Cancel
Save