From 5098712d9c88bd8fac7f2e91a587b152c5cc8fb5 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 24 Apr 2019 23:42:50 +1000 Subject: [PATCH 1/9] Use reverse to get Build URL - Add test cases to Build --- InvenTree/build/models.py | 3 ++- InvenTree/build/tests.py | 55 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/InvenTree/build/models.py b/InvenTree/build/models.py index d09e751878..c72aa5209b 100644 --- a/InvenTree/build/models.py +++ b/InvenTree/build/models.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals from django.utils.translation import ugettext as _ +from django.urls import reverse from django.db import models from django.core.validators import MinValueValidator @@ -14,7 +15,7 @@ class Build(models.Model): """ def get_absolute_url(self): - return '/build/{pk}/'.format(pk=self.id) + return reverse('build-detail', kwargs={'pk': self.id}) # Build status codes PENDING = 10 # Build is pending / active diff --git a/InvenTree/build/tests.py b/InvenTree/build/tests.py index c2de5b3ab1..43281c34b7 100644 --- a/InvenTree/build/tests.py +++ b/InvenTree/build/tests.py @@ -1,6 +1,59 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -# from django.test import TestCase +from django.test import TestCase + +from .models import Build +from part.models import Part # Create your tests here. + + +class BuildTestSimple(TestCase): + + def setUp(self): + part = Part.objects.create(name='Test part', + description='Simple description') + Build.objects.create(part=part, + batch='B1', + status=Build.PENDING, + title='Building 7 parts', + quantity=7, + notes='Some simple notes') + + Build.objects.create(part=part, + batch='B2', + status=Build.COMPLETE, + title='Building 21 parts', + quantity=21, + notes='Some simple notes') + + def test_build_objects(self): + # Ensure the Build objects were correctly created + self.assertEqual(Build.objects.count(), 2) + b = Build.objects.get(pk=2) + self.assertEqual(b.batch, 'B2') + self.assertEqual(b.quantity, 21) + + def test_url(self): + b1 = Build.objects.get(pk=1) + self.assertEqual(b1.get_absolute_url(), '/build/1/') + + def test_is_complete(self): + b1 = Build.objects.get(pk=1) + b2 = Build.objects.get(pk=2) + + self.assertEqual(b1.is_complete, False) + self.assertEqual(b2.is_complete, True) + + def test_is_active(self): + b1 = Build.objects.get(pk=1) + b2 = Build.objects.get(pk=2) + + self.assertEqual(b1.is_active, True) + self.assertEqual(b2.is_active, False) + + def test_required_parts(self): + # TODO - Generate BOM for test part + pass + \ No newline at end of file From a2d440396803a094cb4021c9b43bdd22a527e67e Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 24 Apr 2019 23:55:11 +1000 Subject: [PATCH 2/9] Reverse lookup for company URL - Added some simple tests --- InvenTree/company/models.py | 3 ++- InvenTree/company/tests.py | 20 ++++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/InvenTree/company/models.py b/InvenTree/company/models.py index fc864ecc19..fe97d9a90c 100644 --- a/InvenTree/company/models.py +++ b/InvenTree/company/models.py @@ -4,6 +4,7 @@ from __future__ import unicode_literals import os from django.db import models +from django.urls import reverse def rename_company_image(instance, filename): @@ -56,7 +57,7 @@ class Company(models.Model): return "{n} - {d}".format(n=self.name, d=self.description) def get_absolute_url(self): - return "/company/{id}/".format(id=self.id) + return reverse('company-detail', kwargs={'pk': self.id}) @property def part_count(self): diff --git a/InvenTree/company/tests.py b/InvenTree/company/tests.py index a79ca8be56..f1aa580c12 100644 --- a/InvenTree/company/tests.py +++ b/InvenTree/company/tests.py @@ -1,3 +1,19 @@ -# from django.test import TestCase +from django.test import TestCase -# Create your tests here. +from .models import Company + + +class CompanySimpleTest(TestCase): + + def setUp(self): + Company.objects.create(name='ABC Co.', + description='Seller of ABC products', + website='www.abc-sales.com', + address='123 Sales St.', + is_customer=False, + is_supplier=True) + + def test_company_model(self): + c = Company.objects.get(pk=1) + self.assertEqual(c.name, 'ABC Co.') + self.assertEqual(c.get_absolute_url(), '/company/1/') \ No newline at end of file From f9db3b680d8765938e36ad880d725cfc2511cdd8 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 25 Apr 2019 00:28:40 +1000 Subject: [PATCH 3/9] Reverse lookup for part category URL - Added some test cases for PartCategory model --- InvenTree/InvenTree/models.py | 4 +- InvenTree/part/models.py | 3 +- InvenTree/part/test_category.py | 67 +++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 InvenTree/part/test_category.py diff --git a/InvenTree/InvenTree/models.py b/InvenTree/InvenTree/models.py index 94dee8e95c..7129a8599a 100644 --- a/InvenTree/InvenTree/models.py +++ b/InvenTree/InvenTree/models.py @@ -74,9 +74,9 @@ class InvenTreeTree(models.Model): @property def children(self): contents = ContentType.objects.get_for_model(type(self)) - children = contents.get_all_objects_for_this_type(parent=self.id) + childs = contents.get_all_objects_for_this_type(parent=self.id) - return children + return childs def getAcceptableParents(self): """ Returns a list of acceptable parent items within this model diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py index 80a4a5da35..c9e4ae0500 100644 --- a/InvenTree/part/models.py +++ b/InvenTree/part/models.py @@ -9,6 +9,7 @@ import tablib from django.utils.translation import gettext_lazy as _ from django.core.exceptions import ValidationError +from django.urls import reverse from django.db import models from django.core.validators import MinValueValidator @@ -25,7 +26,7 @@ class PartCategory(InvenTreeTree): """ def get_absolute_url(self): - return '/part/category/{id}/'.format(id=self.id) + return reverse('category-detail', kwargs={'pk': self.id}) class Meta: verbose_name = "Part Category" diff --git a/InvenTree/part/test_category.py b/InvenTree/part/test_category.py new file mode 100644 index 0000000000..34efa4b2d1 --- /dev/null +++ b/InvenTree/part/test_category.py @@ -0,0 +1,67 @@ +from django.test import TestCase + +from .models import Part, PartCategory +from .models import rename_part_image + + +class CategoryTest(TestCase): + """ + Tests to ensure that the relational category tree functions correctly. + """ + + def setUp(self): + self.p1 = PartCategory.objects.create(name='A', + description='Most highest level', + parent=None) + + self.p2 = PartCategory.objects.create(name='B', + description='Sits under second', + parent=self.p1) + + self.p3 = PartCategory.objects.create(name='C', + description='Third tier category', + parent=self.p2) + + # Add two parts in p2 + Part.objects.create(name='Flange', category=self.p2) + Part.objects.create(name='Flob', category=self.p2) + + # Add one part in p3 + Part.objects.create(name='Blob', category=self.p3) + + def test_parents(self): + self.assertEqual(self.p1.parent, None) + self.assertEqual(self.p2.parent, self.p1) + self.assertEqual(self.p3.parent, self.p2) + + def test_children_count(self): + self.assertEqual(self.p1.has_children, True) + self.assertEqual(self.p2.has_children, True) + self.assertEqual(self.p3.has_children, False) + + def test_unique_childs(self): + childs = self.p1.getUniqueChildren() + + self.assertIn(self.p2.id, childs) + self.assertIn(self.p2.id, childs) + + def test_unique_parents(self): + parents = self.p2.getUniqueParents() + + self.assertIn(self.p1.id, parents) + + def test_path_string(self): + self.assertEqual(str(self.p3), 'A/B/C') + + def test_url(self): + self.assertEqual(self.p1.get_absolute_url(), '/part/category/1/') + + def test_part_count(self): + # No direct parts in the top-level category + self.assertEqual(self.p1.has_parts, False) + self.assertEqual(self.p2.has_parts, True) + self.assertEqual(self.p3.has_parts, True) + + self.assertEqual(self.p1.partcount, 3) + self.assertEqual(self.p2.partcount, 3) + self.assertEqual(self.p3.partcount, 1) \ No newline at end of file From 0bc561782570636f8de0c817839dc26ef000b92e Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 25 Apr 2019 00:59:34 +1000 Subject: [PATCH 4/9] Reverse url lookup for Part model --- InvenTree/part/models.py | 2 +- InvenTree/part/test_part.py | 22 ++++++++++++++++++++++ InvenTree/part/tests.py | 3 --- 3 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 InvenTree/part/test_part.py delete mode 100644 InvenTree/part/tests.py diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py index c9e4ae0500..81e05567bd 100644 --- a/InvenTree/part/models.py +++ b/InvenTree/part/models.py @@ -89,7 +89,7 @@ class Part(models.Model): """ def get_absolute_url(self): - return '/part/{id}/'.format(id=self.id) + return reverse('part-detail', kwargs={'pk': self.id}) # Short name of the part name = models.CharField(max_length=100, unique=True, help_text='Part name (must be unique)') diff --git a/InvenTree/part/test_part.py b/InvenTree/part/test_part.py new file mode 100644 index 0000000000..540c98bfa4 --- /dev/null +++ b/InvenTree/part/test_part.py @@ -0,0 +1,22 @@ +from django.test import TestCase + +from .models import Part, PartCategory + +class SimplePartTest(TestCase): + + def setUp(self): + + cat = PartCategory.objects.create(name='TLC', description='Top level category') + + self.px = Part.objects.create(name='x', description='A part called x', buildable=True) + self.py = Part.objects.create(name='y', description='A part called y', consumable=False) + self.pz = Part.objects.create(name='z', description='A part called z', category=cat) + + def test_metadata(self): + self.assertEqual(self.px.name, 'x') + self.assertEqual(self.py.get_absolute_url(), '/part/2/') + self.assertEqual(str(self.pz), 'z - A part called z') + + def test_category(self): + self.assertEqual(self.px.category_path, '') + self.assertEqual(self.pz.category_path, 'TLC') \ No newline at end of file diff --git a/InvenTree/part/tests.py b/InvenTree/part/tests.py deleted file mode 100644 index a79ca8be56..0000000000 --- a/InvenTree/part/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -# from django.test import TestCase - -# Create your tests here. From e6617fef8010ad51d5f83bd708adbf0d83ba0bca Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 25 Apr 2019 01:05:08 +1000 Subject: [PATCH 5/9] reverse URL lookup for BomItem and SupplierPart - created empty test files --- InvenTree/part/models.py | 4 ++-- InvenTree/part/test_bom_item.py | 10 ++++++++++ InvenTree/part/test_supplier_part.py | 9 +++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 InvenTree/part/test_bom_item.py create mode 100644 InvenTree/part/test_supplier_part.py diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py index 81e05567bd..6c9dc4ec54 100644 --- a/InvenTree/part/models.py +++ b/InvenTree/part/models.py @@ -337,7 +337,7 @@ class BomItem(models.Model): """ def get_absolute_url(self): - return '/part/bom/{id}/'.format(id=self.id) + return reverse('bom-detail', kwargs={'pk': self.id}) # A link to the parent part # Each part will get a reverse lookup field 'bom_items' @@ -386,7 +386,7 @@ class SupplierPart(models.Model): """ def get_absolute_url(self): - return "/supplier-part/{id}/".format(id=self.id) + return reverse('supplier-part-detail', kwargs={'pk': self.id}) class Meta: unique_together = ('part', 'supplier', 'SKU') diff --git a/InvenTree/part/test_bom_item.py b/InvenTree/part/test_bom_item.py new file mode 100644 index 0000000000..d519b4c4fe --- /dev/null +++ b/InvenTree/part/test_bom_item.py @@ -0,0 +1,10 @@ +from django.test import TestCase + +from .models import Part, BomItem + + +class BomItemTest(TestCase): + + def setUp(self): + pass + \ No newline at end of file diff --git a/InvenTree/part/test_supplier_part.py b/InvenTree/part/test_supplier_part.py new file mode 100644 index 0000000000..abdae9ed09 --- /dev/null +++ b/InvenTree/part/test_supplier_part.py @@ -0,0 +1,9 @@ +from django.test import TestCase + +from .models import Part, SupplierPart + + +class SupplierPartTest(TestCase): + + def setUp(self): + pass \ No newline at end of file From b45b63545ee1c8df9c4eea711d0641d91a3da48a Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 25 Apr 2019 03:12:41 +1000 Subject: [PATCH 6/9] Improved makefile - Separate make for coverage of testing - the 'test' option needs some work (have to pass all app names for some reason) --- .travis.yml | 2 +- Makefile | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index c386329854..cd2093c55a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ before_install: - make setup_ci script: - - make test + - make coverage - make style after_success: diff --git a/Makefile b/Makefile index 831ab4ff3a..cb51fabfa2 100644 --- a/Makefile +++ b/Makefile @@ -11,11 +11,8 @@ style: flake8 InvenTree --ignore=C901,E501 test: - # Perform Django system checks python InvenTree/manage.py check - - # Run the test framework (through coverage script) - coverage run InvenTree/manage.py test + python InvenTree/manage.py test build company part project stock supplier track migrate: python InvenTree/manage.py makemigrations company @@ -26,7 +23,6 @@ migrate: python InvenTree/manage.py check install: - # TODO: replace this with a proper setup.py pip install -U -r requirements/base.txt setup: install migrate @@ -34,5 +30,10 @@ setup: install migrate setup_ci: pip install -U -r requirements/build.txt +coverage: + python InvenTree/manage.py check + coverage run InvenTree/manage.py test build company part project stock supplier track + coverage html + superuser: python InvenTree/manage.py createsuperuser From 7c91c9ba799a3c4a5288bda2e627d45a9c78f211 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 25 Apr 2019 03:13:41 +1000 Subject: [PATCH 7/9] Reverse URL for stock models - stock location - stock item - stock tracking - Added blank test files --- InvenTree/stock/models.py | 7 ++++--- InvenTree/stock/test_stock_item.py | 4 ++++ InvenTree/stock/test_stock_location.py | 3 +++ InvenTree/stock/test_stock_tracking.py | 4 ++++ InvenTree/stock/tests.py | 3 --- 5 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 InvenTree/stock/test_stock_item.py create mode 100644 InvenTree/stock/test_stock_location.py create mode 100644 InvenTree/stock/test_stock_tracking.py delete mode 100644 InvenTree/stock/tests.py diff --git a/InvenTree/stock/models.py b/InvenTree/stock/models.py index 6af5b3d4b7..312bff9bbe 100644 --- a/InvenTree/stock/models.py +++ b/InvenTree/stock/models.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals from django.utils.translation import gettext_lazy as _ from django.core.exceptions import ValidationError +from django.urls import reverse from django.db import models, transaction from django.core.validators import MinValueValidator @@ -25,7 +26,7 @@ class StockLocation(InvenTreeTree): """ def get_absolute_url(self): - return '/stock/location/{id}/'.format(id=self.id) + return reverse('stock-location-detail', kwargs={'pk': self.id}) @property def stock_items(self): @@ -109,7 +110,7 @@ class StockItem(models.Model): }) def get_absolute_url(self): - return '/stock/item/{id}/'.format(id=self.id) + return reverse('stock-item-detail', kwargs={'pk': self.id}) class Meta: unique_together = [ @@ -331,7 +332,7 @@ class StockItemTracking(models.Model): """ def get_absolute_url(self): - return '/stock/track/{id}/'.format(id=self.id) + return reverse('stock-tracking-detail', kwargs={'pk': self.id}) # Stock item item = models.ForeignKey(StockItem, on_delete=models.CASCADE, diff --git a/InvenTree/stock/test_stock_item.py b/InvenTree/stock/test_stock_item.py new file mode 100644 index 0000000000..0b4501e258 --- /dev/null +++ b/InvenTree/stock/test_stock_item.py @@ -0,0 +1,4 @@ +from django.test import TestCase + +# Create your tests here. + diff --git a/InvenTree/stock/test_stock_location.py b/InvenTree/stock/test_stock_location.py new file mode 100644 index 0000000000..7ce503c2dd --- /dev/null +++ b/InvenTree/stock/test_stock_location.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/InvenTree/stock/test_stock_tracking.py b/InvenTree/stock/test_stock_tracking.py new file mode 100644 index 0000000000..0b4501e258 --- /dev/null +++ b/InvenTree/stock/test_stock_tracking.py @@ -0,0 +1,4 @@ +from django.test import TestCase + +# Create your tests here. + diff --git a/InvenTree/stock/tests.py b/InvenTree/stock/tests.py deleted file mode 100644 index a79ca8be56..0000000000 --- a/InvenTree/stock/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -# from django.test import TestCase - -# Create your tests here. From 7b68310d735dfd2ac399d22c501c63398528dab7 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 25 Apr 2019 03:20:25 +1000 Subject: [PATCH 8/9] PEP fixes --- InvenTree/InvenTree/models.py | 13 ++++------ InvenTree/build/tests.py | 3 --- InvenTree/company/tests.py | 2 +- InvenTree/part/forms.py | 36 +++++++++++++------------- InvenTree/part/test_bom_item.py | 3 --- InvenTree/part/test_category.py | 15 +++++------ InvenTree/part/test_part.py | 3 ++- InvenTree/part/test_supplier_part.py | 4 +-- InvenTree/part/urls.py | 20 -------------- InvenTree/stock/test_stock_item.py | 5 +++- InvenTree/stock/test_stock_location.py | 6 ++++- InvenTree/stock/test_stock_tracking.py | 5 +++- 12 files changed, 47 insertions(+), 68 deletions(-) diff --git a/InvenTree/InvenTree/models.py b/InvenTree/InvenTree/models.py index 7129a8599a..2b49f7b908 100644 --- a/InvenTree/InvenTree/models.py +++ b/InvenTree/InvenTree/models.py @@ -187,11 +187,8 @@ def FilterChildren(queryset, parent): elif str2bool(parent, False): return queryset.filter(parent=None) else: - try: - parent_id = int(parent) - if parent_id == 0: - return queryset.filter(parent=None) - else: - return queryset.filter(parent=parent_id) - except: - return queryset + parent_id = int(parent) + if parent_id == 0: + return queryset.filter(parent=None) + else: + return queryset.filter(parent=parent_id) diff --git a/InvenTree/build/tests.py b/InvenTree/build/tests.py index 43281c34b7..1918ce9b27 100644 --- a/InvenTree/build/tests.py +++ b/InvenTree/build/tests.py @@ -6,8 +6,6 @@ from django.test import TestCase from .models import Build from part.models import Part -# Create your tests here. - class BuildTestSimple(TestCase): @@ -56,4 +54,3 @@ class BuildTestSimple(TestCase): def test_required_parts(self): # TODO - Generate BOM for test part pass - \ No newline at end of file diff --git a/InvenTree/company/tests.py b/InvenTree/company/tests.py index f1aa580c12..925d9eb104 100644 --- a/InvenTree/company/tests.py +++ b/InvenTree/company/tests.py @@ -16,4 +16,4 @@ class CompanySimpleTest(TestCase): def test_company_model(self): c = Company.objects.get(pk=1) self.assertEqual(c.name, 'ABC Co.') - self.assertEqual(c.get_absolute_url(), '/company/1/') \ No newline at end of file + self.assertEqual(c.get_absolute_url(), '/company/1/') diff --git a/InvenTree/part/forms.py b/InvenTree/part/forms.py index 28d9941326..4d7d05bba1 100644 --- a/InvenTree/part/forms.py +++ b/InvenTree/part/forms.py @@ -89,21 +89,21 @@ class EditBomItemForm(HelperForm): class EditSupplierPartForm(HelperForm): - class Meta: - model = SupplierPart - fields = [ - 'supplier', - 'SKU', - 'part', - 'description', - 'URL', - 'manufacturer', - 'MPN', - 'note', - 'single_price', - 'base_cost', - 'multiple', - 'minimum', - 'packaging', - 'lead_time' - ] + class Meta: + model = SupplierPart + fields = [ + 'supplier', + 'SKU', + 'part', + 'description', + 'URL', + 'manufacturer', + 'MPN', + 'note', + 'single_price', + 'base_cost', + 'multiple', + 'minimum', + 'packaging', + 'lead_time' + ] diff --git a/InvenTree/part/test_bom_item.py b/InvenTree/part/test_bom_item.py index d519b4c4fe..e3d7aa78ce 100644 --- a/InvenTree/part/test_bom_item.py +++ b/InvenTree/part/test_bom_item.py @@ -1,10 +1,7 @@ from django.test import TestCase -from .models import Part, BomItem - class BomItemTest(TestCase): def setUp(self): pass - \ No newline at end of file diff --git a/InvenTree/part/test_category.py b/InvenTree/part/test_category.py index 34efa4b2d1..9fee29332c 100644 --- a/InvenTree/part/test_category.py +++ b/InvenTree/part/test_category.py @@ -1,7 +1,6 @@ from django.test import TestCase from .models import Part, PartCategory -from .models import rename_part_image class CategoryTest(TestCase): @@ -11,16 +10,16 @@ class CategoryTest(TestCase): def setUp(self): self.p1 = PartCategory.objects.create(name='A', - description='Most highest level', - parent=None) + description='Most highest level', + parent=None) self.p2 = PartCategory.objects.create(name='B', - description='Sits under second', - parent=self.p1) + description='Sits under second', + parent=self.p1) self.p3 = PartCategory.objects.create(name='C', - description='Third tier category', - parent=self.p2) + description='Third tier category', + parent=self.p2) # Add two parts in p2 Part.objects.create(name='Flange', category=self.p2) @@ -64,4 +63,4 @@ class CategoryTest(TestCase): self.assertEqual(self.p1.partcount, 3) self.assertEqual(self.p2.partcount, 3) - self.assertEqual(self.p3.partcount, 1) \ No newline at end of file + self.assertEqual(self.p3.partcount, 1) diff --git a/InvenTree/part/test_part.py b/InvenTree/part/test_part.py index 540c98bfa4..c9ed2fd7b3 100644 --- a/InvenTree/part/test_part.py +++ b/InvenTree/part/test_part.py @@ -2,6 +2,7 @@ from django.test import TestCase from .models import Part, PartCategory + class SimplePartTest(TestCase): def setUp(self): @@ -19,4 +20,4 @@ class SimplePartTest(TestCase): def test_category(self): self.assertEqual(self.px.category_path, '') - self.assertEqual(self.pz.category_path, 'TLC') \ No newline at end of file + self.assertEqual(self.pz.category_path, 'TLC') diff --git a/InvenTree/part/test_supplier_part.py b/InvenTree/part/test_supplier_part.py index abdae9ed09..c34b788257 100644 --- a/InvenTree/part/test_supplier_part.py +++ b/InvenTree/part/test_supplier_part.py @@ -1,9 +1,7 @@ from django.test import TestCase -from .models import Part, SupplierPart - class SupplierPartTest(TestCase): def setUp(self): - pass \ No newline at end of file + pass diff --git a/InvenTree/part/urls.py b/InvenTree/part/urls.py index 75d5041b9c..14a15625f9 100644 --- a/InvenTree/part/urls.py +++ b/InvenTree/part/urls.py @@ -70,23 +70,3 @@ part_urls = [ # Top level part list (display top level parts and categories) url(r'^.*$', views.PartIndex.as_view(), name='part-index'), ] - -""" -part_param_urls = [ - # Detail of a single part parameter - url(r'^(?P[0-9]+)/?$', views.PartParamDetail.as_view(), name='partparameter-detail'), - - # Parameters associated with a particular part - url(r'^\?.*/?$', views.PartParamList.as_view()), - url(r'^$', views.PartParamList.as_view()), -] - -part_param_template_urls = [ - # Detail of a single part field template - url(r'^(?P[0-9]+)/?$', views.PartTemplateDetail.as_view(), name='partparametertemplate-detail'), - - # List all part field templates - url(r'^\?.*/?$', views.PartTemplateList.as_view()), - url(r'^$', views.PartTemplateList.as_view()) -] -""" diff --git a/InvenTree/stock/test_stock_item.py b/InvenTree/stock/test_stock_item.py index 0b4501e258..becd6e4e69 100644 --- a/InvenTree/stock/test_stock_item.py +++ b/InvenTree/stock/test_stock_item.py @@ -1,4 +1,7 @@ from django.test import TestCase -# Create your tests here. +class StockItemTest(TestCase): + + def setUp(self): + pass diff --git a/InvenTree/stock/test_stock_location.py b/InvenTree/stock/test_stock_location.py index 7ce503c2dd..0a89aeed33 100644 --- a/InvenTree/stock/test_stock_location.py +++ b/InvenTree/stock/test_stock_location.py @@ -1,3 +1,7 @@ from django.test import TestCase -# Create your tests here. + +class StockLocationTest(TestCase): + + def setUp(self): + pass diff --git a/InvenTree/stock/test_stock_tracking.py b/InvenTree/stock/test_stock_tracking.py index 0b4501e258..15b79cbe66 100644 --- a/InvenTree/stock/test_stock_tracking.py +++ b/InvenTree/stock/test_stock_tracking.py @@ -1,4 +1,7 @@ from django.test import TestCase -# Create your tests here. +class StockTrackingTest(TestCase): + + def setUp(self): + pass From 6625d89eb2be642be56fea9450145258f0a7a837 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 25 Apr 2019 03:34:56 +1000 Subject: [PATCH 9/9] Remove references to apps that don't yet exist --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cb51fabfa2..9d5ec8a92a 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ style: test: python InvenTree/manage.py check - python InvenTree/manage.py test build company part project stock supplier track + python manage.py test build company part stock migrate: python InvenTree/manage.py makemigrations company @@ -32,7 +32,7 @@ setup_ci: coverage: python InvenTree/manage.py check - coverage run InvenTree/manage.py test build company part project stock supplier track + coverage run InvenTree/manage.py test build company part stock coverage html superuser: