From 77c02502be403df118f81308ccad7a11b051d87e Mon Sep 17 00:00:00 2001 From: Daniel Ternyak Date: Mon, 28 Jan 2019 15:34:57 -0600 Subject: [PATCH] Fix schema and add test --- backend/grant/user/models.py | 5 +++-- backend/tests/user/test_user_api.py | 13 ++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/backend/grant/user/models.py b/backend/grant/user/models.py index 5e54f234..376fb8ff 100644 --- a/backend/grant/user/models.py +++ b/backend/grant/user/models.py @@ -269,8 +269,9 @@ class UserSchema(ma.Schema): return obj.id -user_schema = SelfUserSchema() -users_schema = SelfUserSchema(many=True) +user_schema = UserSchema() +users_schema = UserSchema(many=True) + class SocialMediaSchema(ma.Schema): class Meta: diff --git a/backend/tests/user/test_user_api.py b/backend/tests/user/test_user_api.py index d7d80c5a..f3462ea7 100644 --- a/backend/tests/user/test_user_api.py +++ b/backend/tests/user/test_user_api.py @@ -63,7 +63,6 @@ class TestUserAPI(BaseUserConfig): }), content_type="application/json" ) - print(user_auth_resp.headers) self.assertEqual(user_auth_resp.json['emailAddress'], self.user.email_address) self.assertEqual(user_auth_resp.json['displayName'], self.user.display_name) @@ -76,20 +75,24 @@ class TestUserAPI(BaseUserConfig): }), content_type="application/json" ) - print(login_resp.headers) # should have session cookie now me_resp = self.app.get( "/api/v1/users/me" ) - print(me_resp.headers) self.assert200(me_resp) + def test_me_get_includes_email_address(self): + self.login_default_user() + me_resp = self.app.get( + "/api/v1/users/me" + ) + self.assert200(me_resp) + self.assertIsNotNone(me_resp.json['emailAddress']) + def test_user_auth_required_fail(self): me_resp = self.app.get( "/api/v1/users/me", ) - print(me_resp.json) - print(me_resp.headers) self.assert401(me_resp) def test_user_auth_bad_password(self):