Skip to content

Commit 069cc6a

Browse files
committed
fix test with EXTENSION_FOLDER_PATH
1 parent 35ead1d commit 069cc6a

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/opengeodeweb_back/routes/blueprint_routes.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,6 @@ def import_extension() -> flask.Response:
526526
extensions_folder = flask.current_app.config["EXTENSIONS_FOLDER_PATH"]
527527
os.makedirs(extensions_folder, exist_ok=True)
528528

529-
# Extract extension name from filename (e.g., "vease-modeling-0.0.0.vext" -> "vease-modeling")
530529
extension_name = (
531530
filename.rsplit("-", 1)[0] if "-" in filename else filename.replace(".vext", "")
532531
)
@@ -558,17 +557,14 @@ def import_extension() -> flask.Response:
558557
if file.endswith(".es.js"):
559558
frontend_file = file_path
560559
elif not file.endswith(".js") and not file.endswith(".css"):
561-
# Assume it's the backend executable
562560
backend_executable = file_path
563-
# Make it executable
564561
os.chmod(backend_executable, 0o755)
565562

566563
if not frontend_file:
567564
flask.abort(400, "Invalid .vext file: missing frontend JavaScript")
568565
if not backend_executable:
569566
flask.abort(400, "Invalid .vext file: missing backend executable")
570567

571-
# Read the frontend JS content
572568
assert frontend_file is not None
573569
with open(frontend_file, "r", encoding="utf-8") as f:
574570
frontend_content = f.read()

tests/test_models_routes.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,10 @@ def test_import_extension_route(client: FlaskClient, tmp_path: Path) -> None:
191191
"""Test importing a .vext extension file."""
192192
route = "/opengeodeweb_back/import_extension"
193193
original_data_folder = client.application.config["DATA_FOLDER_PATH"]
194-
client.application.config["DATA_FOLDER_PATH"] = os.path.join(
195-
str(tmp_path), "extension_test_data"
194+
new_data_folder = os.path.join(str(tmp_path), "extension_test_data")
195+
client.application.config["DATA_FOLDER_PATH"] = new_data_folder
196+
client.application.config["EXTENSIONS_FOLDER_PATH"] = os.path.join(
197+
new_data_folder, "extensions"
196198
)
197199
vext_path = tmp_path / "test-extension-1.0.0.vext"
198200
with zipfile.ZipFile(vext_path, "w", compression=zipfile.ZIP_DEFLATED) as zipf:
@@ -238,8 +240,10 @@ def test_import_extension_invalid_file(client: FlaskClient, tmp_path: Path) -> N
238240
"""Test importing an invalid .vext file (missing dist folder)."""
239241
route = "/opengeodeweb_back/import_extension"
240242
original_data_folder = client.application.config["DATA_FOLDER_PATH"]
241-
client.application.config["DATA_FOLDER_PATH"] = os.path.join(
242-
str(tmp_path), "extension_invalid_test"
243+
new_data_folder = os.path.join(str(tmp_path), "extension_invalid_test")
244+
client.application.config["DATA_FOLDER_PATH"] = new_data_folder
245+
client.application.config["EXTENSIONS_FOLDER_PATH"] = os.path.join(
246+
new_data_folder, "extensions"
243247
)
244248
vext_path = tmp_path / "invalid-extension.vext"
245249
with zipfile.ZipFile(vext_path, "w") as zipf:

0 commit comments

Comments
 (0)