From 773daedf8cd75d8c181477b5d4a2b91e73e57606 Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Wed, 24 Jan 2024 10:42:39 -0600 Subject: [PATCH] Revert "Update tests to use proxy model" This reverts commit 1d784cfe5d689a00ae3c75edc56ce226e62e8fc3. --- netbox/users/tests/test_api.py | 32 ++++++++++++--------- netbox/users/tests/test_filtersets.py | 39 ++++++++++++++------------ netbox/users/tests/test_models.py | 14 +++++---- netbox/users/tests/test_preferences.py | 6 ++-- 4 files changed, 51 insertions(+), 40 deletions(-) diff --git a/netbox/users/tests/test_api.py b/netbox/users/tests/test_api.py index b64351cdb..090ccc263 100644 --- a/netbox/users/tests/test_api.py +++ b/netbox/users/tests/test_api.py @@ -1,12 +1,16 @@ +from django.contrib.auth import get_user_model from django.contrib.auth.models import Group from django.contrib.contenttypes.models import ContentType from django.urls import reverse -from users.models import ObjectPermission, Token, NetBoxUser +from users.models import ObjectPermission, Token from utilities.testing import APIViewTestCases, APITestCase, create_test_user from utilities.utils import deepmerge +User = get_user_model() + + class AppTest(APITestCase): def test_root(self): @@ -18,7 +22,7 @@ class AppTest(APITestCase): class UserTest(APIViewTestCases.APIViewTestCase): - model = NetBoxUser + model = User view_namespace = 'users' brief_fields = ['display', 'id', 'url', 'username'] validation_excluded_fields = ['password'] @@ -44,11 +48,11 @@ class UserTest(APIViewTestCases.APIViewTestCase): def setUpTestData(cls): users = ( - NetBoxUser(username='User_1', password='password1'), - NetBoxUser(username='User_2', password='password2'), - NetBoxUser(username='User_3', password='password3'), + User(username='User_1', password='password1'), + User(username='User_2', password='password2'), + User(username='User_3', password='password3'), ) - NetBoxUser.objects.bulk_create(users) + User.objects.bulk_create(users) def test_that_password_is_changed(self): """ @@ -67,7 +71,7 @@ class UserTest(APIViewTestCases.APIViewTestCase): 'username': 'user1', 'password': 'abc123', } - user = NetBoxUser.objects.create_user(**user_credentials) + user = User.objects.create_user(**user_credentials) data = { 'password': 'newpassword' @@ -78,7 +82,7 @@ class UserTest(APIViewTestCases.APIViewTestCase): self.assertEqual(response.status_code, 200) - updated_user = NetBoxUser.objects.get(id=user.id) + updated_user = User.objects.get(id=user.id) self.assertTrue(updated_user.check_password(data['password'])) @@ -173,7 +177,7 @@ class TokenTest( 'username': 'user1', 'password': 'abc123', } - user = NetBoxUser.objects.create_user(**user_credentials) + user = User.objects.create_user(**user_credentials) data = { **user_credentials, @@ -212,7 +216,7 @@ class TokenTest( ObjectPermission.objects.filter(users=self.user).delete() self.add_permissions('users.add_token') - user2 = NetBoxUser.objects.create_user(username='testuser2') + user2 = User.objects.create_user(username='testuser2') data = { 'user': user2.id, } @@ -250,11 +254,11 @@ class ObjectPermissionTest( Group.objects.bulk_create(groups) users = ( - NetBoxUser(username='User 1', is_active=True), - NetBoxUser(username='User 2', is_active=True), - NetBoxUser(username='User 3', is_active=True), + User(username='User 1', is_active=True), + User(username='User 2', is_active=True), + User(username='User 3', is_active=True), ) - NetBoxUser.objects.bulk_create(users) + User.objects.bulk_create(users) object_type = ContentType.objects.get(app_label='dcim', model='device') diff --git a/netbox/users/tests/test_filtersets.py b/netbox/users/tests/test_filtersets.py index e02bdb391..38a0df813 100644 --- a/netbox/users/tests/test_filtersets.py +++ b/netbox/users/tests/test_filtersets.py @@ -1,17 +1,20 @@ import datetime +from django.contrib.auth import get_user_model from django.contrib.auth.models import Group from django.contrib.contenttypes.models import ContentType from django.test import TestCase from django.utils.timezone import make_aware from users import filtersets -from users.models import ObjectPermission, Token, NetBoxUser +from users.models import ObjectPermission, Token from utilities.testing import BaseFilterSetTests +User = get_user_model() + class UserTestCase(TestCase, BaseFilterSetTests): - queryset = NetBoxUser.objects.all() + queryset = User.objects.all() filterset = filtersets.UserFilterSet @classmethod @@ -25,7 +28,7 @@ class UserTestCase(TestCase, BaseFilterSetTests): Group.objects.bulk_create(groups) users = ( - NetBoxUser( + User( username='User1', first_name='Hank', last_name='Hill', @@ -33,32 +36,32 @@ class UserTestCase(TestCase, BaseFilterSetTests): is_staff=True, is_superuser=True ), - NetBoxUser( + User( username='User2', first_name='Dale', last_name='Gribble', email='dale@dalesdeadbug.com' ), - NetBoxUser( + User( username='User3', first_name='Bill', last_name='Dauterive', email='bill.dauterive@army.mil' ), - NetBoxUser( + User( username='User4', first_name='Jeff', last_name='Boomhauer', email='boomhauer@dangolemail.com' ), - NetBoxUser( + User( username='User5', first_name='Debbie', last_name='Grund', is_active=False ) ) - NetBoxUser.objects.bulk_create(users) + User.objects.bulk_create(users) users[0].groups.set([groups[0]]) users[1].groups.set([groups[1]]) @@ -142,11 +145,11 @@ class ObjectPermissionTestCase(TestCase, BaseFilterSetTests): Group.objects.bulk_create(groups) users = ( - NetBoxUser(username='User1'), - NetBoxUser(username='User2'), - NetBoxUser(username='User3'), + User(username='User1'), + User(username='User2'), + User(username='User3'), ) - NetBoxUser.objects.bulk_create(users) + User.objects.bulk_create(users) object_types = ( ContentType.objects.get(app_label='dcim', model='site'), @@ -189,7 +192,7 @@ class ObjectPermissionTestCase(TestCase, BaseFilterSetTests): self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_user(self): - users = NetBoxUser.objects.filter(username__in=['User1', 'User2']) + users = User.objects.filter(username__in=['User1', 'User2']) params = {'user_id': [users[0].pk, users[1].pk]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) params = {'user': [users[0].username, users[1].username]} @@ -229,11 +232,11 @@ class TokenTestCase(TestCase, BaseFilterSetTests): def setUpTestData(cls): users = ( - NetBoxUser(username='User1'), - NetBoxUser(username='User2'), - NetBoxUser(username='User3'), + User(username='User1'), + User(username='User2'), + User(username='User3'), ) - NetBoxUser.objects.bulk_create(users) + User.objects.bulk_create(users) future_date = make_aware(datetime.datetime(3000, 1, 1)) past_date = make_aware(datetime.datetime(2000, 1, 1)) @@ -249,7 +252,7 @@ class TokenTestCase(TestCase, BaseFilterSetTests): self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) def test_user(self): - users = NetBoxUser.objects.order_by('id')[:2] + users = User.objects.order_by('id')[:2] params = {'user_id': [users[0].pk, users[1].pk]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) params = {'user': [users[0].username, users[1].username]} diff --git a/netbox/users/tests/test_models.py b/netbox/users/tests/test_models.py index effaeb29a..791ea8fb4 100644 --- a/netbox/users/tests/test_models.py +++ b/netbox/users/tests/test_models.py @@ -1,6 +1,8 @@ +from django.contrib.auth import get_user_model from django.test import TestCase -from users.models import NetBoxUser + +User = get_user_model() class UserConfigTest(TestCase): @@ -8,7 +10,7 @@ class UserConfigTest(TestCase): @classmethod def setUpTestData(cls): - user = NetBoxUser.objects.create_user(username='testuser') + user = User.objects.create_user(username='testuser') user.config.data = { 'a': True, 'b': { @@ -30,7 +32,7 @@ class UserConfigTest(TestCase): user.config.save() def test_get(self): - userconfig = NetBoxUser.objects.get(username='testuser').config + userconfig = User.objects.get(username='testuser').config # Retrieve root and nested values self.assertEqual(userconfig.get('a'), True) @@ -50,7 +52,7 @@ class UserConfigTest(TestCase): self.assertEqual(userconfig.get('b.foo.x.invalid', 'DEFAULT'), 'DEFAULT') def test_all(self): - userconfig = NetBoxUser.objects.get(username='testuser').config + userconfig = User.objects.get(username='testuser').config flattened_data = { 'a': True, 'b.foo': 101, @@ -64,7 +66,7 @@ class UserConfigTest(TestCase): self.assertEqual(userconfig.all(), flattened_data) def test_set(self): - userconfig = NetBoxUser.objects.get(username='testuser').config + userconfig = User.objects.get(username='testuser').config # Overwrite existing values userconfig.set('a', 'abc') @@ -93,7 +95,7 @@ class UserConfigTest(TestCase): userconfig.set('a.x', 1) def test_clear(self): - userconfig = NetBoxUser.objects.get(username='testuser').config + userconfig = User.objects.get(username='testuser').config # Clear existing values userconfig.clear('a') diff --git a/netbox/users/tests/test_preferences.py b/netbox/users/tests/test_preferences.py index 6d0b73163..203a67bdd 100644 --- a/netbox/users/tests/test_preferences.py +++ b/netbox/users/tests/test_preferences.py @@ -5,7 +5,6 @@ from django.urls import reverse from dcim.models import Site from dcim.tables import SiteTable -from users.models import NetBoxUser from users.preferences import UserPreference from utilities.testing import TestCase @@ -17,6 +16,9 @@ DEFAULT_USER_PREFERENCES = { } +User = get_user_model() + + class UserPreferencesTest(TestCase): user_permissions = ['dcim.view_site'] @@ -40,7 +42,7 @@ class UserPreferencesTest(TestCase): @override_settings(DEFAULT_USER_PREFERENCES=DEFAULT_USER_PREFERENCES) def test_default_preferences(self): - user = NetBoxUser.objects.create(username='User 1') + user = User.objects.create(username='User 1') userconfig = user.config self.assertEqual(userconfig.data, DEFAULT_USER_PREFERENCES)