Skip to content

Commit 6ea8eb5

Browse files
committed
Update tests for ConfigPath
1 parent 089b464 commit 6ea8eb5

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

tests/test_cli.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -222,12 +222,7 @@ def test_scan_config_arg(homedir, configdir, projectdir, monkeypatch):
222222
runner = CliRunner()
223223

224224
@click.command()
225-
@click.argument(
226-
'config',
227-
type=click.Path(exists=True),
228-
nargs=-1,
229-
callback=cli.scan_config_argument,
230-
)
225+
@click.argument('config', type=cli.ConfigPath(exists=True), nargs=-1)
231226
def config_cmd(config):
232227
click.echo(config)
233228

@@ -466,7 +461,8 @@ def test_import_tmuxinator(cli_args, inputs, tmpdir, monkeypatch):
466461

467462
with tmpdir.as_cwd():
468463
runner = CliRunner()
469-
runner.invoke(cli.cli, cli_args, input=''.join(inputs))
464+
out = runner.invoke(cli.cli, cli_args, input=''.join(inputs))
465+
print(out.output)
470466
assert tmpdir.join('la.yaml').check()
471467

472468

@@ -513,20 +509,21 @@ def test_validate_choices():
513509
assert validate('choice3')
514510

515511

516-
def test_create_scan_config_arg(tmpdir):
512+
def test_pass_config_dir_ClickPath(tmpdir):
517513
configdir = tmpdir.join('myconfigdir')
518514
configdir.mkdir()
519515
user_config_name = 'myconfig'
520516
user_config = configdir.join('%s.yaml' % user_config_name).ensure()
521517

522518
expect = str(configdir.join('myconfig.yaml'))
523-
my_scan_config = cli._create_scan_config_argument(str(configdir))
524519

525520
runner = CliRunner()
526521

527522
@click.command()
528523
@click.argument(
529-
'config', type=click.Path(exists=True), nargs=-1, callback=my_scan_config
524+
'config',
525+
type=cli.ConfigPath(exists=True, config_dir=(str(configdir))),
526+
nargs=-1,
530527
)
531528
def config_cmd(config):
532529
click.echo(config)

0 commit comments

Comments
 (0)