From b69822444aeddb447de148d951aefde3ee551ea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?=
 =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= <v.gladkikh@spider.ru>
Date: Mon, 23 Sep 2019 15:06:55 +0300
Subject: [PATCH] Refactor tests for authorization

---
 apps/account/tests.py              |  3 ---
 apps/account/tests/__init__.py     |  0
 apps/account/tests/tests_common.py | 11 +++++++++++
 apps/authorization/tests/tests.py  | 29 +++++++++++++++++++++--------
 4 files changed, 32 insertions(+), 11 deletions(-)
 delete mode 100644 apps/account/tests.py
 create mode 100644 apps/account/tests/__init__.py
 create mode 100644 apps/account/tests/tests_common.py

diff --git a/apps/account/tests.py b/apps/account/tests.py
deleted file mode 100644
index 7ce503c2..00000000
--- a/apps/account/tests.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.
diff --git a/apps/account/tests/__init__.py b/apps/account/tests/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/apps/account/tests/tests_common.py b/apps/account/tests/tests_common.py
new file mode 100644
index 00000000..fcabe946
--- /dev/null
+++ b/apps/account/tests/tests_common.py
@@ -0,0 +1,11 @@
+from rest_framework.test import APITestCase
+
+
+# Create your tests here.
+
+
+class AccountTests(APITestCase):
+
+    def test_default(self):
+        print("account")
+        self.assertTrue(False)
diff --git a/apps/authorization/tests/tests.py b/apps/authorization/tests/tests.py
index 839af828..d9fd7b71 100644
--- a/apps/authorization/tests/tests.py
+++ b/apps/authorization/tests/tests.py
@@ -3,15 +3,28 @@ from account.models import User
 # Create your tests here.
 
 
+def get_tokens_for_user(
+        username='sedragurda', password='sedragurdaredips19', email='sedragurda@desoz.com'):
+
+    user = User.objects.create_user(username=username, email=email, password=password)
+    tokens = User.create_jwt_tokens(user)
+
+    return {
+        "username": username,
+        "password": password,
+        "email": email,
+        "newsletter": True,
+        "user": user,
+        "tokens": tokens
+    }
+
+
 class AuthorizationTests(APITestCase):
 
     def setUp(self):
-        self.username = 'sedragurda'
-        self.password = 'sedragurdaredips19'
-        self.email = 'sedragurda@desoz.com'
-        self.newsletter = True
-        self.user = User.objects.create_user(username=self.username, email=self.email, password=self.password)
-        self.tokkens = User.create_jwt_tokens(self.user)
+        data = get_tokens_for_user()
+        self.username = data["username"]
+        self.password = data["password"]
 
     def LoginTests(self):
         data ={
@@ -20,6 +33,6 @@ class AuthorizationTests(APITestCase):
             'remember': True
         }
         response = self.client.post('/api/auth/login/', data=data)
-        self.assertEqual(response.data['access_token'], self.tokkens.get('access_token'))
-        self.assertEqual(response.data['refresh_token'], self.tokkens.get('refresh_token'))
+        self.assertEqual(response.data['access_token'], self.tokens.get('access_token'))
+        self.assertEqual(response.data['refresh_token'], self.tokens.get('refresh_token'))