✅ Refactor tests (#62)

Author: patrick91

src/fastapi_cloud_cli/commands/deploy.py

@@ -375,12 +375,12 @@ def _wait_for_deployment(
                 raise typer.Exit(1)
 
             if time_elapsed > 30:
-                messages = cycle(LONG_WAIT_MESSAGES)
+                messages = cycle(LONG_WAIT_MESSAGES)  # pragma: no cover
 
             if (time.monotonic() - last_message_changed_at) > 2:
-                progress.title = next(messages)
+                progress.title = next(messages)  # pragma: no cover
 
-                last_message_changed_at = time.monotonic()
+                last_message_changed_at = time.monotonic()  # pragma: no cover
 
 
 def _setup_environment_variables(toolkit: RichToolkit, app_id: str) -> None:

src/fastapi_cloud_cli/commands/env.py

@@ -161,11 +161,9 @@ def delete(
                     {"name": env_var.name, "value": env_var.name}
                     for env_var in environment_variables.data
                 ],
-                default=None,
             )
 
-            if not name:
-                return
+            assert name
         else:
             if not validate_environment_variable_name(name):
                 toolkit.print(

src/fastapi_cloud_cli/commands/whoami.py

@@ -17,11 +17,11 @@ def whoami() -> Any:
         return
 
     with APIClient() as client:
-        with Progress(title="⚡Fetching profile", transient=True) as progress:
+        with Progress(title="⚡ Fetching profile", transient=True) as progress:
             with handle_http_errors(progress, message=""):
                 response = client.get("/users/me")
                 response.raise_for_status()
 
         data = response.json()
 
-        print(f"⚡[bold]{data['email']}[/bold]")
+        print(f"⚡ [bold]{data['email']}[/bold]")

src/fastapi_cloud_cli/utils/cli.py

@@ -85,7 +85,7 @@ def handle_http_errors(
 
         # Handle validation errors from Pydantic models, this should make it easier to debug :)
         if isinstance(e, HTTPStatusError) and e.response.status_code == 422:
-            logger.debug(e.response.json())
+            logger.debug(e.response.json())  # pragma: no cover
 
         if isinstance(e, HTTPStatusError) and e.response.status_code in (401, 403):
             message = "The specified token is not valid. Use `fastapi login` to generate a new token."

tests/conftest.py

@@ -25,15 +25,17 @@ def setup_terminal() -> None:
 
 
 @pytest.fixture
-def logged_in_cli() -> Generator[None, None, None]:
-    with patch("fastapi_cloud_cli.utils.auth.get_auth_token", return_value=True):
-        yield
+def logged_in_cli(temp_auth_config: Path) -> Generator[None, None, None]:
+    temp_auth_config.write_text('{"access_token": "test_token_12345"}')
+
+    yield
 
 
 @pytest.fixture
-def logged_out_cli() -> Generator[None, None, None]:
-    with patch("fastapi_cloud_cli.utils.auth.get_auth_token", return_value=None):
-        yield
+def logged_out_cli(temp_auth_config: Path) -> Generator[None, None, None]:
+    assert not temp_auth_config.exists()
+
+    yield
 
 
 @dataclass
@@ -54,3 +56,13 @@ def configured_app(tmp_path: Path) -> ConfiguredApp:
     config_path.write_text(f'{{"app_id": "{app_id}", "team_id": "{team_id}"}}')
 
     return ConfiguredApp(app_id=app_id, team_id=team_id, path=tmp_path)
+
+
+@pytest.fixture
+def temp_auth_config(tmp_path: Path) -> Generator[Path, None, None]:
+    """Provides a temporary auth config setup for testing file operations."""
+
+    with patch(
+        "fastapi_cloud_cli.utils.config.get_config_folder", return_value=tmp_path
+    ):
+        yield tmp_path / "auth.json"

tests/test_cli.py

@@ -0,0 +1,11 @@
+import subprocess
+import sys
+
+
+def test_script() -> None:
+    result = subprocess.run(
+        [sys.executable, "-m", "coverage", "run", "-m", "fastapi_cloud_cli", "--help"],
+        capture_output=True,
+        encoding="utf-8",
+    )
+    assert "Usage" in result.stdout

tests/test_cli_deploy.py

@@ -652,3 +652,149 @@ def test_does_not_duplicate_entry_in_git_ignore(
     _deploy_without_waiting(respx_mock, tmp_path)
 
     assert git_ignore_path.read_text() == ".fastapicloud\n"
+
+
+@pytest.mark.respx(base_url=settings.base_api_url)
+def test_creates_environment_variables_during_app_setup(
+    logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
+) -> None:
+    steps = [
+        Keys.ENTER,  # Setup and deploy
+        Keys.ENTER,  # Select team
+        Keys.ENTER,  # Create new app
+        *"demo",  # App name
+        Keys.ENTER,
+        Keys.ENTER,  # Setup environment variables (Yes)
+        *"API_KEY",  # Environment variable name
+        Keys.ENTER,
+        *"secret123",  # Environment variable value
+        Keys.ENTER,
+        Keys.ENTER,  # Empty key to finish
+        Keys.CTRL_C,  # Exit before deployment
+    ]
+
+    team = _get_random_team()
+    app_data = _get_random_app(team_id=team["id"])
+
+    respx_mock.get("/teams/").mock(return_value=Response(200, json={"data": [team]}))
+
+    respx_mock.post("/apps/", json={"name": "demo", "team_id": team["id"]}).mock(
+        return_value=Response(201, json=app_data)
+    )
+
+    env_vars_request = respx_mock.patch(
+        f"/apps/{app_data['id']}/environment-variables/", json={"API_KEY": "secret123"}
+    ).mock(return_value=Response(200))
+
+    with changing_dir(tmp_path), patch("click.getchar") as mock_getchar:
+        mock_getchar.side_effect = steps
+
+        result = runner.invoke(app, ["deploy"])
+
+        assert result.exit_code == 1
+        assert env_vars_request.called
+        assert "Environment variables set up successfully!" in result.output
+
+
+@pytest.mark.respx(base_url=settings.base_api_url)
+def test_rejects_invalid_environment_variable_names(
+    logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
+) -> None:
+    steps = [
+        Keys.ENTER,  # Setup and deploy
+        Keys.ENTER,  # Select team
+        Keys.ENTER,  # Create new app
+        *"demo",  # App name
+        Keys.ENTER,
+        Keys.ENTER,  # Setup environment variables (Yes)
+        *"123-invalid",  # Invalid environment variable name (starts with digit, contains hyphen)
+        Keys.ENTER,
+        *"VALID_KEY",  # Valid environment variable name
+        Keys.ENTER,
+        *"value123",  # Environment variable value
+        Keys.ENTER,
+        Keys.ENTER,  # Empty key to finish
+        Keys.CTRL_C,  # Exit before deployment
+    ]
+
+    team = _get_random_team()
+    app_data = _get_random_app(team_id=team["id"])
+
+    respx_mock.get("/teams/").mock(return_value=Response(200, json={"data": [team]}))
+
+    respx_mock.post("/apps/", json={"name": "demo", "team_id": team["id"]}).mock(
+        return_value=Response(201, json=app_data)
+    )
+
+    env_vars_request = respx_mock.patch(
+        f"/apps/{app_data['id']}/environment-variables/", json={"VALID_KEY": "value123"}
+    ).mock(return_value=Response(200))
+
+    with changing_dir(tmp_path), patch("click.getchar") as mock_getchar:
+        mock_getchar.side_effect = steps
+
+        result = runner.invoke(app, ["deploy"])
+
+        assert result.exit_code == 1
+        assert env_vars_request.called
+        assert "Invalid environment variable name." in result.output
+        assert "Environment variables set up successfully!" in result.output
+
+
+@pytest.mark.respx(base_url=settings.base_api_url)
+def test_shows_error_for_invalid_waitlist_form_data(
+    logged_out_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
+) -> None:
+    steps = [
+        *"[email protected]",
+        Keys.ENTER,
+        Keys.ENTER,  # Choose to provide more information
+        Keys.CTRL_C,  # Interrupt to avoid infinite loop
+    ]
+
+    with changing_dir(tmp_path), patch(
+        "rich_toolkit.menu.click.getchar"
+    ) as mock_getchar, patch("rich_toolkit.form.Form.run") as mock_form_run:
+        mock_getchar.side_effect = steps
+        # Simulate form returning data with invalid email field to trigger ValidationError
+        mock_form_run.return_value = {
+            "email": "invalid-email-format",
+            "name": "John Doe",
+        }
+
+        result = runner.invoke(app, ["deploy"])
+
+        assert result.exit_code == 1
+        assert "Invalid form data. Please try again." in result.output
+
+
+@pytest.mark.respx(base_url=settings.base_api_url)
+def test_shows_no_apps_found_message_when_team_has_no_apps(
+    logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
+) -> None:
+    steps = [
+        Keys.ENTER,  # Setup and deploy
+        Keys.ENTER,  # Select team
+        Keys.RIGHT_ARROW,  # Choose existing app (No)
+        Keys.ENTER,
+    ]
+
+    team = _get_random_team()
+
+    respx_mock.get("/teams/").mock(return_value=Response(200, json={"data": [team]}))
+
+    # Mock empty apps list for the team
+    respx_mock.get("/apps/", params={"team_id": team["id"]}).mock(
+        return_value=Response(200, json={"data": []})
+    )
+
+    with changing_dir(tmp_path), patch("click.getchar") as mock_getchar:
+        mock_getchar.side_effect = steps
+
+        result = runner.invoke(app, ["deploy"])
+
+        assert result.exit_code == 1
+        assert (
+            "No apps found in this team. You can create a new app instead."
+            in result.output
+        )

tests/test_cli_login.py

@@ -1,6 +1,7 @@
 from pathlib import Path
 from unittest.mock import patch
 
+import httpx
 import pytest
 import respx
 from httpx import Response
@@ -33,7 +34,7 @@ def test_shows_a_message_if_something_is_wrong(respx_mock: respx.MockRouter) ->
 
 
 @pytest.mark.respx(base_url=settings.base_api_url)
-def test_full_login(respx_mock: respx.MockRouter) -> None:
+def test_full_login(respx_mock: respx.MockRouter, temp_auth_config: Path) -> None:
     with patch("fastapi_cloud_cli.commands.login.typer.launch") as mock_open:
         respx_mock.post(
             "/login/device/authorization", data={"client_id": settings.client_id}
@@ -55,11 +56,108 @@ def test_full_login(respx_mock: respx.MockRouter) -> None:
                 "client_id": settings.client_id,
                 "grant_type": "urn:ietf:params:oauth:grant-type:device_code",
             },
-        ).mock(return_value=Response(200, json={"access_token": "1234"}))
+        ).mock(return_value=Response(200, json={"access_token": "test_token_1234"}))
+
+        # Verify no auth file exists before login
+        assert not temp_auth_config.exists()
 
         result = runner.invoke(app, ["login"])
 
         assert result.exit_code == 0
         assert mock_open.called
         assert mock_open.call_args.args == ("http://test.com",)
         assert "Now you are logged in!" in result.output
+
+        # Verify auth file was created with correct content
+        assert temp_auth_config.exists()
+        assert '"access_token":"test_token_1234"' in temp_auth_config.read_text()
+
+
+@pytest.mark.respx(base_url=settings.base_api_url)
+def test_fetch_access_token_success_immediately(respx_mock: respx.MockRouter) -> None:
+    from fastapi_cloud_cli.commands.login import _fetch_access_token
+    from fastapi_cloud_cli.utils.api import APIClient
+
+    respx_mock.post(
+        "/login/device/token",
+        data={
+            "device_code": "test_device_code",
+            "client_id": settings.client_id,
+            "grant_type": "urn:ietf:params:oauth:grant-type:device_code",
+        },
+    ).mock(return_value=Response(200, json={"access_token": "test_token_success"}))
+
+    with APIClient() as client:
+        access_token = _fetch_access_token(client, "test_device_code", 5)
+
+    assert access_token == "test_token_success"
+
+
+@pytest.mark.respx(base_url=settings.base_api_url)
+def test_fetch_access_token_authorization_pending_then_success(
+    respx_mock: respx.MockRouter,
+) -> None:
+    from fastapi_cloud_cli.commands.login import _fetch_access_token
+    from fastapi_cloud_cli.utils.api import APIClient
+
+    # First call returns authorization pending, second call succeeds
+    respx_mock.post(
+        "/login/device/token",
+        data={
+            "device_code": "test_device_code",
+            "client_id": settings.client_id,
+            "grant_type": "urn:ietf:params:oauth:grant-type:device_code",
+        },
+    ).mock(
+        side_effect=[
+            Response(400, json={"error": "authorization_pending"}),
+            Response(200, json={"access_token": "test_token_after_pending"}),
+        ]
+    )
+
+    with patch("fastapi_cloud_cli.commands.login.time.sleep") as mock_sleep:
+        with APIClient() as client:
+            access_token = _fetch_access_token(client, "test_device_code", 3)
+
+        assert access_token == "test_token_after_pending"
+        mock_sleep.assert_called_once_with(3)
+
+
+@pytest.mark.respx(base_url=settings.base_api_url)
+def test_fetch_access_token_handles_400_error_not_authorization_pending(
+    respx_mock: respx.MockRouter,
+) -> None:
+    from fastapi_cloud_cli.commands.login import _fetch_access_token
+    from fastapi_cloud_cli.utils.api import APIClient
+
+    respx_mock.post(
+        "/login/device/token",
+        data={
+            "device_code": "test_device_code",
+            "client_id": settings.client_id,
+            "grant_type": "urn:ietf:params:oauth:grant-type:device_code",
+        },
+    ).mock(return_value=Response(400, json={"error": "access_denied"}))
+
+    with APIClient() as client:
+        with pytest.raises(httpx.HTTPStatusError):
+            _fetch_access_token(client, "test_device_code", 5)
+
+
+@pytest.mark.respx(base_url=settings.base_api_url)
+def test_fetch_access_token_handles_500_error(respx_mock: respx.MockRouter) -> None:
+    from fastapi_cloud_cli.commands.login import _fetch_access_token
+    from fastapi_cloud_cli.utils.api import APIClient
+
+    respx_mock.post(
+        "/login/device/token",
+        data={
+            "device_code": "test_device_code",
+            "client_id": settings.client_id,
+            "grant_type": "urn:ietf:params:oauth:grant-type:device_code",
+        },
+    ).mock(return_value=Response(500))
+
+    with APIClient() as client:
+        with pytest.raises(httpx.HTTPStatusError):
+            _fetch_access_token(client, "test_device_code", 5)