Skip to content

Commit e2d13ac

Browse files
committed
fix: correctly load resursive config value from file
1 parent b5bb6d6 commit e2d13ac

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

src/twyn/config/config_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def resolve_config(
101101
final_use_cache = DEFAULT_USE_CACHE
102102

103103
if recursive is not None:
104-
final_recursive = use_cache
104+
final_recursive = recursive
105105
elif read_config.recursive is not None:
106106
final_recursive = read_config.recursive
107107
else:

tests/main/test_main.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,12 @@
1717
from twyn.main import (
1818
check_dependencies,
1919
)
20-
from twyn.trusted_packages import TopPyPiReference
2120
from twyn.trusted_packages.exceptions import InvalidArgumentsError
2221
from twyn.trusted_packages.models import (
2322
TyposquatCheckResultEntry,
2423
TyposquatCheckResultFromSource,
2524
TyposquatCheckResults,
2625
)
27-
from twyn.trusted_packages.references.top_npm_reference import TopNpmReference
2826

2927
from tests.conftest import create_tmp_file, patch_npm_packages_download
3028

@@ -39,9 +37,10 @@ class TestCheckDependencies:
3937
"selector_method": "first-letter",
4038
"dependency_file": {"requirements.txt"},
4139
"use_cache": True,
42-
"recurisve": True,
40+
"recursive": True,
4341
"pypi_source": "pypi",
4442
"npm_source": "npm",
43+
"package_ecosystem": "pypi",
4544
},
4645
{
4746
"selector_method": "nearby-letter",
@@ -81,7 +80,7 @@ class TestCheckDependencies:
8180
pypi_source="pypi",
8281
npm_source="npm",
8382
use_cache=False,
84-
package_ecosystem="pypi",
83+
package_ecosystem=None,
8584
recursive=True,
8685
),
8786
), # Config from file takes precendence over fallback values
@@ -92,10 +91,10 @@ class TestCheckDependencies:
9291
dependency_files=set(),
9392
selector_method="all",
9493
allowlist=set(),
95-
pypi_source=TopPyPiReference.DEFAULT_SOURCE,
96-
npm_source=TopNpmReference.DEFAULT_SOURCE,
94+
pypi_source=None,
95+
npm_source=None,
9796
use_cache=True,
98-
package_ecosystem="pypi",
97+
package_ecosystem=None,
9998
recursive=False,
10099
),
101100
), # Fallback values
@@ -123,12 +122,16 @@ def test_options_priorities_assignation(
123122
selector_method=cli_config.get("selector_method"),
124123
dependency_files=cli_config.get("dependency_file", set()),
125124
use_cache=cli_config.get("use_cache"),
125+
recursive=cli_config.get("recursive"),
126+
package_ecosystem=cli_config.get("package_ecosystem"),
126127
)
127128

128129
assert resolved.dependency_files == expected_resolved_config.dependency_files
129130
assert resolved.selector_method == expected_resolved_config.selector_method
130131
assert resolved.allowlist == expected_resolved_config.allowlist
131132
assert resolved.use_cache == expected_resolved_config.use_cache
133+
assert resolved.package_ecosystem == expected_resolved_config.package_ecosystem
134+
assert resolved.recursive == expected_resolved_config.recursive
132135

133136
@patch("twyn.trusted_packages.TopPyPiReference.get_packages")
134137
def test_check_dependencies_detects_typosquats_from_file(

0 commit comments

Comments
 (0)