- F move verify_argument_parser scrubber to caller

approvals · Nov 12, 2024 · cc0423b · cc0423b
1 parent ae7b1ff
commit cc0423b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/approvaltests/approvals.py b/approvaltests/approvals.py
@@ -417,11 +417,7 @@ def verify_argument_parser(
     options: Optional[Options] = None,
 ) -> None:
     parser.formatter_class = lambda prog: argparse.HelpFormatter(prog, width=200)
-    options = options or Options()
-    scrubber = lambda t: t.replace("options:", "<optional header>:").replace(
-        "optional arguments:", "<optional header>:"
-    )
     verify(
         parser.format_help(),
-        options=options.with_scrubber(scrubber),
+        options=options,
     )
diff --git a/tests/test_find_stale_approved_files.py b/tests/test_find_stale_approved_files.py
@@ -52,7 +52,10 @@ def execute_script(directory, log_file):
 
 
 def test_create_argument_parser():
-    verify_argument_parser(create_argument_parser())
+    scrubber = lambda t: t.replace("options:", "<optional header>:").replace(
+        "optional arguments:", "<optional header>:"
+    )
+    verify_argument_parser(create_argument_parser(), options=Options().with_scrubber(scrubber))
 
 
 def test_find_stale_approved_files():

diff --git a/tests/test_verify_argument_parser.py b/tests/test_verify_argument_parser.py
@@ -3,6 +3,7 @@
 
 from approvaltests import verify_argument_parser
 from tests.find_stale_approved_files import create_argument_parser
+from approvaltests.core.options import Options
 
 
 def test_argument_parser():
@@ -13,4 +14,8 @@ def test_argument_parser():
     parser.add_argument("1st_argument", help="1st argument help text")
     parser.add_argument("--optional_argument", help="An Optional Argument help text")
     parser.add_argument("long_argument", help=f"{'Very' * 100} Long message")
-    verify_argument_parser(parser)
+
+    scrubber = lambda t: t.replace("options:", "<optional header>:").replace(
+        "optional arguments:", "<optional header>:"
+    )
+    verify_argument_parser(parser, options=Options().with_scrubber(scrubber))