mirror of
https://github.com/inventree/InvenTree.git
synced 2025-04-30 20:46:47 +00:00
parent
71eb2814d4
commit
728e0894aa
@ -32,7 +32,7 @@ from common.currency import currency_codes
|
|||||||
from common.models import CustomUnit, InvenTreeSetting
|
from common.models import CustomUnit, InvenTreeSetting
|
||||||
from InvenTree.helpers_mixin import ClassProviderMixin, ClassValidationMixin
|
from InvenTree.helpers_mixin import ClassProviderMixin, ClassValidationMixin
|
||||||
from InvenTree.sanitizer import sanitize_svg
|
from InvenTree.sanitizer import sanitize_svg
|
||||||
from InvenTree.unit_test import InvenTreeTestCase
|
from InvenTree.unit_test import InvenTreeTestCase, in_env_context
|
||||||
from part.models import Part, PartCategory
|
from part.models import Part, PartCategory
|
||||||
from stock.models import StockItem, StockLocation
|
from stock.models import StockItem, StockLocation
|
||||||
|
|
||||||
@ -1121,10 +1121,6 @@ class TestSettings(InvenTreeTestCase):
|
|||||||
|
|
||||||
superuser = True
|
superuser = True
|
||||||
|
|
||||||
def in_env_context(self, envs):
|
|
||||||
"""Patch the env to include the given dict."""
|
|
||||||
return mock.patch.dict(os.environ, envs)
|
|
||||||
|
|
||||||
def run_reload(self, envs=None):
|
def run_reload(self, envs=None):
|
||||||
"""Helper function to reload InvenTree."""
|
"""Helper function to reload InvenTree."""
|
||||||
# Set default - see B006
|
# Set default - see B006
|
||||||
@ -1133,7 +1129,7 @@ class TestSettings(InvenTreeTestCase):
|
|||||||
|
|
||||||
from plugin import registry
|
from plugin import registry
|
||||||
|
|
||||||
with self.in_env_context(envs):
|
with in_env_context(envs):
|
||||||
settings.USER_ADDED = False
|
settings.USER_ADDED = False
|
||||||
registry.reload_plugins()
|
registry.reload_plugins()
|
||||||
|
|
||||||
@ -1198,7 +1194,7 @@ class TestSettings(InvenTreeTestCase):
|
|||||||
)
|
)
|
||||||
|
|
||||||
# with env set
|
# with env set
|
||||||
with self.in_env_context({
|
with in_env_context({
|
||||||
'INVENTREE_CONFIG_FILE': '_testfolder/my_special_conf.yaml'
|
'INVENTREE_CONFIG_FILE': '_testfolder/my_special_conf.yaml'
|
||||||
}):
|
}):
|
||||||
self.assertIn(
|
self.assertIn(
|
||||||
@ -1217,7 +1213,7 @@ class TestSettings(InvenTreeTestCase):
|
|||||||
)
|
)
|
||||||
|
|
||||||
# with env set
|
# with env set
|
||||||
with self.in_env_context({
|
with in_env_context({
|
||||||
'INVENTREE_PLUGIN_FILE': '_testfolder/my_special_plugins.txt'
|
'INVENTREE_PLUGIN_FILE': '_testfolder/my_special_plugins.txt'
|
||||||
}):
|
}):
|
||||||
self.assertIn(
|
self.assertIn(
|
||||||
@ -1231,7 +1227,7 @@ class TestSettings(InvenTreeTestCase):
|
|||||||
self.assertEqual(config.get_setting(TEST_ENV_NAME, None, '123!'), '123!')
|
self.assertEqual(config.get_setting(TEST_ENV_NAME, None, '123!'), '123!')
|
||||||
|
|
||||||
# with env set
|
# with env set
|
||||||
with self.in_env_context({TEST_ENV_NAME: '321'}):
|
with in_env_context({TEST_ENV_NAME: '321'}):
|
||||||
self.assertEqual(config.get_setting(TEST_ENV_NAME, None), '321')
|
self.assertEqual(config.get_setting(TEST_ENV_NAME, None), '321')
|
||||||
|
|
||||||
# test typecasting to dict - None should be mapped to empty dict
|
# test typecasting to dict - None should be mapped to empty dict
|
||||||
@ -1240,13 +1236,13 @@ class TestSettings(InvenTreeTestCase):
|
|||||||
)
|
)
|
||||||
|
|
||||||
# test typecasting to dict - valid JSON string should be mapped to corresponding dict
|
# test typecasting to dict - valid JSON string should be mapped to corresponding dict
|
||||||
with self.in_env_context({TEST_ENV_NAME: '{"a": 1}'}):
|
with in_env_context({TEST_ENV_NAME: '{"a": 1}'}):
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
config.get_setting(TEST_ENV_NAME, None, typecast=dict), {'a': 1}
|
config.get_setting(TEST_ENV_NAME, None, typecast=dict), {'a': 1}
|
||||||
)
|
)
|
||||||
|
|
||||||
# test typecasting to dict - invalid JSON string should be mapped to empty dict
|
# test typecasting to dict - invalid JSON string should be mapped to empty dict
|
||||||
with self.in_env_context({TEST_ENV_NAME: "{'a': 1}"}):
|
with in_env_context({TEST_ENV_NAME: "{'a': 1}"}):
|
||||||
self.assertEqual(config.get_setting(TEST_ENV_NAME, None, typecast=dict), {})
|
self.assertEqual(config.get_setting(TEST_ENV_NAME, None, typecast=dict), {})
|
||||||
|
|
||||||
|
|
||||||
|
@ -3,10 +3,12 @@
|
|||||||
import csv
|
import csv
|
||||||
import io
|
import io
|
||||||
import json
|
import json
|
||||||
|
import os
|
||||||
import re
|
import re
|
||||||
import time
|
import time
|
||||||
from contextlib import contextmanager
|
from contextlib import contextmanager
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
from unittest import mock
|
||||||
|
|
||||||
from django.contrib.auth import get_user_model
|
from django.contrib.auth import get_user_model
|
||||||
from django.contrib.auth.models import Group, Permission
|
from django.contrib.auth.models import Group, Permission
|
||||||
@ -601,3 +603,8 @@ class AdminTestCase(InvenTreeAPITestCase):
|
|||||||
self.assertEqual(response.status_code, 200)
|
self.assertEqual(response.status_code, 200)
|
||||||
|
|
||||||
return obj
|
return obj
|
||||||
|
|
||||||
|
|
||||||
|
def in_env_context(envs):
|
||||||
|
"""Patch the env to include the given dict."""
|
||||||
|
return mock.patch.dict(os.environ, envs)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user