From 583e081c04a286a431a559921d46f2ffb7de4037 Mon Sep 17 00:00:00 2001
From: Nico Alt <nicoalt@posteo.org>
Date: Fri, 14 Jun 2019 23:27:22 +0200
Subject: [PATCH] Add first tests for private chat
Also move shared pytest fixtures to conftest.py
---
tests/briar/api/models/test_contacts.py | 26 +----------------
tests/briar/api/models/test_private_chat.py | 21 ++++++++++++++
tests/conftest.py | 31 +++++++++++++++++++++
3 files changed, 53 insertions(+), 25 deletions(-)
create mode 100644 tests/briar/api/models/test_private_chat.py
create mode 100644 tests/conftest.py
diff --git a/tests/briar/api/models/test_contacts.py b/tests/briar/api/models/test_contacts.py
index 1ec1a67..2d1b991 100644
--- a/tests/briar/api/models/test_contacts.py
+++ b/tests/briar/api/models/test_contacts.py
@@ -3,12 +3,8 @@
# License-Filename: LICENSE.md
import json
-from random import choice
-import requests_mock
-from string import ascii_letters, digits
-from unittest import mock
-import pytest
+import requests_mock
from briar.api.models.contacts import Contacts
@@ -22,23 +18,3 @@ def test_get_empty(api, request_headers, requests_mock):
request_headers=request_headers,
text=json.dumps(response))
assert contacts.get() == response
-
-
-@pytest.fixture
-def api(auth_token):
- api = mock.Mock()
- api.auth_token = auth_token
- return api
-
-
-@pytest.fixture
-def request_headers(auth_token):
- request_headers = {
- "Authorization": 'Bearer %s' % auth_token
- }
- return request_headers
-
-
-@pytest.fixture
-def auth_token():
- return ''.join(choice(ascii_letters + digits) for i in range(33))
diff --git a/tests/briar/api/models/test_private_chat.py b/tests/briar/api/models/test_private_chat.py
new file mode 100644
index 0000000..46b908a
--- /dev/null
+++ b/tests/briar/api/models/test_private_chat.py
@@ -0,0 +1,21 @@
+# Copyright (c) 2019 Nico Alt
+# SPDX-License-Identifier: AGPL-3.0-only
+# License-Filename: LICENSE.md
+
+import json
+
+import requests_mock
+
+from briar.api.models.private_chat import PrivateChat
+
+
+@requests_mock.Mocker(kw='requests_mock')
+def test_get_empty(api, request_headers, requests_mock):
+ private_chat = PrivateChat(api)
+ contact_id = 1
+ url = "http://localhost:7000/v1/messages/%s" % contact_id
+ response = []
+
+ requests_mock.register_uri("GET", url, request_headers=request_headers,
+ text=json.dumps(response))
+ assert private_chat.get(contact_id) == response
diff --git a/tests/conftest.py b/tests/conftest.py
new file mode 100644
index 0000000..7d483ab
--- /dev/null
+++ b/tests/conftest.py
@@ -0,0 +1,31 @@
+# Copyright (c) 2019 Nico Alt
+# SPDX-License-Identifier: AGPL-3.0-only
+# License-Filename: LICENSE.md
+
+from random import choice
+from string import ascii_letters, digits
+from unittest import mock
+
+import pytest
+
+# pylint: disable=redefined-outer-name
+
+
+@pytest.fixture
+def api(auth_token):
+ api = mock.Mock()
+ api.auth_token = auth_token
+ return api
+
+
+@pytest.fixture
+def auth_token():
+ return ''.join(choice(ascii_letters + digits) for i in range(33))
+
+
+@pytest.fixture
+def request_headers(auth_token):
+ request_headers = {
+ "Authorization": 'Bearer %s' % auth_token
+ }
+ return request_headers
--
GitLab