Fix cosmetic test failures after status output change

Author: lampholder

src/faff_cli/main.py

@@ -30,7 +30,7 @@
 @cli.callback(invoke_without_command=True)
 def main(
     ctx: typer.Context,
-    version: bool = typer.Option(None, "--version", help="Show version and exit", is_flag=True),
+    version: bool = typer.Option(False, "--version", help="Show version and exit"),
 ):
     # Handle --version flag
     if version:

tests/test_cli_plan.py

@@ -68,23 +68,23 @@ def test_plan_remotes_lists_sources(self, temp_faff_dir, monkeypatch):
 
 
 class TestPlanPullCommand:
-    """Test the 'faff plan pull' command."""
+    """Test the 'faff pull' command (pulls plans from remotes)."""
 
     def test_plan_pull_all_remotes(self, temp_faff_dir, monkeypatch):
         """Should pull from all remotes when no ID specified."""
         monkeypatch.setenv("FAFF_DIR", str(temp_faff_dir))
 
-        result = runner.invoke(cli, ["plan", "pull"])
+        result = runner.invoke(cli, ["pull"])
 
-        # Should complete without error
+        # Should complete without error (even if no remotes configured)
         assert result.exit_code == 0
 
     def test_plan_pull_specific_remote(self, temp_faff_dir, monkeypatch):
         """Should pull from specific remote by ID."""
         monkeypatch.setenv("FAFF_DIR", str(temp_faff_dir))
 
         # Try pulling from a remote that may not exist
-        result = runner.invoke(cli, ["plan", "pull", "local"])
+        result = runner.invoke(cli, ["pull", "local"])
 
         # May fail if "local" remote doesn't exist, which is fine
         # assert result.exit_code == 0 or "No plans" in result.stdout or "Unknown" in result.stdout
@@ -93,7 +93,7 @@ def test_plan_pull_invalid_remote(self, temp_faff_dir, monkeypatch):
         """Should fail gracefully for invalid remote ID."""
         monkeypatch.setenv("FAFF_DIR", str(temp_faff_dir))
 
-        result = runner.invoke(cli, ["plan", "pull", "nonexistent-remote"])
+        result = runner.invoke(cli, ["pull", "nonexistent-remote"])
 
         # Should either exit with error or show helpful message
         assert result.exit_code != 0 or "Unknown" in result.stdout

tests/test_cli_status.py

@@ -12,41 +12,50 @@
 class TestStatusCommand:
     """Test the 'faff status' command."""
 
-    def test_status_shows_version(self, temp_faff_dir, monkeypatch):
-        """Should display faff-core version."""
+    def test_status_shows_plans_section(self, temp_faff_dir, monkeypatch):
+        """Should display Plans section."""
         monkeypatch.setenv("FAFF_DIR", str(temp_faff_dir))
 
         result = runner.invoke(cli, ["status"])
 
         assert result.exit_code == 0
-        assert "faff-core version:" in result.stdout
+        assert "Plans:" in result.stdout
 
-    def test_status_shows_repo_location(self, temp_faff_dir, monkeypatch):
-        """Should display repository location."""
+    def test_status_shows_today_section(self, temp_faff_dir, monkeypatch):
+        """Should display Today section with tracking info."""
         monkeypatch.setenv("FAFF_DIR", str(temp_faff_dir))
 
         result = runner.invoke(cli, ["status"])
 
         assert result.exit_code == 0
-        assert "Ledger:" in result.stdout
+        assert "Today:" in result.stdout
 
     def test_status_shows_no_active_session(self, temp_faff_dir, monkeypatch):
-        """Should indicate when not working on anything."""
+        """Should indicate when not tracking anything."""
         monkeypatch.setenv("FAFF_DIR", str(temp_faff_dir))
 
         result = runner.invoke(cli, ["status"])
 
         assert result.exit_code == 0
-        assert "Not currently working on anything" in result.stdout
+        assert "Not tracking" in result.stdout
 
-    def test_status_shows_total_time(self, temp_faff_dir, monkeypatch):
-        """Should display total recorded time for today."""
+    def test_status_shows_compile_section(self, temp_faff_dir, monkeypatch):
+        """Should display Logs to Compile section."""
         monkeypatch.setenv("FAFF_DIR", str(temp_faff_dir))
 
         result = runner.invoke(cli, ["status"])
 
         assert result.exit_code == 0
-        assert "Total recorded time for today" in result.stdout
+        assert "Logs to Compile:" in result.stdout
+
+    def test_status_shows_push_section(self, temp_faff_dir, monkeypatch):
+        """Should display Timesheets to Push section."""
+        monkeypatch.setenv("FAFF_DIR", str(temp_faff_dir))
+
+        result = runner.invoke(cli, ["status"])
+
+        assert result.exit_code == 0
+        assert "Timesheets to Push:" in result.stdout
 
 
 class TestInitCommand:

tests/test_integration.py

@@ -27,7 +27,7 @@ def test_init_status_workflow(self, tmp_path):
         # Check status in new repo
         result = runner.invoke(cli, ["status"], env={"FAFF_DIR": str(tmp_path)})
         assert result.exit_code == 0
-        assert "Not currently working on anything" in result.stdout
+        assert "Not tracking" in result.stdout
 
     def test_create_and_view_log_workflow(self, temp_faff_dir, monkeypatch):
         """
@@ -73,8 +73,8 @@ def test_plan_remotes_pull_workflow(self, temp_faff_dir, monkeypatch):
         assert result.exit_code == 0
         assert "remote" in result.stdout.lower()
 
-        # Pull from remotes
-        result = runner.invoke(cli, ["plan", "pull"])
+        # Pull from remotes (now a top-level command)
+        result = runner.invoke(cli, ["pull"])
         assert result.exit_code == 0