NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-26 17:26:10 -06:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

#9047 - Fix tests

Browse Source
This commit is contained in:
Daniel Sheppard 2023-03-22 10:03:19 -05:00
parent 1b6e67ba0a
commit 9e129b0ebf
4 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
netbox/circuits/forms/bulk_edit.py
View File

@ -45,14 +45,25 @@ class ProviderBulkEditForm(NetBoxModelBulkEditForm):
class ProviderAccountBulkEditForm(NetBoxModelBulkEditForm): class ProviderAccountBulkEditForm(NetBoxModelBulkEditForm):
provider = DynamicModelChoiceField(
queryset=Provider.objects.all(),
required=False
)
description = forms.CharField(
max_length=200,
required=False
)
comments = CommentField( comments = CommentField(
widget=SmallTextarea, widget=SmallTextarea,
label=_('Comments') label=_('Comments')
) )
model = ProviderAccount model = ProviderAccount
fieldsets = () fieldsets = (
(None, ('provider', 'description')),
)
nullable_fields = ( nullable_fields = (
'description',
'comments', 'comments',
) )

4
netbox/circuits/tests/test_api.py
View File

@ -20,7 +20,7 @@ class ProviderTest(APIViewTestCases.APIViewTestCase):
model = Provider model = Provider
brief_fields = ['circuit_count', 'display', 'id', 'name', 'slug', 'url'] brief_fields = ['circuit_count', 'display', 'id', 'name', 'slug', 'url']
bulk_update_data = { bulk_update_data = {
'account': '1234', 'comments': 'New comments',
} }
@classmethod @classmethod
@ -199,7 +199,7 @@ class CircuitTerminationTest(APIViewTestCases.APIViewTestCase):
class ProviderAccountTest(APIViewTestCases.APIViewTestCase): class ProviderAccountTest(APIViewTestCases.APIViewTestCase):
model = ProviderAccount model = ProviderAccount
brief_fields = ['display', 'id', 'name', 'url'] brief_fields = ['account', 'display', 'id', 'name', 'url']
@classmethod @classmethod
def setUpTestData(cls): def setUpTestData(cls):

14
netbox/circuits/tests/test_filtersets.py
View File

@ -25,11 +25,11 @@ class ProviderTestCase(TestCase, ChangeLoggedFilterSetTests):
ASN.objects.bulk_create(asns) ASN.objects.bulk_create(asns)
providers = ( providers = (
Provider(name='Provider 1', slug='provider-1', account='1234'), Provider(name='Provider 1', slug='provider-1'),
Provider(name='Provider 2', slug='provider-2', account='2345'), Provider(name='Provider 2', slug='provider-2'),
Provider(name='Provider 3', slug='provider-3', account='3456'), Provider(name='Provider 3', slug='provider-3'),
Provider(name='Provider 4', slug='provider-4', account='4567'), Provider(name='Provider 4', slug='provider-4'),
Provider(name='Provider 5', slug='provider-5', account='5678'), Provider(name='Provider 5', slug='provider-5'),
) )
Provider.objects.bulk_create(providers) Provider.objects.bulk_create(providers)
providers[0].asns.set([asns[0]]) providers[0].asns.set([asns[0]])
@ -87,10 +87,6 @@ class ProviderTestCase(TestCase, ChangeLoggedFilterSetTests):
params = {'asn_id': [asns[0].pk, asns[1].pk]} params = {'asn_id': [asns[0].pk, asns[1].pk]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
def test_account(self):
params = {'account': ['1234', '2345']}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
def test_region(self): def test_region(self):
regions = Region.objects.all()[:2] regions = Region.objects.all()[:2]
params = {'region_id': [regions[0].pk, regions[1].pk]} params = {'region_id': [regions[0].pk, regions[1].pk]}

2
netbox/circuits/tests/test_views.py
View File

@ -38,7 +38,6 @@ class ProviderTestCase(ViewTestCases.PrimaryObjectViewTestCase):
'name': 'Provider X', 'name': 'Provider X',
'slug': 'provider-x', 'slug': 'provider-x',
'asns': [asns[6].pk, asns[7].pk], 'asns': [asns[6].pk, asns[7].pk],
'account': '1234',
'comments': 'Another provider', 'comments': 'Another provider',
'tags': [t.pk for t in tags], 'tags': [t.pk for t in tags],
} }
@ -58,7 +57,6 @@ class ProviderTestCase(ViewTestCases.PrimaryObjectViewTestCase):
) )
cls.bulk_edit_data = { cls.bulk_edit_data = {
'account': '5678',
'comments': 'New comments', 'comments': 'New comments',
} }