Merge branch 'master' onto local working copy

Preserve working copy while updating

1 files changed, 0 insertions, 23 deletions

diff --git a/web-server/opendc/api/v2/projects/test_endpoint.py b/web-server/opendc/api/v2/projects/test_endpoint.py
deleted file mode 100644
index a50735b0..00000000
--- a/web-server/opendc/api/v2/projects/test_endpoint.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from opendc.util.database import DB
-
-
-def test_add_project_missing_parameter(client):
-    assert '400' in client.post('/api/v2/projects').status
-
-
-def test_add_project(client, mocker):
-    mocker.patch.object(DB, 'fetch_one', return_value={'_id': '1', 'authorizations': []})
-    mocker.patch.object(DB,
-                        'insert',
-                        return_value={
-                            '_id': '1',
-                            'datetimeCreated': '000',
-                            'datetimeLastEdited': '000',
-                            'topologyIds': []
-                        })
-    mocker.patch.object(DB, 'update', return_value={})
-    res = client.post('/api/v2/projects', json={'project': {'name': 'test project'}})
-    assert 'datetimeCreated' in res.json['content']
-    assert 'datetimeLastEdited' in res.json['content']
-    assert 'topologyIds' in res.json['content']
-    assert '200' in res.status