From 4f830c9c22595194e19e19fc64b1085415da23bb Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 5 Jun 2020 16:09:55 -0400 Subject: [PATCH] Fix list_brief tests --- netbox/dcim/api/nested_serializers.py | 1 + netbox/dcim/tests/test_api.py | 3 ++- netbox/extras/tests/test_api.py | 7 +++++-- netbox/ipam/tests/test_api.py | 1 + 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/netbox/dcim/api/nested_serializers.py b/netbox/dcim/api/nested_serializers.py index a8d413d37..83fcd7a2a 100644 --- a/netbox/dcim/api/nested_serializers.py +++ b/netbox/dcim/api/nested_serializers.py @@ -302,6 +302,7 @@ class NestedDeviceBaySerializer(WritableNestedSerializer): class NestedInventoryItemSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:inventoryitem-detail') + device = NestedDeviceSerializer(read_only=True) class Meta: model = models.InventoryItem diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index 1733deecc..6c6b75c7f 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -289,6 +289,7 @@ class RackTest(APIViewTestCases.APIViewTestCase): class RackReservationTest(APIViewTestCases.APIViewTestCase): model = RackReservation + brief_fields = ['id', 'units', 'url', 'user'] @classmethod def setUpTestData(cls): @@ -1303,7 +1304,7 @@ class DeviceBayTest(APIViewTestCases.APIViewTestCase): class InventoryItemTest(APIViewTestCases.APIViewTestCase): model = InventoryItem - brief_fields = ['id', 'name', 'url'] + brief_fields = ['device', 'id', 'name', 'url'] @classmethod def setUpTestData(cls): diff --git a/netbox/extras/tests/test_api.py b/netbox/extras/tests/test_api.py index cf4c20624..2635fbbdc 100644 --- a/netbox/extras/tests/test_api.py +++ b/netbox/extras/tests/test_api.py @@ -5,11 +5,10 @@ from django.urls import reverse from django.utils import timezone from rest_framework import status -from dcim.models import Device, DeviceRole, DeviceType, Manufacturer, Platform, Rack, RackGroup, RackRole, Region, Site +from dcim.models import Device, DeviceRole, DeviceType, Manufacturer, Rack, RackGroup, RackRole, Site from extras.api.views import ScriptViewSet from extras.models import ConfigContext, Graph, ExportTemplate, Tag from extras.scripts import BooleanVar, IntegerVar, Script, StringVar -from tenancy.models import Tenant, TenantGroup from utilities.testing import APITestCase, APIViewTestCases @@ -25,6 +24,7 @@ class AppTest(APITestCase): class GraphTest(APIViewTestCases.APIViewTestCase): model = Graph + brief_fields = ['id', 'name', 'url'] create_data = [ { 'type': 'dcim.site', @@ -57,6 +57,7 @@ class GraphTest(APIViewTestCases.APIViewTestCase): class ExportTemplateTest(APIViewTestCases.APIViewTestCase): model = ExportTemplate + brief_fields = ['id', 'name', 'url'] create_data = [ { 'content_type': 'dcim.device', @@ -101,6 +102,7 @@ class ExportTemplateTest(APIViewTestCases.APIViewTestCase): class TagTest(APIViewTestCases.APIViewTestCase): model = Tag + brief_fields = ['color', 'id', 'name', 'slug', 'tagged_items', 'url'] create_data = [ { 'name': 'Tag 4', @@ -129,6 +131,7 @@ class TagTest(APIViewTestCases.APIViewTestCase): class ConfigContextTest(APIViewTestCases.APIViewTestCase): model = ConfigContext + brief_fields = ['id', 'name', 'url'] create_data = [ { 'name': 'Config Context 4', diff --git a/netbox/ipam/tests/test_api.py b/netbox/ipam/tests/test_api.py index 06c1f41df..a5cb76953 100644 --- a/netbox/ipam/tests/test_api.py +++ b/netbox/ipam/tests/test_api.py @@ -424,6 +424,7 @@ class VLANTest(APIViewTestCases.APIViewTestCase): class ServiceTest(APIViewTestCases.APIViewTestCase): model = Service + brief_fields = ['id', 'name', 'port', 'protocol', 'url'] @classmethod def setUpTestData(cls):