merge: Integrate v2.1 progress into public repository

This pull request integrates the changes planned for the v2.1 release of
OpenDC into the public Github repository in order to sync the progress
of both repositories.

1 files changed, 0 insertions, 34 deletions

diff --git a/opendc-web/opendc-web-api/opendc/api/v2/users/test_endpoint.py b/opendc-web/opendc-web-api/opendc/api/v2/users/test_endpoint.py
deleted file mode 100644
index 13b63b20..00000000
--- a/opendc-web/opendc-web-api/opendc/api/v2/users/test_endpoint.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from opendc.util.database import DB
-
-
-def test_get_user_by_email_missing_parameter(client):
-    assert '400' in client.get('/v2/users').status
-
-
-def test_get_user_by_email_non_existing(client, mocker):
-    mocker.patch.object(DB, 'fetch_one', return_value=None)
-    assert '404' in client.get('/v2/users?email=test@test.com').status
-
-
-def test_get_user_by_email(client, mocker):
-    mocker.patch.object(DB, 'fetch_one', return_value={'email': 'test@test.com'})
-    res = client.get('/v2/users?email=test@test.com')
-    assert 'email' in res.json['content']
-    assert '200' in res.status
-
-
-def test_add_user_missing_parameter(client):
-    assert '400' in client.post('/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('/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'})
-    res = client.post('/v2/users', json={'user': {'email': 'test@test.com'}})
-    assert 'email' in res.json['content']
-    assert '200' in res.status