From 4e47a5b7a465e779537d8d4f853e9e3e6047364c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B0=D1=88=C3=90=D0=92=D0=B8=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=20=D0=93=D0=BB=D0=B0=D0=B4=D0=BA=D0=B8=D1=85=C3=90?= Date: Thu, 19 Sep 2019 15:33:23 +0300 Subject: [PATCH 1/5] add base test for route 'employees' --- apps/establishment/tests.py | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/apps/establishment/tests.py b/apps/establishment/tests.py index 7ce503c2..b6a2b9c4 100644 --- a/apps/establishment/tests.py +++ b/apps/establishment/tests.py @@ -1,3 +1,32 @@ -from django.test import TestCase - +from rest_framework.test import APITestCase, APIClient +from account.models import User +from rest_framework import status # Create your tests here. + + +class BaseTestCase(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) + + +class EmployeeTests(BaseTestCase): + def test_employee_create(self): + self.data ={ + 'username_or_email': 'sedragurda', + 'password': 'sedragurdaredips19', + 'remember': True + } + + response = self.client.post('/api/auth/login/',data=self.data) + + auth = { + 'access_token': response.data['access_token'], + 'refresh_token': response.data['refresh_token'] + } + response = self.client.get('/api/back/establishments/employees/', data=auth, format='json') + self.assertEqual(response.status_code, status.HTTP_200_OK) \ No newline at end of file From 3095b5940f2a8afa41f75705e45fe2092b89f138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B0=D1=88=C3=90=D0=92=D0=B8=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=20=D0=93=D0=BB=D0=B0=D0=B4=D0=BA=D0=B8=D1=85=C3=90?= Date: Thu, 19 Sep 2019 15:40:07 +0300 Subject: [PATCH 2/5] modify base test for route 'employees' --- apps/establishment/tests.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/apps/establishment/tests.py b/apps/establishment/tests.py index b6a2b9c4..589f9f45 100644 --- a/apps/establishment/tests.py +++ b/apps/establishment/tests.py @@ -13,20 +13,22 @@ class BaseTestCase(APITestCase): self.newsletter = True self.user = User.objects.create_user(username=self.username, email=self.email, password=self.password) - -class EmployeeTests(BaseTestCase): - def test_employee_create(self): - self.data ={ - 'username_or_email': 'sedragurda', - 'password': 'sedragurdaredips19', + def getAuthInfo(self): + data ={ + 'username_or_email': self.username, + 'password': self.password, 'remember': True } + response = self.client.post('/api/auth/login/', data=data) - response = self.client.post('/api/auth/login/',data=self.data) - - auth = { + return { 'access_token': response.data['access_token'], 'refresh_token': response.data['refresh_token'] } - response = self.client.get('/api/back/establishments/employees/', data=auth, format='json') + + +class EmployeeTests(BaseTestCase): + def test_employee_create(self): + data = self.getAuthInfo() + response = self.client.get('/api/back/establishments/employees/', data=data, format='json') self.assertEqual(response.status_code, status.HTTP_200_OK) \ No newline at end of file From 356ea9465b307d7db02f7fa82d12ea3f2830172a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B0=D1=88=C3=90=D0=92=D0=B8=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=20=D0=93=D0=BB=D0=B0=D0=B4=D0=BA=D0=B8=D1=85=C3=90?= Date: Thu, 19 Sep 2019 16:25:57 +0300 Subject: [PATCH 3/5] add get_tokkens and add cookies --- apps/establishment/tests.py | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/apps/establishment/tests.py b/apps/establishment/tests.py index 589f9f45..b6d72564 100644 --- a/apps/establishment/tests.py +++ b/apps/establishment/tests.py @@ -1,6 +1,7 @@ from rest_framework.test import APITestCase, APIClient from account.models import User from rest_framework import status +from http.cookies import SimpleCookie # Create your tests here. @@ -12,23 +13,32 @@ class BaseTestCase(APITestCase): self.email = 'sedragurda@desoz.com' self.newsletter = True self.user = User.objects.create_user(username=self.username, email=self.email, password=self.password) + #get tokkens + tokkens = User.create_jwt_tokens(self.user) + self.access_token = tokkens.get('access_token') + self.refresh_token = tokkens.get('refresh_token') - def getAuthInfo(self): - data ={ - 'username_or_email': self.username, - 'password': self.password, - 'remember': True - } - response = self.client.post('/api/auth/login/', data=data) + # print('access_token: ' + self.access_token) - return { - 'access_token': response.data['access_token'], - 'refresh_token': response.data['refresh_token'] - } + + # def getAuthInfo(self): + # data ={ + # 'username_or_email': self.username, + # 'password': self.password, + # 'remember': True + # } + # response = self.client.post('/api/auth/login/', data=data) + # + # return { + # 'access_token': response.data['access_token'], + # 'refresh_token': response.data['refresh_token'] + # } class EmployeeTests(BaseTestCase): def test_employee_create(self): - data = self.getAuthInfo() - response = self.client.get('/api/back/establishments/employees/', data=data, format='json') + self.client.cookies = SimpleCookie({'access_token':self.access_token, + 'refresh_token': self.refresh_token}) + + response = self.client.get('/api/back/establishments/employees/', format='json') self.assertEqual(response.status_code, status.HTTP_200_OK) \ No newline at end of file From d3238f50c29cd59e9bc629f2f302529bfc798d81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B0=D1=88=C3=90=D0=92=D0=B8=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=20=D0=93=D0=BB=D0=B0=D0=B4=D0=BA=D0=B8=D1=85=C3=90?= Date: Thu, 19 Sep 2019 17:06:38 +0300 Subject: [PATCH 4/5] add login test --- apps/authorization/tests.py | 3 --- apps/authorization/tests/__init__.py | 0 apps/authorization/tests/tests.py | 26 ++++++++++++++++++++++++-- apps/establishment/tests.py | 28 ++++++---------------------- 4 files changed, 30 insertions(+), 27 deletions(-) delete mode 100644 apps/authorization/tests.py delete mode 100644 apps/authorization/tests/__init__.py diff --git a/apps/authorization/tests.py b/apps/authorization/tests.py deleted file mode 100644 index 7ce503c2..00000000 --- a/apps/authorization/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/apps/authorization/tests/__init__.py b/apps/authorization/tests/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/apps/authorization/tests/tests.py b/apps/authorization/tests/tests.py index 7ce503c2..839af828 100644 --- a/apps/authorization/tests/tests.py +++ b/apps/authorization/tests/tests.py @@ -1,3 +1,25 @@ -from django.test import TestCase - +from rest_framework.test import APITestCase +from account.models import User # Create your tests here. + + +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) + + def LoginTests(self): + data ={ + 'username_or_email': self.username, + 'password': self.password, + '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')) + diff --git a/apps/establishment/tests.py b/apps/establishment/tests.py index b6d72564..29218fd7 100644 --- a/apps/establishment/tests.py +++ b/apps/establishment/tests.py @@ -1,4 +1,4 @@ -from rest_framework.test import APITestCase, APIClient +from rest_framework.test import APITestCase from account.models import User from rest_framework import status from http.cookies import SimpleCookie @@ -15,30 +15,14 @@ class BaseTestCase(APITestCase): self.user = User.objects.create_user(username=self.username, email=self.email, password=self.password) #get tokkens tokkens = User.create_jwt_tokens(self.user) - self.access_token = tokkens.get('access_token') - self.refresh_token = tokkens.get('refresh_token') - - # print('access_token: ' + self.access_token) + self.client.cookies = SimpleCookie({'access_token': tokkens.get('access_token'), + 'refresh_token': tokkens.get('refresh_token')}) - # def getAuthInfo(self): - # data ={ - # 'username_or_email': self.username, - # 'password': self.password, - # 'remember': True - # } - # response = self.client.post('/api/auth/login/', data=data) - # - # return { - # 'access_token': response.data['access_token'], - # 'refresh_token': response.data['refresh_token'] - # } class EmployeeTests(BaseTestCase): - def test_employee_create(self): - self.client.cookies = SimpleCookie({'access_token':self.access_token, - 'refresh_token': self.refresh_token}) - + def test_employee_list(self): response = self.client.get('/api/back/establishments/employees/', format='json') - self.assertEqual(response.status_code, status.HTTP_200_OK) \ No newline at end of file + self.assertEqual(response.status_code, status.HTTP_200_OK) + From 4a08abbfd9bd38db511b379ca86dd0f47473fcab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B0=D1=88=C3=90=D0=92=D0=B8=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=20=D0=93=D0=BB=D0=B0=D0=B4=D0=BA=D0=B8=D1=85=C3=90?= Date: Thu, 19 Sep 2019 18:02:43 +0300 Subject: [PATCH 5/5] employee test crd --- apps/establishment/tests.py | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/apps/establishment/tests.py b/apps/establishment/tests.py index 29218fd7..b64a971c 100644 --- a/apps/establishment/tests.py +++ b/apps/establishment/tests.py @@ -2,6 +2,7 @@ from rest_framework.test import APITestCase from account.models import User from rest_framework import status from http.cookies import SimpleCookie +from establishment.models import Employee # Create your tests here. @@ -19,10 +20,25 @@ class BaseTestCase(APITestCase): 'refresh_token': tokkens.get('refresh_token')}) - - class EmployeeTests(BaseTestCase): - def test_employee_list(self): + def test_employee_CRD(self): response = self.client.get('/api/back/establishments/employees/', format='json') self.assertEqual(response.status_code, status.HTTP_200_OK) + data = { + 'user': self.user.id, + 'name': 'Test name' + } + + response = self.client.post('/api/back/establishments/employees/', data=data) + self.assertEqual(response.status_code, status.HTTP_201_CREATED) + + response = self.client.get('/api/back/establishments/employees/1/', format='json') + self.assertEqual(response.status_code, status.HTTP_200_OK) + + response = self.client.delete('/api/back/establishments/employees/1/', format='json') + self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) + + + +