T12351: Fix --extension being swallowed from the maintenance script (#67)

* T12351: Fix --extension being swallowed from the maintenance script

* Add test for maintenance script getting --extension

* Fix false mypy errors

* Add more tests as requested

Author: BlankEclair

miraheze/mediawiki/mwscript.py

@@ -146,17 +146,17 @@ def run(info: CommandInfo) -> None:  # pragma: no cover
         print('Aborted!')
 
 
-def get_args() -> argparse.Namespace:
+def get_args(input_args: list | None = None) -> argparse.Namespace:
     parser = argparse.ArgumentParser(description='Run a MediaWiki Script')
     parser.add_argument('script')
-    parser.add_argument('arguments', nargs='*', default=[])
+    parser.add_argument('arguments', nargs=argparse.REMAINDER, default=[])
     parser.add_argument('--version', dest='version')
     parser.add_argument('--extension', '--skin', dest='extension')
     parser.add_argument('--no-log', dest='nolog', action='store_true')
     parser.add_argument('--confirm', '--yes', '-y', dest='confirm', action='store_true')
 
-    args = parser.parse_known_args()[0]
-    args.arguments += parser.parse_known_args()[1]
+    args, arguments = parser.parse_known_args(input_args)
+    args.arguments += arguments
     return args
 
 

tests/test_mwscript.py

@@ -3,6 +3,30 @@
 from unittest.mock import patch
 
 
+# T12351
+def test_get_args_extension_left():
+    args = mwscript.get_args(['--extension=awawa', 'testScript.php', '--test'])
+    assert args.extension == 'awawa'
+    assert args.script == 'testScript.php'
+    assert args.arguments == ['--test']
+
+
+# T12351
+def test_get_args_extension_right():
+    args = mwscript.get_args(['testScript.php', '--extension=awawa', '--test'])
+    assert args.extension is None
+    assert args.script == 'testScript.php'
+    assert args.arguments == ['--extension=awawa', '--test']
+
+
+# T12351
+def test_get_args_maintenance_script_gets_all_arguments():
+    args = mwscript.get_args(['--extension=a', 'testScript.php', '--extension=b', '--test'])
+    assert args.extension == 'a'
+    assert args.script == 'testScript.php'
+    assert args.arguments == ['--extension=b', '--test']
+
+
 def test_get_command_simple():
     args = mwscript.get_args()
     args.script = 'test.php'