mirrors/django-components
1
0
Fork 0
mirror of https://github.com/django-components/django-components.git synced 2025-08-09 16:57:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: autoimport with nested apps (#672)

Browse source 
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
Juro Oravec 2024-09-14 22:47:30 +02:00 • committed by GitHub
parent 6b3c112968
commit ee9b92975a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 218 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

27
tests/test_autodiscover.py
View file

@ -29,14 +29,19 @@ class TestAutodiscover(_TestCase):
self.assertNotIn("relative_file_pathobj_component", all_components)
try:
modules = autodiscover(map_module=lambda p: "tests." + p)
modules = autodiscover(map_module=lambda p: "tests." + p if p.startswith("components") else p)
except AlreadyRegistered:
self.fail("Autodiscover should not raise AlreadyRegistered exception")
self.assertIn("tests.components", modules)
self.assertIn("tests.components.single_file", modules)
self.assertIn("tests.components.staticfiles.staticfiles", modules)
self.assertIn("tests.components.multi_file.multi_file", modules)
self.assertIn("tests.components.relative_file_pathobj.relative_file_pathobj", modules)
self.assertIn("tests.components.relative_file.relative_file", modules)
self.assertIn("tests.test_app.components.app_lvl_comp.app_lvl_comp", modules)
self.assertIn("django_components.components", modules)
self.assertIn("django_components.components.dynamic", modules)
all_components = registry.all().copy()
self.assertIn("single_file_component", all_components)
@ -48,11 +53,7 @@ class TestAutodiscover(_TestCase):
class TestImportLibraries(_TestCase):
def test_import_libraries(self):
# Prepare settings
setup_test_config(
{
"autodiscover": False,
}
)
setup_test_config({"autodiscover": False})
settings.COMPONENTS["libraries"] = ["tests.components.single_file", "tests.components.multi_file.multi_file"]
# Ensure we start with a clean state
@ -103,7 +104,7 @@ class TestImportLibraries(_TestCase):
del sys.modules["tests.components.multi_file.multi_file"]
try:
modules = import_libraries(map_module=lambda p: "tests." + p)
modules = import_libraries(map_module=lambda p: "tests." + p if p.startswith("components") else p)
except AlreadyRegistered:
self.fail("Autodiscover should not raise AlreadyRegistered exception")
@ -123,13 +124,13 @@ class TestFilepathToPythonModule(_TestCase):
the_path = os.path.join(base_path, "tests.py")
self.assertEqual(
_filepath_to_python_module(the_path),
_filepath_to_python_module(the_path, base_path, None),
"tests",
)
the_path = os.path.join(base_path, "tests/components/relative_file/relative_file.py")
self.assertEqual(
_filepath_to_python_module(the_path),
_filepath_to_python_module(the_path, base_path, None),
"tests.components.relative_file.relative_file",
)
@ -139,13 +140,13 @@ class TestFilepathToPythonModule(_TestCase):
with mock.patch("os.path.sep", new="//"):
the_path = os.path.join(base_path, "tests.py")
self.assertEqual(
_filepath_to_python_module(the_path),
_filepath_to_python_module(the_path, base_path, None),
"tests",
)
the_path = os.path.join(base_path, "tests//components//relative_file//relative_file.py")
self.assertEqual(
_filepath_to_python_module(the_path),
_filepath_to_python_module(the_path, base_path, None),
"tests.components.relative_file.relative_file",
)
@ -153,12 +154,12 @@ class TestFilepathToPythonModule(_TestCase):
with mock.patch("os.path.sep", new="\\"):
the_path = os.path.join(base_path, "tests.py")
self.assertEqual(
_filepath_to_python_module(the_path),
_filepath_to_python_module(the_path, base_path, None),
"tests",
)
the_path = os.path.join(base_path, "tests\\components\\relative_file\\relative_file.py")
self.assertEqual(
_filepath_to_python_module(the_path),
_filepath_to_python_module(the_path, base_path, None),
"tests.components.relative_file.relative_file",
)