diff --git a/tests/unit/10_apps.bats b/tests/unit/10_apps.bats index 0c3464224..e9f714fb2 100644 --- a/tests/unit/10_apps.bats +++ b/tests/unit/10_apps.bats @@ -11,17 +11,10 @@ teardown() { } @test "(apps) apps:help" { - run /bin/bash -c "dokku apps" - echo "output: $output" - echo "status: $status" - assert_output_contains "Manage apps" - help_output="$output" - run /bin/bash -c "dokku apps:help" echo "output: $output" echo "status: $status" assert_output_contains "Manage apps" - assert_output "$help_output" } @test "(apps) apps:create" { diff --git a/tests/unit/10_certs.bats b/tests/unit/10_certs.bats index bfe677dd4..25c9b5ab2 100644 --- a/tests/unit/10_certs.bats +++ b/tests/unit/10_certs.bats @@ -28,17 +28,10 @@ teardown() { } @test "(certs) certs:help" { - run /bin/bash -c "dokku certs" - echo "output: $output" - echo "status: $status" - assert_output_contains "Manage SSL (TLS) certs" - help_output="$output" - run /bin/bash -c "dokku certs:help" echo "output: $output" echo "status: $status" assert_output_contains "Manage SSL (TLS) certs" - assert_output "$help_output" } @test "(certs) certs:add" { diff --git a/tests/unit/10_checks.bats b/tests/unit/10_checks.bats index e8ba665fb..10811ea8e 100644 --- a/tests/unit/10_checks.bats +++ b/tests/unit/10_checks.bats @@ -17,17 +17,10 @@ teardown() { } @test "(checks) checks:help" { - run /bin/bash -c "dokku checks" - echo "output: $output" - echo "status: $status" - assert_output_contains "Manage zero-downtime settings" - help_output="$output" - run /bin/bash -c "dokku checks:help" echo "output: $output" echo "status: $status" assert_output_contains "Manage zero-downtime settings" - assert_output "$help_output" } @test "(checks) checks" { diff --git a/tests/unit/10_ps-general.bats b/tests/unit/10_ps-general.bats index 4b2fc7220..11a935824 100644 --- a/tests/unit/10_ps-general.bats +++ b/tests/unit/10_ps-general.bats @@ -13,17 +13,10 @@ teardown() { } @test "(ps) ps:help" { - run /bin/bash -c "dokku ps" - echo "output: $output" - echo "status: $status" - assert_output_contains "Manage container processes" - help_output="$output" - run /bin/bash -c "dokku ps:help" echo "output: $output" echo "status: $status" assert_output_contains "Manage container processes" - assert_output "$help_output" } @test "(ps) ps:inspect" { diff --git a/tests/unit/20_docker-options.bats b/tests/unit/20_docker-options.bats index 5744a647d..63d0689bc 100644 --- a/tests/unit/20_docker-options.bats +++ b/tests/unit/20_docker-options.bats @@ -13,17 +13,10 @@ teardown() { } @test "(docker-options) docker-options:help" { - run /bin/bash -c "dokku docker-options" - echo "output: $output" - echo "status: $status" - assert_output_contains "Manage docker options for an app" - help_output="$output" - run /bin/bash -c "dokku docker-options:help" echo "output: $output" echo "status: $status" assert_output_contains "Manage docker options for an app" - assert_output "$help_output" } @test "(docker-options) docker-options:add (all phases)" { diff --git a/tests/unit/20_domains.bats b/tests/unit/20_domains.bats index b0ff43e91..91b7cd6f5 100644 --- a/tests/unit/20_domains.bats +++ b/tests/unit/20_domains.bats @@ -17,17 +17,10 @@ teardown() { } @test "(domains) domains:help" { - run /bin/bash -c "dokku domains" - echo "output: $output" - echo "status: $status" - assert_output_contains "Manage domains used by the proxy" - help_output="$output" - run /bin/bash -c "dokku domains:help" echo "output: $output" echo "status: $status" assert_output_contains "Manage domains used by the proxy" - assert_output "$help_output" } @test "(domains) domains" { diff --git a/tests/unit/40_plugin.bats b/tests/unit/40_plugin.bats index 3dc8ffc3e..4b082931a 100644 --- a/tests/unit/40_plugin.bats +++ b/tests/unit/40_plugin.bats @@ -25,17 +25,10 @@ teardown() { } @test "(plugin) plugin:help" { - run /bin/bash -c "dokku plugin" - echo "output: $output" - echo "status: $status" - assert_output_contains "Manage installed plugins" - help_output="$output" - run /bin/bash -c "dokku plugin:help" echo "output: $output" echo "status: $status" assert_output_contains "Manage installed plugins" - assert_output "$help_output" } @test "(plugin) plugin:install, plugin:disable, plugin:update plugin:uninstall" { diff --git a/tests/unit/40_proxy.bats b/tests/unit/40_proxy.bats index ec4ee319d..ed7bac817 100644 --- a/tests/unit/40_proxy.bats +++ b/tests/unit/40_proxy.bats @@ -42,17 +42,10 @@ assert_external_port() { } @test "(proxy) proxy:help" { - run /bin/bash -c "dokku proxy" - echo "output: $output" - echo "status: $status" - assert_output_contains "Manage the proxy integration for an app" - help_output="$output" - run /bin/bash -c "dokku proxy:help" echo "output: $output" echo "status: $status" assert_output_contains "Manage the proxy integration for an app" - assert_output "$help_output" } @test "(proxy) proxy:enable/disable" { diff --git a/tests/unit/40_trace.bats b/tests/unit/40_trace.bats index 41bed414d..23907f1c1 100644 --- a/tests/unit/40_trace.bats +++ b/tests/unit/40_trace.bats @@ -12,6 +12,13 @@ teardown() { global_teardown } +@test "(trace) trace:help" { + run /bin/bash -c "dokku trace:help" + echo "output: $output" + echo "status: $status" + assert_output_contains "Manage trace mode" +} + @test "(trace) trace:on" { run /bin/bash -c "dokku trace:on" echo "output: $output" @@ -24,20 +31,6 @@ teardown() { assert_success } -@test "(trace) trace:help" { - run /bin/bash -c "dokku trace" - echo "output: $output" - echo "status: $status" - assert_output_contains "Manage trace mode" - help_output="$output" - - run /bin/bash -c "dokku trace:help" - echo "output: $output" - echo "status: $status" - assert_output_contains "Manage trace mode" - assert_output "$help_output" -} - @test "(trace) trace on" { run /bin/bash -c "dokku trace on" echo "output: $output"