More test refactoring

InvenTree/company/test_api.py

@@ -4,29 +4,24 @@ from django.urls import reverse
 from django.contrib.auth import get_user_model
 
 from InvenTree.helpers import addUserPermissions
+from InvenTree.api_tester import InvenTreeAPITestCase
 
 from .models import Company
 
 
-class CompanyTest(APITestCase):
+class CompanyTest(InvenTreeAPITestCase):
     """
     Series of tests for the Company DRF API
     """
 
-    def setUp(self):
+    roles = [
-        # Create a user for auth
+        'purchase_order.add',
-        user = get_user_model()
+        'purchase_order.change',
-        self.user = user.objects.create_user('testuser', 'test@testing.com', 'password')
-        
-        perms = [
-            'view_company',
-            'change_company',
-            'add_company',
     ]
 
-        addUserPermissions(self.user, perms)
+    def setUp(self):
 
-        self.client.login(username='testuser', password='password')
+        super().setUp()
 
         Company.objects.create(name='ACME', description='Supplier', is_customer=False, is_supplier=True)
         Company.objects.create(name='Drippy Cup Co.', description='Customer', is_customer=True, is_supplier=False)
@@ -36,24 +31,24 @@ class CompanyTest(APITestCase):
         url = reverse('api-company-list')
 
         # There should be two companies
-        response = self.client.get(url, format='json')
+        response = self.get(url)
         self.assertEqual(len(response.data), 3)
 
         data = {'is_customer': True}
 
         # There should only be one customer
-        response = self.client.get(url, data, format='json')
+        response = self.get(url, data)
         self.assertEqual(len(response.data), 1)
 
         data = {'is_supplier': True}
 
         # There should be two suppliers
-        response = self.client.get(url, data, format='json')
+        response = self.get(url, data)
         self.assertEqual(len(response.data), 2)
 
     def test_company_detail(self):
         url = reverse('api-company-detail', kwargs={'pk': 1})
-        response = self.client.get(url, format='json')
+        response = self.get(url)
 
         self.assertEqual(response.data['name'], 'ACME')
 
@@ -68,5 +63,5 @@ class CompanyTest(APITestCase):
         # Test search functionality in company list
         url = reverse('api-company-list')
         data = {'search': 'cup'}
-        response = self.client.get(url, data, format='json')
+        response = self.get(url, data)
         self.assertEqual(len(response.data), 2)

InvenTree/label/test_api.py

@@ -8,8 +8,10 @@ from rest_framework.test import APITestCase
 from django.urls import reverse
 from django.contrib.auth import get_user_model
 
+from InvenTree.api_tester import InvenTreeAPITestCase
 
-class TestReportTests(APITestCase):
+
+class TestReportTests(InvenTreeAPITestCase):
     """
     Tests for the StockItem TestReport templates
     """
@@ -21,17 +23,16 @@ class TestReportTests(APITestCase):
         'stock',
     ]
 
+    roles = [
+        'stock.view',
+        'stock_location.view',
+    ]
+
     list_url = reverse('api-stockitem-testreport-list')
 
     def setUp(self):
-        user = get_user_model()
 
-        self.user = user.objects.create_user('testuser', 'test@testing.com', 'password')
+        super().setUp()
-
-        self.user.is_staff = True
-        self.user.save()
-
-        self.client.login(username='testuser', password='password')
 
     def do_list(self, filters={}):
 

InvenTree/order/test_api.py

@@ -10,10 +10,12 @@ from rest_framework import status
 from django.urls import reverse
 from django.contrib.auth import get_user_model
 
+from InvenTree.api_tester import InvenTreeAPITestCase
+
 from .models import PurchaseOrder, SalesOrder
 
 
-class OrderTest(APITestCase):
+class OrderTest(InvenTreeAPITestCase):
 
     fixtures = [
         'category',
@@ -26,25 +28,20 @@ class OrderTest(APITestCase):
         'sales_order',
     ]
 
+    roles = [
+        'purchase_order.change',
+        'sales_order.change',
+    ]
+
     def setUp(self):
-
+        super().setUp()
-        # Create a user for auth
-        get_user_model().objects.create_user('testuser', 'test@testing.com', 'password')
-        self.client.login(username='testuser', password='password')
-
-    def doGet(self, url, data={}):
-
-        return self.client.get(url, data=data, format='json')
-
-    def doPost(self, url, data={}):
-        return self.client.post(url, data=data, format='json')
 
     def filter(self, filters, count):
         """
         Test API filters
         """
 
-        response = self.doGet(
+        response = self.get(
             self.LIST_URL,
             filters
         )
@@ -98,7 +95,7 @@ class PurchaseOrderTest(OrderTest):
 
         url = '/api/order/po/1/'
 
-        response = self.doGet(url)
+        response = self.get(url)
         
         self.assertEqual(response.status_code, 200)
 
@@ -111,7 +108,7 @@ class PurchaseOrderTest(OrderTest):
 
         url = reverse('api-po-attachment-list')
 
-        response = self.doGet(url)
+        response = self.get(url)
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
     
@@ -161,7 +158,7 @@ class SalesOrderTest(OrderTest):
 
         url = '/api/order/so/1/'
 
-        response = self.doGet(url)
+        response = self.get(url)
 
         self.assertEqual(response.status_code, 200)
 
@@ -173,6 +170,6 @@ class SalesOrderTest(OrderTest):
 
         url = reverse('api-so-attachment-list')
 
-        response = self.doGet(url)
+        response = self.get(url)
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)