Merge branch 'master' into revert-monthly-contributor

Author: ValentinBuira

mergin/client.py

@@ -298,7 +298,7 @@ def workspace_service(self, workspace_id):
         Returns response from server as JSON dict or None if endpoint is not found
         """
         resp = self.get(f"/v1/workspace/{workspace_id}/service")
-        return json.loads(resp)
+        return json.load(resp)
 
     def workspace_usage(self, workspace_id):
         """

mergin/test/test_client.py

@@ -2717,3 +2717,28 @@ def test_error_projects_limit_hit(mcStorage: MerginClient):
     assert e.value.http_error == 422
     assert e.value.http_method == "POST"
     assert e.value.url == f"{mcStorage.url}v1/project/testpluginstorage"
+
+def test_workspace_requests(mc2: MerginClient):
+    test_project = "test_permissions"
+    test_project_fullname = API_USER2 + "/" + test_project
+
+    project_info = mc2.project_info(test_project_fullname)
+    ws_id = project_info.get("workspace_id")
+
+    usage = mc2.workspace_usage(ws_id)
+    # Check type and common value
+    assert type(usage) == dict
+    assert usage["api"]["allowed"] == True
+    assert usage["history"]["quota"] == 214748364800
+    assert usage["history"]["usage"] == 0
+
+    service = mc2.workspace_service(ws_id)
+    # Check type and common value
+    assert type(service) == dict
+    assert service["action_required"] == False
+    assert service["plan"]
+    assert service["plan"]["is_paid_plan"] == False
+    assert service["plan"]["product_id"] == None
+    assert service["plan"]["type"] == "custom"
+    assert service["subscription"] == None
+