cleanup

fastapi · Dec 12, 2024 · c687a85 · c687a85
1 parent dd7edfd
commit c687a85
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 122 deletions.
diff --git a/tests/assets/cli/multi_app_norich.py b/tests/assets/cli/multi_app_norich.py
@@ -10,7 +10,6 @@ def hello(name: str = "World", age: int = typer.Option(0, help="The age of the u
     """
     Say Hello
     """
-    typer.echo(f"Hello {name}")
 
 
 @sub_app.command()
@@ -25,7 +24,6 @@ def bye():
     """
     Say bye
     """
-    typer.echo("sub bye")
 
 
 app = typer.Typer(help="Demo App", epilog="The end", rich_markup_mode=None)
@@ -37,4 +35,3 @@ def top():
     """
     Top command
     """
-    typer.echo("top")
diff --git a/tests/assets/cli/multiapp-docs-norich.md b/tests/assets/cli/multiapp-docs-norich.md
diff --git a/tests/test_cli/test_doc.py b/tests/test_cli/test_doc.py
@@ -28,7 +28,8 @@ def test_doc():
     assert "**Arguments**" in result.stdout
 
 
-def test_doc_no_rich():
+def test_doc_output(tmp_path: Path):
+    out_file: Path = tmp_path / "out.md"
     result = subprocess.run(
         [
             sys.executable,
@@ -37,22 +38,25 @@ def test_doc_no_rich():
             "run",
             "-m",
             "typer",
-            "tests.assets.cli.multi_app_norich",
+            "tests.assets.cli.multi_app",
             "utils",
             "docs",
             "--name",
             "multiapp",
+            "--output",
+            str(out_file),
         ],
         capture_output=True,
         encoding="utf-8",
     )
     docs_path: Path = Path(__file__).parent.parent / "assets/cli/multiapp-docs.md"
     docs = docs_path.read_text()
-    assert docs in result.stdout
-    assert "**Arguments**" in result.stdout
+    written_docs = out_file.read_text()
+    assert docs in written_docs
+    assert "Docs saved to:" in result.stdout
 
 
-def test_doc_output(tmp_path: Path):
+def test_doc_title_output(tmp_path: Path):
     out_file: Path = tmp_path / "out.md"
     result = subprocess.run(
         [
@@ -67,21 +71,22 @@ def test_doc_output(tmp_path: Path):
             "docs",
             "--name",
             "multiapp",
+            "--title",
+            "Awesome CLI",
             "--output",
             str(out_file),
         ],
         capture_output=True,
         encoding="utf-8",
     )
-    docs_path: Path = Path(__file__).parent.parent / "assets/cli/multiapp-docs.md"
+    docs_path: Path = Path(__file__).parent.parent / "assets/cli/multiapp-docs-title.md"
     docs = docs_path.read_text()
     written_docs = out_file.read_text()
     assert docs in written_docs
     assert "Docs saved to:" in result.stdout
 
 
-def test_doc_title_output(tmp_path: Path):
-    out_file: Path = tmp_path / "out.md"
+def test_doc_no_rich():
     result = subprocess.run(
         [
             sys.executable,
@@ -90,24 +95,19 @@ def test_doc_title_output(tmp_path: Path):
             "run",
             "-m",
             "typer",
-            "tests.assets.cli.multi_app",
+            "tests.assets.cli.multi_app_norich",
             "utils",
             "docs",
             "--name",
             "multiapp",
-            "--title",
-            "Awesome CLI",
-            "--output",
-            str(out_file),
         ],
         capture_output=True,
         encoding="utf-8",
     )
-    docs_path: Path = Path(__file__).parent.parent / "assets/cli/multiapp-docs-title.md"
+    docs_path: Path = Path(__file__).parent.parent / "assets/cli/multiapp-docs.md"
     docs = docs_path.read_text()
-    written_docs = out_file.read_text()
-    assert docs in written_docs
-    assert "Docs saved to:" in result.stdout
+    assert docs in result.stdout
+    assert "**Arguments**" in result.stdout
 
 
 def test_doc_not_existing():