Add tests for --show-all flag

Author: BartoszBlizniak

cloudsmith_cli/cli/tests/commands/policy/test_licence.py

@@ -109,7 +109,11 @@ def test_license_policy_commands(runner, organization, tmp_path):
         catch_exceptions=False,
     )
     assert (
-        "Creating " + policy_name + " license policy for the cloudsmith namespace ...OK"
+        "Creating "
+        + policy_name
+        + " license policy for the "
+        + organization
+        + " namespace ...OK"
         in result.output
     )
     slug_perm = assert_output_matches_policy_config(
@@ -121,6 +125,14 @@ def test_license_policy_commands(runner, organization, tmp_path):
     assert "Getting license policies ... OK" in result.output
     assert_output_matches_policy_config(result.output, policy_config_file_path)
 
+    # List policies with --show-all flag
+    result = runner.invoke(
+        ls, args=[organization, "--show-all"], catch_exceptions=False
+    )
+    assert "Getting license policies ... OK" in result.output
+
+    assert "Results: " in result.output and " license policy" in result.output
+
     # Change the values in the config file
     policy_config_file_path = create_license_policy_config_file(
         directory=tmp_path,
@@ -139,7 +151,11 @@ def test_license_policy_commands(runner, organization, tmp_path):
         catch_exceptions=False,
     )
     assert (
-        "Updating " + slug_perm + " license policy in the cloudsmith namespace ...OK"
+        "Updating "
+        + slug_perm
+        + " license policy in the "
+        + organization
+        + " namespace ...OK"
         in result.output
     )
     assert_output_matches_policy_config(result.output, policy_config_file_path)
@@ -151,7 +167,9 @@ def test_license_policy_commands(runner, organization, tmp_path):
     assert (
         "Are you absolutely certain you want to delete the "
         + slug_perm
-        + " license policy from the cloudsmith namespace? [y/N]: N"
+        + " license policy from the "
+        + organization
+        + " namespace? [y/N]: N"
         in result.output
     )
     assert "OK, phew! Close call. :-)" in result.output
@@ -163,10 +181,12 @@ def test_license_policy_commands(runner, organization, tmp_path):
     assert (
         "Are you absolutely certain you want to delete the "
         + slug_perm
-        + " license policy from the cloudsmith namespace? [y/N]: Y"
+        + " license policy from the "
+        + organization
+        + " namespace? [y/N]: Y"
         in result.output
     )
     assert (
-        "Deleting " + slug_perm + " from the cloudsmith namespace ... OK"
+        "Deleting " + slug_perm + " from the " + organization + " namespace ... OK"
         in result.output
     )

cloudsmith_cli/cli/tests/commands/policy/test_vulnerability.py

@@ -113,7 +113,9 @@ def test_vulnerability_policy_commands(runner, organization, tmp_path):
     assert (
         "Creating "
         + policy_name
-        + " vulnerability policy for the cloudsmith namespace ...OK"
+        + " vulnerability policy for the "
+        + organization
+        + " namespace ...OK"
         in result.output
     )
     slug_perm = assert_output_matches_policy_config(
@@ -124,6 +126,12 @@ def test_vulnerability_policy_commands(runner, organization, tmp_path):
     result = runner.invoke(ls, args=[organization], catch_exceptions=False)
     assert "Getting vulnerability policies ... OK" in result.output
     assert_output_matches_policy_config(result.output, policy_config_file_path)
+    # List policies with --show-all flag
+    result = runner.invoke(
+        ls, args=[organization, "--show-all"], catch_exceptions=False
+    )
+    assert "Getting vulnerability policies ... OK" in result.output
+    assert "Results: " in result.output and " vulnerability policy" in result.output
 
     # Change the values in the config file
     policy_config_file_path = create_vulnerability_policy_config_file(
@@ -145,7 +153,9 @@ def test_vulnerability_policy_commands(runner, organization, tmp_path):
     assert (
         "Updating "
         + slug_perm
-        + " vulnerability policy in the cloudsmith namespace ...OK"
+        + " vulnerability policy in the "
+        + organization
+        + " namespace ...OK"
         in result.output
     )
     assert_output_matches_policy_config(result.output, policy_config_file_path)
@@ -157,7 +167,9 @@ def test_vulnerability_policy_commands(runner, organization, tmp_path):
     assert (
         "Are you absolutely certain you want to delete the "
         + slug_perm
-        + " vulnerability policy from the cloudsmith namespace? [y/N]: N"
+        + " vulnerability policy from the "
+        + organization
+        + " namespace? [y/N]: N"
         in result.output
     )
     assert "OK, phew! Close call. :-)" in result.output
@@ -169,10 +181,12 @@ def test_vulnerability_policy_commands(runner, organization, tmp_path):
     assert (
         "Are you absolutely certain you want to delete the "
         + slug_perm
-        + " vulnerability policy from the cloudsmith namespace? [y/N]: Y"
+        + " vulnerability policy from the "
+        + organization
+        + " namespace? [y/N]: Y"
         in result.output
     )
     assert (
-        "Deleting " + slug_perm + " from the cloudsmith namespace ... OK"
+        "Deleting " + slug_perm + " from the " + organization + " namespace ... OK"
         in result.output
     )

cloudsmith_cli/cli/tests/commands/test_package_commands.py

@@ -50,6 +50,13 @@ def test_push_and_delete_raw_package(
     small_file_data = data[0]
     assert small_file_data["filename"] == pkg_file.name
 
+    # List packages with --show-all flag
+    result = runner.invoke(
+        list_, args=["pkgs", org_repo, "--show-all"], catch_exceptions=False
+    )
+    assert "Getting list of packages ... OK" in result.output
+    assert "Results: 1 package retrieved" in result.output
+
     # Wait for the package to sync.
     org_repo_package = f"{org_repo}/{small_file_data['slug']}"
     for _ in range(10):

cloudsmith_cli/cli/tests/commands/test_repos.py

@@ -119,6 +119,12 @@ def test_repos_commands(runner, organization, tmp_path):
         result.output, organization, repo_config_file_path
     )
 
+    # List repositories with --show-all flag
+    result = runner.invoke(get, [organization, "--show-all"], catch_exceptions=False)
+    assert "Getting list of repositories ... OK" in result.output
+    # A static number cannot be used here because we are performing this test in cloudsmith org which is active.
+    assert "Results: " in result.output and " repository" in result.output
+
     # Change the repository description in the repo config file.
     repository_description = random_str()
     repo_config_file_path = create_repo_config_file(

cloudsmith_cli/cli/tests/commands/test_upstream.py

@@ -71,6 +71,15 @@ def test_upstream_commands(
     assert result_data["name"] == upstream_config["name"]
     assert result_data["upstream_url"] == upstream_config["upstream_url"]
 
+    # List upstreams with --show-all flag
+    result = runner.invoke(
+        upstream,
+        args=[upstream_format, "ls", org_repo, "--show-all"],
+        catch_exceptions=False,
+    )
+    assert "Getting upstreams... OK" in result.output
+    assert "Results: 1 upstream" in result.output
+
     slug_perm = result_data["slug_perm"]
     assert slug_perm
     org_repo_slug_perm = f"{org_repo}/{slug_perm}"