provide service api endpoints

tests/ahriman/application/conftest.py

@@ -1,5 +1,4 @@
 import argparse
-import aur
 import pytest
 
 from pytest_mock import MockerFixture
@@ -8,7 +7,6 @@ from ahriman.application.ahriman import _parser
 from ahriman.application.application import Application
 from ahriman.application.lock import Lock
 from ahriman.core.configuration import Configuration
-from ahriman.models.package import Package
 
 
 @pytest.fixture
@@ -32,31 +30,6 @@ def args() -> argparse.Namespace:
     return argparse.Namespace(lock=None, force=False, unsafe=False, no_report=True)
 
 
-@pytest.fixture
-def aur_package_ahriman(package_ahriman: Package) -> aur.Package:
-    """
-    fixture for AUR package
-    :param package_ahriman: package fixture
-    :return: AUR package test instance
-    """
-    return aur.Package(
-        num_votes=None,
-        description=package_ahriman.packages[package_ahriman.base].description,
-        url_path=package_ahriman.web_url,
-        last_modified=None,
-        name=package_ahriman.base,
-        out_of_date=None,
-        id=None,
-        first_submitted=None,
-        maintainer=None,
-        version=package_ahriman.version,
-        license=package_ahriman.packages[package_ahriman.base].licenses,
-        url=None,
-        package_base=package_ahriman.base,
-        package_base_id=None,
-        category_id=None)
-
-
 @pytest.fixture
 def lock(args: argparse.Namespace, configuration: Configuration) -> Lock:
     """

tests/ahriman/conftest.py

@@ -1,3 +1,4 @@
+import aur
 import pytest
 
 from pathlib import Path
@@ -46,6 +47,31 @@ def anyvar(cls: Type[T], strict: bool = False) -> T:
 
 
 # generic fixtures
+@pytest.fixture
+def aur_package_ahriman(package_ahriman: Package) -> aur.Package:
+    """
+    fixture for AUR package
+    :param package_ahriman: package fixture
+    :return: AUR package test instance
+    """
+    return aur.Package(
+        num_votes=None,
+        description=package_ahriman.packages[package_ahriman.base].description,
+        url_path=package_ahriman.web_url,
+        last_modified=None,
+        name=package_ahriman.base,
+        out_of_date=None,
+        id=None,
+        first_submitted=None,
+        maintainer=None,
+        version=package_ahriman.version,
+        license=package_ahriman.packages[package_ahriman.base].licenses,
+        url=None,
+        package_base=package_ahriman.base,
+        package_base_id=None,
+        category_id=None)
+
+
 @pytest.fixture
 def auth(configuration: Configuration) -> Auth:
     """

tests/ahriman/web/views/service/test_views_service_add.py

@@ -0,0 +1,35 @@
+from aiohttp.test_utils import TestClient
+from pytest_mock import MockerFixture
+
+
+async def test_post(client: TestClient, mocker: MockerFixture) -> None:
+    """
+    must call post request correctly
+    """
+    add_mock = mocker.patch("ahriman.core.spawn.Spawn.packages_add")
+    response = await client.post("/service-api/v1/add", json={"packages": ["ahriman"]})
+
+    assert response.status == 200
+    add_mock.assert_called_with(["ahriman"], False)
+
+
+async def test_post_now(client: TestClient, mocker: MockerFixture) -> None:
+    """
+    must call post and run build
+    """
+    add_mock = mocker.patch("ahriman.core.spawn.Spawn.packages_add")
+    response = await client.post("/service-api/v1/add", json={"packages": ["ahriman"], "build_now": True})
+
+    assert response.status == 200
+    add_mock.assert_called_with(["ahriman"], True)
+
+
+async def test_post_exception(client: TestClient, mocker: MockerFixture) -> None:
+    """
+    must raise exception on missing packages payload
+    """
+    add_mock = mocker.patch("ahriman.core.spawn.Spawn.packages_add")
+    response = await client.post("/service-api/v1/add")
+
+    assert response.status == 400
+    add_mock.assert_not_called()

tests/ahriman/web/views/service/test_views_service_remove.py

@@ -0,0 +1,24 @@
+from aiohttp.test_utils import TestClient
+from pytest_mock import MockerFixture
+
+
+async def test_post(client: TestClient, mocker: MockerFixture) -> None:
+    """
+    must call post request correctly
+    """
+    add_mock = mocker.patch("ahriman.core.spawn.Spawn.packages_remove")
+    response = await client.post("/service-api/v1/remove", json={"packages": ["ahriman"]})
+
+    assert response.status == 200
+    add_mock.assert_called_with(["ahriman"])
+
+
+async def test_post_exception(client: TestClient, mocker: MockerFixture) -> None:
+    """
+    must raise exception on missing packages payload
+    """
+    add_mock = mocker.patch("ahriman.core.spawn.Spawn.packages_remove")
+    response = await client.post("/service-api/v1/remove")
+
+    assert response.status == 400
+    add_mock.assert_not_called()

tests/ahriman/web/views/service/test_views_service_search.py

@@ -0,0 +1,59 @@
+import aur
+
+from aiohttp.test_utils import TestClient
+from pytest_mock import MockerFixture
+
+
+async def test_get(client: TestClient, aur_package_ahriman: aur.Package, mocker: MockerFixture) -> None:
+    """
+    must call get request correctly
+    """
+    mocker.patch("aur.search", return_value=[aur_package_ahriman])
+    response = await client.get("/service-api/v1/search", params={"for": "ahriman"})
+
+    assert response.status == 200
+    assert await response.json() == ["ahriman"]
+
+
+async def test_get_exception(client: TestClient, mocker: MockerFixture) -> None:
+    """
+    must raise 400 on empty search string
+    """
+    search_mock = mocker.patch("aur.search")
+    response = await client.get("/service-api/v1/search")
+
+    assert response.status == 400
+    search_mock.assert_not_called()
+
+
+async def test_get_join(client: TestClient, mocker: MockerFixture) -> None:
+    """
+    must join search args with space
+    """
+    search_mock = mocker.patch("aur.search")
+    response = await client.get("/service-api/v1/search", params=[("for", "ahriman"), ("for", "maybe")])
+
+    assert response.status == 200
+    search_mock.assert_called_with("ahriman maybe")
+
+
+async def test_get_join_filter(client: TestClient, mocker: MockerFixture) -> None:
+    """
+    must filter search parameters with less than 3 symbols
+    """
+    search_mock = mocker.patch("aur.search")
+    response = await client.get("/service-api/v1/search", params=[("for", "ah"), ("for", "maybe")])
+
+    assert response.status == 200
+    search_mock.assert_called_with("maybe")
+
+
+async def test_get_join_filter_empty(client: TestClient, mocker: MockerFixture) -> None:
+    """
+    must filter search parameters with less than 3 symbols (empty result)
+    """
+    search_mock = mocker.patch("aur.search")
+    response = await client.get("/service-api/v1/search", params=[("for", "ah"), ("for", "ma")])
+
+    assert response.status == 400
+    search_mock.assert_not_called()

tests/ahriman/web/views/service/test_views_service_update.py

@@ -0,0 +1,24 @@
+from aiohttp.test_utils import TestClient
+from pytest_mock import MockerFixture
+
+
+async def test_post(client: TestClient, mocker: MockerFixture) -> None:
+    """
+    must call post request correctly
+    """
+    add_mock = mocker.patch("ahriman.core.spawn.Spawn.packages_update")
+    response = await client.post("/service-api/v1/update", json={"packages": ["ahriman"]})
+
+    assert response.status == 200
+    add_mock.assert_called_with(["ahriman"])
+
+
+async def test_post_exception(client: TestClient, mocker: MockerFixture) -> None:
+    """
+    must raise exception on missing packages payload
+    """
+    add_mock = mocker.patch("ahriman.core.spawn.Spawn.packages_update")
+    response = await client.post("/service-api/v1/update")
+
+    assert response.status == 400
+    add_mock.assert_not_called()

tests/ahriman/web/views/test_views_base.py

@@ -61,9 +61,6 @@ async def test_data_as_json(base: BaseView) -> None:
     """
     json = {"key1": "value1", "key2": ["value2", "value3"], "key3": ["value4", "value5", "value6"]}
 
-    async def get_json():
-        raise ValueError()
-
     async def get_data():
         result = MultiDict()
         for key, values in json.items():
@@ -74,5 +71,18 @@ async def test_data_as_json(base: BaseView) -> None:
                 result.add(key, values)
         return result
 
-    base._request = pytest.helpers.request(base.request.app, "", "", json=get_json, data=get_data)
-    assert await base.data_as_json() == json
+    base._request = pytest.helpers.request(base.request.app, "", "", data=get_data)
+    assert await base.data_as_json([]) == json
+
+
+async def test_data_as_json_with_list_keys(base: BaseView) -> None:
+    """
+    must parse multi value form payload with forced list
+    """
+    json = {"key1": "value1"}
+
+    async def get_data():
+        return json
+
+    base._request = pytest.helpers.request(base.request.app, "", "", data=get_data)
+    assert await base.data_as_json(["key1"]) == {"key1": ["value1"]}