From 8e0e5161084aa009c77d88392b82189bd6ebf685 Mon Sep 17 00:00:00 2001 From: hay-kot Date: Sat, 27 Mar 2021 12:39:17 -0800 Subject: [PATCH] general cleanup --- mealie/schema/backup.py | 8 ++++---- tests/conftest.py | 4 ---- tests/test_routes/test_import_routes.py | 25 +++++++++++++++++++++++++ tests/utils.py | 0 4 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 tests/test_routes/test_import_routes.py delete mode 100644 tests/utils.py diff --git a/mealie/schema/backup.py b/mealie/schema/backup.py index 908d2df37..12c0f3b3e 100644 --- a/mealie/schema/backup.py +++ b/mealie/schema/backup.py @@ -33,10 +33,10 @@ class ImportJob(BackupOptions): "example": { "name": "my_local_backup.zip", "recipes": True, - "force": False, - "rebase": False, - "themes": False, - "settings": False, + "settings": True, + "themes": True, + "groups": True, + "users": True, } } diff --git a/tests/conftest.py b/tests/conftest.py index d3f202887..0dfd75af0 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -4,13 +4,9 @@ import requests from fastapi.testclient import TestClient from mealie.app import app from mealie.core.config import SQLITE_DIR -from mealie.db.database import db from mealie.db.db_setup import generate_session, sql_global_init from mealie.db.init_db import init_db -from mealie.routes.deps import get_current_user -from mealie.schema.user import UserInDB from pytest import fixture -from sqlalchemy.orm.session import Session from tests.test_config import TEST_DATA diff --git a/tests/test_routes/test_import_routes.py b/tests/test_routes/test_import_routes.py new file mode 100644 index 000000000..0dfc82d1d --- /dev/null +++ b/tests/test_routes/test_import_routes.py @@ -0,0 +1,25 @@ +import json + +import pytest + + +@pytest.fixture +def backup_data(): + return { + "name": "dev_sample_data_2021-Feb-13.zip", + "force": False, + "recipes": True, + "settings": False, #! Broken + "themes": True, + "groups": True, + "users": True, + } + + +def test_import(api_client, backup_data): + response = api_client.post("/api/backups/dev_sample_data_2021-Feb-13.zip/import", json=backup_data) + + assert response.status_code == 200 + for key, value in json.loads(response.content).items(): + for v in value: + assert v["status"] == True diff --git a/tests/utils.py b/tests/utils.py deleted file mode 100644 index e69de29bb..000000000