From 363baea829a08b28c3af7b4d295792b06a2acaf8 Mon Sep 17 00:00:00 2001 From: Hayden Date: Sat, 23 Jan 2021 19:50:03 -0900 Subject: [PATCH] test: fixed migration routes --- mealie/models/migration_models.py | 3 ++- mealie/routes/migration_routes.py | 3 ++- mealie/tests/test_routes/test_migration_routes.py | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mealie/models/migration_models.py b/mealie/models/migration_models.py index 28678996b..6f6c8d5ca 100644 --- a/mealie/models/migration_models.py +++ b/mealie/models/migration_models.py @@ -1,4 +1,5 @@ from datetime import datetime +from typing import List from pydantic.main import BaseModel @@ -21,4 +22,4 @@ class MigrationFile(BaseModel): class Migrations(BaseModel): type: str - files: list[MigrationFile] = [] + files: List[MigrationFile] = [] diff --git a/mealie/routes/migration_routes.py b/mealie/routes/migration_routes.py index 385720815..d06203c73 100644 --- a/mealie/routes/migration_routes.py +++ b/mealie/routes/migration_routes.py @@ -1,5 +1,6 @@ import operator import shutil +from typing import List from app_config import MIGRATION_DIR from db.db_setup import generate_session @@ -13,7 +14,7 @@ from utils.snackbar import SnackResponse router = APIRouter(tags=["Migration"]) -@router.get("/api/migrations/", response_model=list[Migrations]) +@router.get("/api/migrations/", response_model=List[Migrations]) def get_avaiable_nextcloud_imports(): """ Returns a list of avaiable directories that can be imported into Mealie """ response_data = [] diff --git a/mealie/tests/test_routes/test_migration_routes.py b/mealie/tests/test_routes/test_migration_routes.py index e7f4269b9..e74950e82 100644 --- a/mealie/tests/test_routes/test_migration_routes.py +++ b/mealie/tests/test_routes/test_migration_routes.py @@ -36,17 +36,17 @@ def nextcloud_zip(): def test_upload_nextcloud_zip(api_client, nextcloud_zip): response = api_client.post( - "/api/migration/upload/", files={"archive": nextcloud_zip.open("rb")} + "/api/migrations/nextcloud/upload/", files={"archive": nextcloud_zip.open("rb")} ) assert response.status_code == 200 - assert MIGRATION_DIR.joinpath(nextcloud_zip.name).is_file() + assert MIGRATION_DIR.joinpath("nextcloud", nextcloud_zip.name).is_file() def test_import_nextcloud_directory(api_client, nextcloud_zip): selection = nextcloud_zip.name - response = api_client.post(f"/api/migration/nextcloud/{selection}/import/") + response = api_client.post(f"/api/migrations/nextcloud/{selection}/import/") assert response.status_code == 200 @@ -60,7 +60,7 @@ def test_import_nextcloud_directory(api_client, nextcloud_zip): def test_delete_migration_data(api_client, nextcloud_zip): selection = nextcloud_zip.name - response = api_client.delete(f"/api/migration/{selection}/delete/") + response = api_client.delete(f"/api/migrations/nextcloud/{selection}/delete/") assert response.status_code == 200 assert not MIGRATION_DIR.joinpath(nextcloud_zip.name).is_file()