test_shell explicitly

Author: tony

tests/test_cli.py

@@ -516,7 +516,7 @@ def test_shell(
 
 
 @pytest.mark.parametrize(
-    "cli_args,inputs,env,exception, message",
+    "cli_args,inputs,env,exception,message",
     [
         (
             ['shell', '-L{SOCKET_NAME}', '-c', 'print(str(server.socket_name))'],
@@ -548,6 +548,66 @@ def test_shell_no_server(
             )
 
 
+@pytest.mark.parametrize(
+    "cli_args,inputs,env,message",
+    [
+        (
+            [
+                'shell_plus',
+                '-L{SOCKET_NAME}',
+            ],
+            [],
+            {},
+            '(InteractiveConsole)',
+        ),
+        (
+            [
+                'shell_plus',
+                '-L{SOCKET_NAME}',
+            ],
+            [],
+            {'PANE_ID': '{PANE_ID}'},
+            '(InteractiveConsole)',
+        ),
+    ],
+)
+def test_shell_plus(
+    cli_args,
+    inputs,
+    env,
+    message,
+    tmpdir,
+    monkeypatch,
+    server,
+    session,
+):
+    monkeypatch.setenv('HOME', str(tmpdir))
+    window_name = 'my_window'
+    window = session.new_window(window_name=window_name)
+    window.split_window()
+
+    template_ctx = dict(
+        SOCKET_NAME=server.socket_name,
+        SOCKET_PATH=server.socket_path,
+        SESSION_NAME=session.name,
+        WINDOW_NAME=window_name,
+        PANE_ID=window.attached_pane.id,
+        SERVER_SOCKET_NAME=server.socket_name,
+    )
+
+    cli_args[:] = [cli_arg.format(**template_ctx) for cli_arg in cli_args]
+    for k, v in env.items():
+        monkeypatch.setenv(k, v.format(**template_ctx))
+
+    with tmpdir.as_cwd():
+        runner = CliRunner()
+
+        result = runner.invoke(
+            cli.cli, cli_args, input=''.join(inputs), catch_exceptions=True
+        )
+        assert message.format(**template_ctx) in result.output
+
+
 @pytest.mark.parametrize(
     "cli_args",
     [