Skip to content

Commit

Permalink
Merge branch 'develop' into ft-edit-user-158791587
Browse files Browse the repository at this point in the history
  • Loading branch information
JoshuaOndieki committed Jul 7, 2018
2 parents b0b5e05 + f025e1d commit 062b598
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
4 changes: 2 additions & 2 deletions ridemyway/api/v2/controllers/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
Controller for endpoints on user
"""
from flask_jwt_extended import get_jwt_identity
from flask_restful import abort

from ridemyway.utils.response import Response
from ridemyway.utils.db_queries import select_user, update_user
from ridemyway.utils.warnings import edit_warnings
from flask_restful import abort
from ridemyway.utils.response import Response


class UserController():
Expand Down
5 changes: 5 additions & 0 deletions ridemyway/tests/tests_v2/test_auth/test_login.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ def test_non_matching_credentials_not_authorized(self):
self.assertTrue(result['status'] == 'failed',
msg='Should return status failed in response data')

def test_required_details_are_provided(self):
self.response = self.client().post(LOGIN, data={})
self.assertEqual(self.response.status_code, 400,
msg='Should return 400 status code for empty data')


if __name__ == '__main__':
unittest.main()

0 comments on commit 062b598

Please sign in to comment.