2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-28 19:46:46 +00:00

Merge branch 'webp-support' of https://github.com/matmair/InvenTree into webp-support

This commit is contained in:
Matthias 2022-05-18 01:58:44 +02:00
commit dc4affb3c5
No known key found for this signature in database
GPG Key ID: AB6D0E6C4CB65093

View File

@ -1,6 +1,6 @@
import json import json
from test import support from unittest import mock
from django.test import TestCase, override_settings from django.test import TestCase, override_settings
import django.core.exceptions as django_exceptions import django.core.exceptions as django_exceptions
@ -450,17 +450,16 @@ class TestSettings(TestCase):
def setUp(self) -> None: def setUp(self) -> None:
self.user_mdl = get_user_model() self.user_mdl = get_user_model()
self.env = support.EnvironmentVarGuard()
# Create a user for auth # Create a user for auth
user = get_user_model() user = get_user_model()
self.user = user.objects.create_superuser('testuser1', 'test1@testing.com', 'password1') self.user = user.objects.create_superuser('testuser1', 'test1@testing.com', 'password1')
self.client.login(username='testuser1', password='password1') self.client.login(username='testuser1', password='password1')
def run_reload(self): def run_reload(self, envs):
from plugin import registry from plugin import registry
with self.env: with mock.patch.dict(os.environ, envs):
settings.USER_ADDED = False settings.USER_ADDED = False
registry.reload_plugins() registry.reload_plugins()
@ -476,26 +475,19 @@ class TestSettings(TestCase):
self.assertEqual(user_count(), 1) self.assertEqual(user_count(), 1)
# not enough set # not enough set
self.env.set('INVENTREE_ADMIN_USER', 'admin') # set username envs = {}
self.run_reload() envs['INVENTREE_ADMIN_USER'] = 'admin'
self.assertEqual(user_count(), 1) self.run_reload(envs)
self.assertEqual(user_count(), 0)
# enough set # enough set
self.env.set('INVENTREE_ADMIN_USER', 'admin') # set username envs = {
self.env.set('INVENTREE_ADMIN_EMAIL', 'info@example.com') # set email 'INVENTREE_ADMIN_USER': 'admin', # set username
self.env.set('INVENTREE_ADMIN_PASSWORD', 'password123') # set password 'INVENTREE_ADMIN_EMAIL': 'info@example.com', # set email
self.run_reload() 'INVENTREE_ADMIN_PASSWORD': 'password123' # set password
self.assertEqual(user_count(), 2) }
self.run_reload(envs)
# create user manually self.assertEqual(user_count(), 1)
self.user_mdl.objects.create_user('testuser', 'test@testing.com', 'password')
self.assertEqual(user_count(), 3)
# check it will not be created again
self.env.set('INVENTREE_ADMIN_USER', 'testuser')
self.env.set('INVENTREE_ADMIN_EMAIL', 'test@testing.com')
self.env.set('INVENTREE_ADMIN_PASSWORD', 'password')
self.run_reload()
self.assertEqual(user_count(), 3)
# make sure to clean up # make sure to clean up
settings.TESTING_ENV = False settings.TESTING_ENV = False