test(cli): improve coverage for custom actions

nejch · JohnVillalovos · commit 7327f78073ca · 2022-06-01T08:00:51.000-07:00
diff --git a/requirements-test.txt b/requirements-test.txt
@@ -2,4 +2,5 @@ coverage
 pytest==7.1.2
 pytest-console-scripts==1.3.1
 pytest-cov
+PyYaml>=5.2
 responses
diff --git a/tests/functional/cli/test_cli.py b/tests/functional/cli/test_cli.py
@@ -8,6 +8,7 @@
 
 import pytest
 import responses
+import yaml
 
 from gitlab import __version__, config
 from gitlab.const import DEFAULT_URL
@@ -135,11 +136,36 @@ def test_invalid_auth_config(script_runner, monkeypatch, fixture_dir):
     assert "401" in ret.stderr
 
 
-def test_fields(gitlab_cli, project_file):
-    cmd = "-o", "json", "--fields", "default_branch", "project", "list"
+format_matrix = [
+    ("json", json.loads),
+    ("yaml", yaml.safe_load),
+]
+
+
+@pytest.mark.parametrize("format,loader", format_matrix)
+def test_cli_display(gitlab_cli, project, format, loader):
+    cmd = ["-o", format, "project", "get", "--id", project.id]
+
+    ret = gitlab_cli(cmd)
+    assert ret.success
+
+    content = loader(ret.stdout.strip())
+    assert content["id"] == project.id
+
+
+@pytest.mark.parametrize("format,loader", format_matrix)
+def test_cli_fields_in_list(gitlab_cli, project_file, format, loader):
+    cmd = [
+        "-o",
+        format,
+        "--fields",
+        "default_branch",
+        "project",
+        "list",
+    ]
 
     ret = gitlab_cli(cmd)
     assert ret.success
 
-    content = json.loads(ret.stdout.strip())
+    content = loader(ret.stdout.strip())
     assert ["default_branch" in item for item in content]
diff --git a/tests/functional/cli/test_cli_projects.py b/tests/functional/cli/test_cli_projects.py
@@ -46,7 +46,8 @@ def project_export(project):
     return export
 
 
-def test_project_export_download(gitlab_config, project_export):
+def test_project_export_download_custom_action(gitlab_config, project_export):
+    """Tests custom action on ProjectManager"""
     cmd = [
         "gitlab",
         "--config-file",
@@ -59,3 +60,10 @@ def test_project_export_download(gitlab_config, project_export):
 
     export = subprocess.run(cmd, capture_output=True, check=True)
     assert export.returncode == 0
+
+
+def test_project_languages_custom_action(gitlab_cli, project, project_file):
+    """Tests custom action on Project/RESTObject"""
+    cmd = ["project", "languages", "--id", project.id]
+    ret = gitlab_cli(cmd)
+    assert ret.success
