drafts tests

Author: pcrespov

api/specs/web-server/_tags_groups.py

@@ -31,7 +31,7 @@
     response_model=Envelope[list[TagGroupGet]],
 )
 async def list_tag_groups(_path_params: Annotated[TagPathParams, Depends()]):
-    ...
+    """Lists all groups associated to this tag"""
 
 
 @router.post(
@@ -49,7 +49,7 @@ async def create_tag_group(
     "/tags/{tag_id}/groups/{group_id}",
     response_model=Envelope[list[TagGroupGet]],
 )
-async def replace_tag_groups(
+async def replace_tag_group(
     _path_params: Annotated[TagGroupPathParams, Depends()], _body: TagGroupCreate
 ):
     """Replace access rights on tag for associated organization or user with `group_id`"""

services/web/server/src/simcore_service_webserver/tags/_rest.py

@@ -143,11 +143,11 @@ async def create_tag_group(request: web.Request):
     raise NotImplementedError
 
 
-@routes.put(f"/{VTAG}/tags/{{tag_id}}/groups/{{group_id}}", name="replace_tag_groups")
+@routes.put(f"/{VTAG}/tags/{{tag_id}}/groups/{{group_id}}", name="replace_tag_group")
 @login_required
 @permission_required("tag.crud.*")
 @_handle_tags_exceptions
-async def replace_tag_groups(request: web.Request):
+async def replace_tag_group(request: web.Request):
     path_params = parse_request_path_parameters_as(TagGroupPathParams, request)
     new_tag_group = await parse_request_body_as(TagGroupCreate, request)
 

services/web/server/tests/unit/with_dbs/03/tags/test_tags.py

@@ -22,7 +22,7 @@
 from models_library.utils.fastapi_encoders import jsonable_encoder
 from pytest_simcore.helpers.assert_checks import assert_status
 from pytest_simcore.helpers.postgres_tags import create_tag, delete_tag
-from pytest_simcore.helpers.webserver_login import UserInfoDict
+from pytest_simcore.helpers.webserver_login import NewUser, UserInfoDict
 from pytest_simcore.helpers.webserver_projects import assert_get_same_project
 from servicelib.aiohttp import status
 from simcore_postgres_database.models.tags import tags
@@ -276,7 +276,7 @@ async def test_create_tags_with_order_index(
     assert got == [*expected_tags[::-1], last_created]
 
 
-async def test_share_tags(
+async def test_share_tags_by_creating_associated_groups(
     client: TestClient,
     logged_user: UserInfoDict,
     user_role: UserRole,
@@ -294,37 +294,63 @@ async def test_share_tags(
     )
     created, _ = await assert_status(resp, status.HTTP_200_OK)
 
-    # SHARE (all combinations)?
-    url = client.app.router["create_tag_group"].url_for(
-        tag_id=created["id"], group_id=f"{EVERYONE_GROUP_ID}"
-    )
-    resp = await client.post(
-        f"{url}",
-        json={"read": True, "write": False, "delete": False},
-    )
+    # LIST
+    url = client.app.router["list_tag_groups"].url_for(tag_id=created["id"])
+    resp = await client.get(f"{url}")
     data, _ = await assert_status(resp, status.HTTP_200_OK)
 
-    # test only performed allowed combinations
+    # check ownership
+    assert len(data) == 1
+    assert data[0]["gid"] == logged_user["primary_gid"]
+    assert data[0]["read"] is True
+    assert data[0]["write"] is True
+    assert data[0]["delete"] is True
+
+    async with NewUser(
+        app=client.app,
+    ) as new_user:
+        # SHARE
+        url = client.app.router["create_tag_group"].url_for(
+            tag_id=created["id"],
+            group_id=f"{new_user['primary_gid']}",
+        )
+        resp = await client.post(
+            f"{url}",
+            json={"read": True, "write": False, "delete": False},
+        )
+        data, _ = await assert_status(resp, status.HTTP_201_CREATED)
 
-    # REPLACE SHARE to other combinations
-    url = client.app.router["replace_tag_groups"].url_for(
-        tag_id=created["id"], group_id=f"{EVERYONE_GROUP_ID}"
-    )
-    resp = await client.put(
-        f"{url}",
-        json={"read": True, "write": True, "delete": False},
-    )
-    data, _ = await assert_status(resp, status.HTTP_200_OK)
+        # check new group
+        url = client.app.router["list_tag_groups"].url_for(tag_id=created["id"])
+        resp = await client.get(f"{url}")
+        data, _ = await assert_status(resp, status.HTTP_200_OK)
+        assert len(data) == 2
+        assert data[1]["gid"] == logged_user["primary_gid"]
+        assert data[1]["read"] is True
+        assert data[1]["write"] is True
+        assert data[1]["delete"] is True
 
-    # test can perform new combinations
+        # TODO: check can only read
 
-    # DELETE share
-    url = client.app.router["delete_tag_group"].url_for(
-        tag_id=created["id"], group_id=f"{EVERYONE_GROUP_ID}"
-    )
-    resp = await client.delete(
-        f"{url}",
-    )
-    data, _ = await assert_status(resp, status.HTTP_200_OK)
+        # REPLACE SHARE to other combinations
+        url = client.app.router["replace_tag_group"].url_for(
+            tag_id=created["id"], group_id=f"{EVERYONE_GROUP_ID}"
+        )
+        resp = await client.put(
+            f"{url}",
+            json={"read": True, "write": True, "delete": False},
+        )
+        data, _ = await assert_status(resp, status.HTTP_200_OK)
+
+        # test can perform new combinations
+
+        # DELETE share
+        url = client.app.router["delete_tag_group"].url_for(
+            tag_id=created["id"], group_id=f"{EVERYONE_GROUP_ID}"
+        )
+        resp = await client.delete(
+            f"{url}",
+        )
+        data, _ = await assert_status(resp, status.HTTP_200_OK)
 
-    # test can do nothing
+        # test can do nothing

services/web/server/tests/unit/with_dbs/04/wallets/test_wallets_groups.py

@@ -24,6 +24,8 @@ async def test_wallets_groups_full_workflow(
     expected: HTTPStatus,
     wallets_clean_db: AsyncIterator[None],
 ):
+    assert client.app
+
     # create a new wallet
     url = client.app.router["create_wallet"].url_for()
     resp = await client.post(
@@ -39,9 +41,9 @@ async def test_wallets_groups_full_workflow(
     data, _ = await assert_status(resp, status.HTTP_200_OK)
     assert len(data) == 1
     assert data[0]["gid"] == logged_user["primary_gid"]
-    assert data[0]["read"] == True
-    assert data[0]["write"] == True
-    assert data[0]["delete"] == True
+    assert data[0]["read"] is True
+    assert data[0]["write"] is True
+    assert data[0]["delete"] is True
 
     async with NewUser(
         app=client.app,
@@ -64,9 +66,9 @@ async def test_wallets_groups_full_workflow(
         data, _ = await assert_status(resp, status.HTTP_200_OK)
         assert len(data) == 2
         assert data[1]["gid"] == new_user["primary_gid"]
-        assert data[1]["read"] == True
-        assert data[1]["write"] == False
-        assert data[1]["delete"] == False
+        assert data[1]["read"] is True
+        assert data[1]["write"] is False
+        assert data[1]["delete"] is False
 
         # Update the wallet permissions of the added user
         url = client.app.router["update_wallet_group"].url_for(
@@ -78,9 +80,9 @@ async def test_wallets_groups_full_workflow(
         )
         data, _ = await assert_status(resp, status.HTTP_200_OK)
         assert data["gid"] == new_user["primary_gid"]
-        assert data["read"] == True
-        assert data["write"] == True
-        assert data["delete"] == False
+        assert data["read"] is True
+        assert data["write"] is True
+        assert data["delete"] is False
 
         # List the wallet groups
         url = client.app.router["list_wallet_groups"].url_for(
@@ -90,9 +92,9 @@ async def test_wallets_groups_full_workflow(
         data, _ = await assert_status(resp, status.HTTP_200_OK)
         assert len(data) == 2
         assert data[1]["gid"] == new_user["primary_gid"]
-        assert data[1]["read"] == True
-        assert data[1]["write"] == True
-        assert data[1]["delete"] == False
+        assert data[1]["read"] is True
+        assert data[1]["write"] is True
+        assert data[1]["delete"] is False
 
         # Delete the wallet group
         url = client.app.router["delete_wallet_group"].url_for(