Add more tests

3 files changed, 21 insertions, 9 deletions

diff --git a/opendc/api/v2/users/endpoint.py b/opendc/api/v2/users/endpoint.py
index 7b4158e3..6a99d2b3 100644
--- a/opendc/api/v2/users/endpoint.py
+++ b/opendc/api/v2/users/endpoint.py
@@ -1,6 +1,3 @@
-from werkzeug.exceptions import abort
-
-from opendc.models.user import User
 from opendc.util import exceptions
 from opendc.util.database import DB
 from opendc.util.rest import Response
diff --git a/opendc/api/v2/users/test_endpoint.py b/opendc/api/v2/users/test_endpoint.py
index a5073c08..dd6680a8 100644
--- a/opendc/api/v2/users/test_endpoint.py
+++ b/opendc/api/v2/users/test_endpoint.py
@@ -1,9 +1,8 @@
 from opendc.util.database import DB
 
 
-def test_get_user(client, mocker):
-    mocker.patch.object(DB, 'fetch_one', return_value={'email': 'test@test.com'})
-    assert '200' in client.get('/api/v2/users?email=test@test.com').status
+def test_get_user_missing_parameter(client):
+    assert '400' in client.get('/api/v2/users').status
 
 
 def test_get_user_non_existing(client, mocker):
@@ -11,5 +10,21 @@ def test_get_user_non_existing(client, mocker):
     assert '404' in client.get('/api/v2/users?email=test@test.com').status
 
 
-def test_get_user_missing_parameter(client):
-    assert '400' in client.get('/api/v2/users').status
+def test_get_user(client, mocker):
+    mocker.patch.object(DB, 'fetch_one', return_value={'email': 'test@test.com'})
+    assert '200' in client.get('/api/v2/users?email=test@test.com').status
+
+
+def test_add_user_missing_parameter(client):
+    assert '400' in client.post('/api/v2/users').status
+
+
+def test_add_user_existing(client, mocker):
+    mocker.patch.object(DB, 'fetch_one', return_value={'email': 'test@test.com'})
+    assert '409' in client.post('/api/v2/users', json={'user': {'email': 'test@test.com'}}).status
+
+
+def test_add_user(client, mocker):
+    mocker.patch.object(DB, 'fetch_one', return_value=None)
+    mocker.patch.object(DB, 'insert', return_value={'email': 'test@test.com'})
+    assert '200' in client.post('/api/v2/users', json={'user': {'email': 'test@test.com'}}).status
diff --git a/opendc/util/rest.py b/opendc/util/rest.py
index 2312b199..4da2ced6 100644
--- a/opendc/util/rest.py
+++ b/opendc/util/rest.py
@@ -43,7 +43,6 @@ class Request(object):
             module_base = 'opendc.api.{}.endpoint'
             module_path = self.path.replace('/', '.')
 
-            print(module_base.format(module_path))
             self.module = importlib.import_module(module_base.format(module_path))
         except ImportError:
             raise exceptions.UnimplementedEndpointError('Unimplemented endpoint: {}.'.format(self.path))
@@ -60,6 +59,7 @@ class Request(object):
         # Verify the user
 
         if "OPENDC_FLASK_TESTING" in os.environ:
+            self.google_id = 'test'
             return
 
         try: