Merge pull request #3854 from dokku/remove-deprecated-code

Remove deprecated code
2020-02-17 05:51:20 -05:00
parent cfee47f382 04e1837e9e
commit b04080bcb1
37 changed files with 297 additions and 418 deletions
--- a/tests/unit/10_apps.bats
+++ b/tests/unit/10_apps.bats
@@ -11,10 +11,17 @@ 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" {
--- a/tests/unit/10_certs.bats
+++ b/tests/unit/10_certs.bats
@@ -28,10 +28,17 @@ 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" {
@@ -62,13 +69,6 @@ teardown() {
  assert_success
 }

-@test "(certs) certs:info" {
-  run /bin/bash -c "dokku certs:add $TEST_APP < $BATS_TEST_DIRNAME/server_ssl.tar && dokku certs:info $TEST_APP"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-}
-
@test "(certs) certs:remove" {
  run /bin/bash -c "dokku certs:add $TEST_APP < $BATS_TEST_DIRNAME/server_ssl.tar && dokku certs:remove $TEST_APP"
  echo "output: $output"
--- a/tests/unit/10_checks.bats
+++ b/tests/unit/10_checks.bats
@@ -17,17 +17,17 @@ 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"
-}
-
-@test "(checks) checks" {
-  run /bin/bash -c "dokku checks $TEST_APP 2>/dev/null | grep $TEST_APP | xargs"
-  echo "output: $output"
-  echo "status: $status"
-  assert_output "$TEST_APP none none"
+  assert_output "$help_output"
 }

@test "(checks) checks:disable" {
--- a/tests/unit/20_docker-options.bats
+++ b/tests/unit/20_docker-options.bats
@@ -13,10 +13,17 @@ 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)" {
@@ -24,13 +31,23 @@ teardown() {
  echo "output: $output"
  echo "status: $status"
  assert_success
-  run /bin/bash -c "dokku docker-options $TEST_APP | egrep '\-v /tmp' | wc -l | grep -q 3"
+  run /bin/bash -c "dokku docker-options:report $TEST_APP --docker-options-build"
  echo "output: $output"
  echo "status: $status"
  assert_success
+  assert_output_contains "-v /tmp"
+  run /bin/bash -c "dokku docker-options:report $TEST_APP --docker-options-deploy"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "-v /tmp"
+  run /bin/bash -c "dokku docker-options:report $TEST_APP --docker-options-run"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "-v /tmp"
 }

-
@test "(docker-options) docker-options:clear" {
  run /bin/bash -c "dokku docker-options:add $TEST_APP build,deploy,run \"-v /tmp\""
  echo "output: $output"
@@ -40,10 +57,21 @@ teardown() {
  echo "output: $output"
  echo "status: $status"
  assert_success
-  run /bin/bash -c "dokku docker-options $TEST_APP | egrep '\-v /tmp' | wc -l | grep -q 0"
+  run /bin/bash -c "dokku docker-options:report $TEST_APP --docker-options-build"
  echo "output: $output"
  echo "status: $status"
  assert_success
+  assert_output_contains "-v /tmp" 0
+  run /bin/bash -c "dokku docker-options:report $TEST_APP --docker-options-deploy"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "-v /tmp" 0
+  run /bin/bash -c "dokku docker-options:report $TEST_APP --docker-options-run"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "-v /tmp" 0

  run /bin/bash -c "dokku docker-options:add $TEST_APP build,deploy,run \"-v /tmp\""
  echo "output: $output"
@@ -53,26 +81,61 @@ teardown() {
  echo "output: $output"
  echo "status: $status"
  assert_success
-  run /bin/bash -c "dokku docker-options $TEST_APP | egrep '\-v /tmp' | wc -l | grep -q 2"
+  run /bin/bash -c "dokku docker-options:report $TEST_APP --docker-options-build"
  echo "output: $output"
  echo "status: $status"
  assert_success
+  assert_output_contains "-v /tmp" 0
+  run /bin/bash -c "dokku docker-options:report $TEST_APP --docker-options-deploy"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "-v /tmp"
+  run /bin/bash -c "dokku docker-options:report $TEST_APP --docker-options-run"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "-v /tmp"
+
  run /bin/bash -c "dokku docker-options:clear $TEST_APP deploy"
  echo "output: $output"
  echo "status: $status"
  assert_success
-  run /bin/bash -c "dokku docker-options $TEST_APP | egrep '\-v /tmp' | wc -l | grep -q 1"
+  run /bin/bash -c "dokku docker-options:report $TEST_APP --docker-options-build"
  echo "output: $output"
  echo "status: $status"
  assert_success
+  assert_output_contains "-v /tmp" 0
+  run /bin/bash -c "dokku docker-options:report $TEST_APP --docker-options-deploy"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "-v /tmp" 0
+  run /bin/bash -c "dokku docker-options:report $TEST_APP --docker-options-run"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "-v /tmp"
+
  run /bin/bash -c "dokku docker-options:clear $TEST_APP run"
  echo "output: $output"
  echo "status: $status"
  assert_success
-  run /bin/bash -c "dokku docker-options $TEST_APP | egrep '\-v /tmp' | wc -l | grep -q 0"
+  run /bin/bash -c "dokku docker-options:report $TEST_APP --docker-options-build"
  echo "output: $output"
  echo "status: $status"
  assert_success
+  assert_output_contains "-v /tmp" 0
+  run /bin/bash -c "dokku docker-options:report $TEST_APP --docker-options-deploy"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "-v /tmp" 0
+  run /bin/bash -c "dokku docker-options:report $TEST_APP --docker-options-run"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "-v /tmp" 0
 }

@test "(docker-options) docker-options:add (build phase)" {
@@ -80,10 +143,11 @@ teardown() {
  echo "output: $output"
  echo "status: $status"
  assert_success
-  run /bin/bash -c "dokku docker-options $TEST_APP build | egrep '\-v /tmp' | wc -l | grep -q 1"
+  run /bin/bash -c "dokku docker-options:report $TEST_APP --docker-options-build"
  echo "output: $output"
  echo "status: $status"
  assert_success
+  assert_output_contains "-v /tmp"
 }

@test "(docker-options) docker-options:add (deploy phase)" {
@@ -91,10 +155,11 @@ teardown() {
  echo "output: $output"
  echo "status: $status"
  assert_success
-  run /bin/bash -c "dokku docker-options $TEST_APP deploy | egrep '\-v /tmp' | wc -l | grep -q 1"
+  run /bin/bash -c "dokku docker-options:report $TEST_APP  --docker-options-deploy"
  echo "output: $output"
  echo "status: $status"
  assert_success
+  assert_output_contains "-v /tmp"
 }

@test "(docker-options) docker-options:add (run phase)" {
@@ -102,10 +167,11 @@ teardown() {
  echo "output: $output"
  echo "status: $status"
  assert_success
-  run /bin/bash -c "dokku docker-options $TEST_APP run | egrep '\-v /tmp' | wc -l | grep -q 1"
+  run /bin/bash -c "dokku docker-options:report $TEST_APP  --docker-options-run"
  echo "output: $output"
  echo "status: $status"
  assert_success
+  assert_output_contains "-v /tmp"
 }

@test "(docker-options) docker-options:remove (all phases)" {
@@ -113,18 +179,21 @@ teardown() {
  echo "output: $output"
  echo "status: $status"
  assert_success
-  run /bin/bash -c "dokku docker-options $TEST_APP | egrep '\-v /tmp' | wc -l | grep -q 3"
+  run /bin/bash -c "dokku docker-options:report $TEST_APP"
  echo "output: $output"
  echo "status: $status"
  assert_success
+  assert_output_contains "-v /tmp" 3
  run /bin/bash -c "dokku docker-options:remove $TEST_APP build,deploy,run \"-v /tmp\""
  echo "output: $output"
  echo "status: $status"
  assert_success
-  run /bin/bash -c "dokku docker-options $TEST_APP 2>/dev/null | xargs"
+  run /bin/bash -c "dokku docker-options:report $TEST_APP"
  echo "output: $output"
  echo "status: $status"
-  assert_output "Deploy options: --restart=on-failure:10"
+  assert_success
+  assert_output_contains "-v /tmp" 0
+  assert_output_contains "Docker options deploy:         --restart=on-failure:10"
 }

@test "(docker-options) docker-options:remove (build phase)" {
@@ -132,18 +201,20 @@ teardown() {
  echo "output: $output"
  echo "status: $status"
  assert_success
-  run /bin/bash -c "dokku docker-options $TEST_APP | egrep '\-v /tmp' | wc -l | grep -q 3"
+  run /bin/bash -c "dokku docker-options:report $TEST_APP"
  echo "output: $output"
  echo "status: $status"
  assert_success
+  assert_output_contains "-v /tmp" 3
  run /bin/bash -c "dokku docker-options:remove $TEST_APP build \"-v /tmp\""
  echo "output: $output"
  echo "status: $status"
  assert_success
-  run /bin/bash -c "dokku docker-options $TEST_APP build 2>/dev/null"
+  run /bin/bash -c "dokku docker-options:report $TEST_APP"
  echo "output: $output"
  echo "status: $status"
-  assert_output "Build options: none"
+  assert_success
+  assert_output_contains "-v /tmp" 2
 }

@test "(docker-options) docker-options:remove (deploy phase)" {
@@ -151,18 +222,20 @@ teardown() {
  echo "output: $output"
  echo "status: $status"
  assert_success
-  run /bin/bash -c "dokku docker-options $TEST_APP deploy | egrep '\-v /tmp' | wc -l | grep -q 1"
+  run /bin/bash -c "dokku docker-options:report $TEST_APP"
  echo "output: $output"
  echo "status: $status"
  assert_success
+  assert_output_contains "-v /tmp" 3
  run /bin/bash -c "dokku docker-options:remove $TEST_APP deploy \"-v /tmp\""
  echo "output: $output"
  echo "status: $status"
  assert_success
-  run /bin/bash -c "dokku docker-options $TEST_APP deploy 2>/dev/null | xargs"
+  run /bin/bash -c "dokku docker-options:report $TEST_APP"
  echo "output: $output"
  echo "status: $status"
-  assert_output "Deploy options: --restart=on-failure:10"
+  assert_success
+  assert_output_contains "-v /tmp" 2
 }

@test "(docker-options) docker-options:remove (run phase)" {
@@ -170,18 +243,20 @@ teardown() {
  echo "output: $output"
  echo "status: $status"
  assert_success
-  run /bin/bash -c "dokku docker-options $TEST_APP run | egrep '\-v /tmp' | wc -l | grep -q 1"
+  run /bin/bash -c "dokku docker-options:report $TEST_APP"
  echo "output: $output"
  echo "status: $status"
  assert_success
+  assert_output_contains "-v /tmp" 3
  run /bin/bash -c "dokku docker-options:remove $TEST_APP run \"-v /tmp\""
  echo "output: $output"
  echo "status: $status"
  assert_success
-  run /bin/bash -c "dokku docker-options $TEST_APP run 2>/dev/null"
+  run /bin/bash -c "dokku docker-options:report $TEST_APP"
  echo "output: $output"
  echo "status: $status"
-  assert_output "Run options: none"
+  assert_success
+  assert_output_contains "-v /tmp" 2
 }

@test "(docker-options) deploy with options" {
@@ -197,10 +272,11 @@ teardown() {
  echo "output: $output"
  echo "status: $status"
  assert_success
-  run /bin/bash -c "dokku docker-options $TEST_APP deploy | egrep '\-v /tmp' | wc -l | grep -q 1"
+  run /bin/bash -c "dokku docker-options:report $TEST_APP"
  echo "output: $output"
  echo "status: $status"
  assert_success
+  assert_output_contains "-v /tmp" 1
  deploy_app

  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
@@ -215,10 +291,11 @@ teardown() {
  echo "output: $output"
  echo "status: $status"
  assert_success
-  run /bin/bash -c "dokku docker-options $TEST_APP | egrep '\-v /tmp' | wc -l | grep -q 3"
+  run /bin/bash -c "dokku docker-options:report $TEST_APP"
  echo "output: $output"
  echo "status: $status"
  assert_success
+  assert_output_contains "-v /tmp" 3
 }

@test "(docker-options) dockerfile deploy with link" {
--- a/tests/unit/20_domains.bats
+++ b/tests/unit/20_domains.bats
@@ -17,18 +17,25 @@ 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" {
  dokku domains:setup $TEST_APP
-  run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null | grep ${TEST_APP}.dokku.me"
+  run /bin/bash -c "dokku domains:report $TEST_APP 2>/dev/null | grep ${TEST_APP}.dokku.me"
  echo "output: $output"
  echo "status: $status"
-  assert_output "${TEST_APP}.dokku.me"
+  assert_output_contains "${TEST_APP}.dokku.me"
 }

@test "(domains) domains:add" {
@@ -37,11 +44,6 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku domains:add $TEST_APP test.app.dokku.me"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-
  run /bin/bash -c "dokku domains:add $TEST_APP 2.app.dokku.me"
  echo "output: $output"
  echo "status: $status"
@@ -57,30 +59,28 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null"
+  run /bin/bash -c "dokku domains:report $TEST_APP 2>/dev/null"
  echo "output: $output"
  echo "status: $status"
  assert_success
-  assert_line www.test.app.dokku.me
-  assert_line test.app.dokku.me
-  assert_line 2.app.dokku.me
-  assert_line a--domain.with--hyphens
+  assert_output_contains www.test.app.dokku.me
+  assert_output_contains 2.app.dokku.me
+  assert_output_contains a--domain.with--hyphens
 }

@test "(domains) domains:add (multiple)" {
-  run /bin/bash -c "dokku domains:add $TEST_APP www.test.app.dokku.me test.app.dokku.me 2.app.dokku.me a--domain.with--hyphens"
+  run /bin/bash -c "dokku domains:add $TEST_APP www.test.app.dokku.me 2.app.dokku.me a--domain.with--hyphens"
  echo "output: $output"
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null"
+  run /bin/bash -c "dokku domains:report $TEST_APP 2>/dev/null"
  echo "output: $output"
  echo "status: $status"
  assert_success
-  assert_line www.test.app.dokku.me
-  assert_line test.app.dokku.me
-  assert_line 2.app.dokku.me
-  assert_line a--domain.with--hyphens
+  assert_output_contains www.test.app.dokku.me
+  assert_output_contains 2.app.dokku.me
+  assert_output_contains a--domain.with--hyphens
 }

@test "(domains) domains:add (duplicate)" {
@@ -113,11 +113,11 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null"
+  run /bin/bash -c "dokku domains:report $TEST_APP 2>/dev/null"
  echo "output: $output"
  echo "status: $status"
  assert_success
-  refute_line test.app.dokku.me
+  assert_output_contains test.app.dokku.me 0
 }

@test "(domains) domains:remove (multiple)" {
@@ -131,13 +131,13 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null"
+  run /bin/bash -c "dokku domains:report $TEST_APP 2>/dev/null"
  echo "output: $output"
  echo "status: $status"
  assert_success
-  refute_line www.test.app.dokku.me
-  refute_line test.app.dokku.me
-  assert_line 2.app.dokku.me
+  assert_output_contains www.test.app.dokku.me 0
+  assert_output_contains test.app.dokku.me 0
+  assert_output_contains 2.app.dokku.me
 }

@test "(domains) domains:remove (wildcard domain)" {
@@ -151,11 +151,11 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null"
+  run /bin/bash -c "dokku domains:report $TEST_APP 2>/dev/null"
  echo "output: $output"
  echo "status: $status"
  assert_success
-  refute_line *.dokku.me
+  assert_output_contains *.dokku.me 0
 }

@test "(domains) domains:set" {
@@ -169,14 +169,14 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null"
+  run /bin/bash -c "dokku domains:report $TEST_APP 2>/dev/null"
  echo "output: $output"
  echo "status: $status"
  assert_success
-  refute_line www.test.app.dokku.me
-  refute_line test.app.dokku.me
-  assert_line 2.app.dokku.me
-  assert_line a--domain.with--hyphens
+  assert_output_contains www.test.app.dokku.me 0
+  assert_output_contains test.app.dokku.me 0
+  assert_output_contains 2.app.dokku.me
+  assert_output_contains a--domain.with--hyphens
 }

@test "(domains) domains:clear" {
@@ -195,16 +195,11 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-  refute_line test.app.dokku.me
-
-  run /bin/bash -c "dokku domains:report $TEST_APP"
+  run /bin/bash -c "dokku domains:report $TEST_APP 2>/dev/null"
  echo "output: $output"
  echo "status: $status"
  assert_success
+  assert_output_contains test.app.dokku.me 0
 }

@test "(domains) domains:add-global" {
@@ -218,7 +213,7 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku domains 2>/dev/null | egrep -qw '^global.dokku.me\$'"
+  run /bin/bash -c "dokku domains:report 2>/dev/null | grep -qw 'global.dokku.me'"
  echo "output: $output"
  echo "status: $status"
  assert_success
@@ -230,17 +225,17 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku domains 2>/dev/null | grep -q global1.dokku.me"
+  run /bin/bash -c "dokku domains:report 2>/dev/null | grep -q global1.dokku.me"
  echo "output: $output"
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku domains 2>/dev/null | grep -q global2.dokku.me"
+  run /bin/bash -c "dokku domains:report 2>/dev/null | grep -q global2.dokku.me"
  echo "output: $output"
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku domains 2>/dev/null | grep -q global3.dokku.me"
+  run /bin/bash -c "dokku domains:report 2>/dev/null | grep -q global3.dokku.me"
  echo "output: $output"
  echo "status: $status"
  assert_success
@@ -285,12 +280,12 @@ teardown() {

  dokku domains:setup $TEST_APP

-  run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null"
+  run /bin/bash -c "dokku domains:report $TEST_APP 2>/dev/null"
  echo "output: $output"
  echo "status: $status"
  assert_success
-  assert_line ${TEST_APP}.global1.dokku.me
-  assert_line ${TEST_APP}.global2.dokku.me
+  assert_output_contains ${TEST_APP}.global1.dokku.me
+  assert_output_contains ${TEST_APP}.global2.dokku.me
 }

@test "(domains) domains:set-global" {
@@ -306,14 +301,14 @@ teardown() {

  dokku domains:setup $TEST_APP

-  run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null"
+  run /bin/bash -c "dokku domains:report $TEST_APP 2>/dev/null"
  echo "output: $output"
  echo "status: $status"
  assert_success
-  refute_line ${TEST_APP}.global1.dokku.me
-  refute_line ${TEST_APP}.global2.dokku.me
-  assert_line ${TEST_APP}.global3.dokku.me
-  assert_line ${TEST_APP}.global4.dokku.me
+  assert_output_contains ${TEST_APP}.global1.dokku.me 0
+  assert_output_contains ${TEST_APP}.global2.dokku.me 0
+  assert_output_contains ${TEST_APP}.global3.dokku.me
+  assert_output_contains ${TEST_APP}.global4.dokku.me
 }

@test "(domains) app name overlaps with global domain.tld" {
--- a/tests/unit/20_network.bats
+++ b/tests/unit/20_network.bats
@@ -18,31 +18,6 @@ teardown() {
  global_teardown
 }

-assert_nonssl_domain() {
-  local domain=$1
-  assert_app_domain "${domain}"
-  assert_http_success "http://${domain}"
-}
-
-assert_app_domain() {
-  local domain=$1
-  run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null | grep -xF ${domain}"
-  echo "output: $output"
-  echo "status: $status"
-  assert_output "${domain}"
-}
-
-assert_external_port() {
-  local CID="$1"; local exit_status="$2"
-  local EXTERNAL_PORT_COUNT=$(docker port $CID | wc -l)
-  run /bin/bash -c "[[ $EXTERNAL_PORT_COUNT -gt 0 ]]"
-  if [[ "$exit_status" == "success" ]]; then
-    assert_success
-  else
-    assert_failure
-  fi
-}
-
@test "(network) network:help" {
  run /bin/bash -c "dokku network"
  echo "output: $output"
@@ -73,7 +48,7 @@ assert_external_port() {
  assert_http_success "${TEST_APP}.dokku.me"

  for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.web.*; do
-    assert_external_port $(< $CID_FILE) success
+    assert_external_port $(< $CID_FILE)
  done

  run /bin/bash -c "dokku network:set $TEST_APP bind-all-interfaces false"
@@ -88,7 +63,7 @@ assert_external_port() {
  assert_http_success "${TEST_APP}.dokku.me"

  for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.web.*; do
-    assert_external_port $(< $CID_FILE) failure
+    assert_not_external_port $(< $CID_FILE)
  done
 }

--- a/tests/unit/30_client.bats
+++ b/tests/unit/30_client.bats
@@ -87,17 +87,6 @@ teardown() {
  assert_failure
 }

-@test "(client) domains" {
-  run /bin/bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh domains:setup $TEST_APP"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-  run /bin/bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh domains $TEST_APP | grep -q ${TEST_APP}.dokku.me"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-}
-
@test "(client) domains:add" {
  run /bin/bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh domains:add $TEST_APP www.test.app.dokku.me"
  echo "output: $output"
--- a/tests/unit/30_core_1.bats
+++ b/tests/unit/30_core_1.bats
@@ -16,14 +16,6 @@ teardown() {
  global_teardown
 }

-assert_urls() {
-  urls=$@
-  run /bin/bash -c "dokku urls $TEST_APP"
-  echo "output: $output"
-  echo "status: $status"
-  assert_output < <(tr ' ' '\n' <<< "${urls}")
-}
-
@test "(core) remove exited containers" {
  deploy_app

--- a/tests/unit/40_core_2.bats
+++ b/tests/unit/40_core_2.bats
@@ -13,24 +13,6 @@ teardown() {
  global_teardown
 }

-assert_urls() {
-  urls=$@
-  run /bin/bash -c "dokku urls $TEST_APP"
-  echo "output: $output"
-  echo "status: $status"
-  echo "urls:" $(tr ' ' '\n' <<< "${urls}" | sort)
-  assert_output < <(tr ' ' '\n' <<< "${urls}" | sort)
-}
-
-assert_url() {
-  url=$1
-  run /bin/bash -c "dokku url $TEST_APP"
-  echo "output: $output"
-  echo "status: $status"
-  echo "url: ${url}"
-  assert_output "${url}"
-}
-
@test "(core) cleanup:help" {
  run /bin/bash -c "dokku cleanup:help"
  echo "output: $output"
--- a/tests/unit/40_nginx-vhosts_2.bats
+++ b/tests/unit/40_nginx-vhosts_2.bats
@@ -1,7 +1,6 @@
 #!/usr/bin/env bats

 load test_helper
-source "$PLUGIN_CORE_AVAILABLE_PATH/config/functions"

 setup() {
  global_setup
@@ -17,18 +16,6 @@ teardown() {
  global_teardown
 }

-assert_access_log() {
-  local prefix=$1
-  run [ -a /var/log/nginx/$prefix-access.log ]
-  assert_success
-}
-
-assert_error_log() {
-  local prefix=$1
-  run [ -a /var/log/nginx/$prefix-error.log ]
-  assert_success
-}
-
@test "(nginx-vhosts) nginx (no server tokens)" {
  deploy_app
  run /bin/bash -c "curl -s -D - $(dokku url $TEST_APP) -o /dev/null | egrep '^Server' | egrep '[0-9]+'"
@@ -48,6 +35,7 @@ assert_error_log() {
  add_domain "node-js-app.dokku.me"
  add_domain "test.dokku.me"
  deploy_app
+  dokku nginx:show-conf $TEST_APP
  assert_ssl_domain "node-js-app.dokku.me"
  assert_http_redirect "http://test.dokku.me" "https://test.dokku.me:443/"
 }
@@ -57,7 +45,7 @@ assert_error_log() {
  add_domain "wildcard1.dokku.me"
  add_domain "wildcard2.dokku.me"
  deploy_app
-  cat /home/dokku/${TEST_APP}/nginx.conf
+  dokku nginx:show-conf $TEST_APP
  assert_ssl_domain "wildcard1.dokku.me"
  assert_ssl_domain "wildcard2.dokku.me"
 }
@@ -67,7 +55,8 @@ assert_error_log() {
  TEST_APP="${TEST_APP}.example.com"
  setup_test_tls wildcard
  deploy_app nodejs-express dokku@dokku.me:$TEST_APP
-  run /bin/bash -c "egrep '*.dokku.me' $DOKKU_ROOT/${TEST_APP}/nginx.conf | wc -l"
+  run /bin/bash -c "dokku nginx:show-conf $TEST_APP | grep -e '*.dokku.me' | wc -l"
+  dokku nginx:show-conf $TEST_APP
  assert_output "0"
 }

--- a/tests/unit/40_plugin.bats
+++ b/tests/unit/40_plugin.bats
@@ -25,10 +25,17 @@ 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" {
@@ -42,7 +49,7 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku plugin | grep enabled | grep $TEST_PLUGIN_NAME"
+  run /bin/bash -c "dokku plugin:list | grep enabled | grep $TEST_PLUGIN_NAME"
  echo "output: $output"
  echo "status: $status"
  assert_success
@@ -57,7 +64,7 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku plugin | grep disabled | grep $TEST_PLUGIN_NAME"
+  run /bin/bash -c "dokku plugin:list | grep disabled | grep $TEST_PLUGIN_NAME"
  echo "output: $output"
  echo "status: $status"
  assert_success
@@ -67,7 +74,7 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku plugin | grep $TEST_PLUGIN_NAME"
+  run /bin/bash -c "dokku plugin:list | grep $TEST_PLUGIN_NAME"
  echo "output: $output"
  echo "status: $status"
  assert_failure
@@ -84,7 +91,7 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku plugin | grep enabled | grep $TEST_PLUGIN_NAME"
+  run /bin/bash -c "dokku plugin:list | grep enabled | grep $TEST_PLUGIN_NAME"
  echo "output: $output"
  echo "status: $status"
  assert_success
@@ -99,7 +106,7 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku plugin | grep disabled | grep $TEST_PLUGIN_NAME"
+  run /bin/bash -c "dokku plugin:list | grep disabled | grep $TEST_PLUGIN_NAME"
  echo "output: $output"
  echo "status: $status"
  assert_success
@@ -109,7 +116,7 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku plugin | grep $TEST_PLUGIN_NAME"
+  run /bin/bash -c "dokku plugin:list | grep $TEST_PLUGIN_NAME"
  echo "output: $output"
  echo "status: $status"
  assert_failure
@@ -121,7 +128,7 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku plugin | grep enabled | grep $TEST_PLUGIN_NAME | grep 0.2.0"
+  run /bin/bash -c "dokku plugin:list | grep enabled | grep $TEST_PLUGIN_NAME | grep 0.2.0"
  echo "output: $output"
  echo "status: $status"
  assert_success
@@ -131,12 +138,12 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku plugin | grep enabled | grep $TEST_PLUGIN_NAME | grep 0.2.0"
+  run /bin/bash -c "dokku plugin:list | grep enabled | grep $TEST_PLUGIN_NAME | grep 0.2.0"
  echo "output: $output"
  echo "status: $status"
  assert_failure

-  run /bin/bash -c "dokku plugin | grep enabled | grep $TEST_PLUGIN_NAME | grep 0.3.0"
+  run /bin/bash -c "dokku plugin:list | grep enabled | grep $TEST_PLUGIN_NAME | grep 0.3.0"
  echo "output: $output"
  echo "status: $status"
  assert_success
@@ -153,7 +160,7 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku plugin | grep enabled | grep $TEST_PLUGIN_NAME"
+  run /bin/bash -c "dokku plugin:list | grep enabled | grep $TEST_PLUGIN_NAME"
  echo "output: $output"
  echo "status: $status"
  assert_success
--- a/tests/unit/40_proxy.bats
+++ b/tests/unit/40_proxy.bats
@@ -16,36 +16,18 @@ teardown() {
  global_teardown
 }

-assert_nonssl_domain() {
-  local domain=$1
-  assert_app_domain "${domain}"
-  assert_http_success "http://${domain}"
-}
-
-assert_app_domain() {
-  local domain=$1
-  run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null | grep -xF ${domain}"
+@test "(proxy) proxy:help" {
+  run /bin/bash -c "dokku proxy"
  echo "output: $output"
  echo "status: $status"
-  assert_output "${domain}"
-}
+  assert_output_contains "Manage the proxy integration for an app"
+  help_output="$output"

-assert_external_port() {
-  local CID="$1"; local exit_status="$2"
-  local EXTERNAL_PORT_COUNT=$(docker port $CID | wc -l)
-  run /bin/bash -c "[[ $EXTERNAL_PORT_COUNT -gt 0 ]]"
-  if [[ "$exit_status" == "success" ]]; then
-    assert_success
-  else
-    assert_failure
-  fi
-}
-
-@test "(proxy) proxy:help" {
  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" {
@@ -58,7 +40,7 @@ assert_external_port() {
  assert_success

  for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.web.*; do
-    assert_external_port $(< $CID_FILE) failure
+    assert_not_external_port $(< $CID_FILE)
  done

  run /bin/bash -c "dokku proxy:enable $TEST_APP"
@@ -68,7 +50,7 @@ assert_external_port() {
  assert_http_success "${TEST_APP}.dokku.me"

  for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.web.*; do
-    assert_external_port $(< $CID_FILE) failure
+    assert_not_external_port $(< $CID_FILE)
  done
 }

--- a/tests/unit/40_trace.bats
+++ b/tests/unit/40_trace.bats
@@ -13,10 +13,17 @@ teardown() {
 }

@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" {
@@ -31,18 +38,6 @@ teardown() {
  assert_success
 }

-@test "(trace) trace on" {
-  run /bin/bash -c "dokku trace on"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-
-  run /bin/bash -c "test -f $DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-}
-
@test "(trace) trace:off, trace off" {
  touch "$DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
  run /bin/bash -c "dokku trace:off"
@@ -50,18 +45,6 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "test -f $DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
-  echo "output: $output"
-  echo "status: $status"
-  assert_failure
-
-  touch "$DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
-  run /bin/bash -c "dokku trace off"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-
-
  run /bin/bash -c "test -f $DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
  echo "output: $output"
  echo "status: $status"
--- a/tests/unit/test_helper.bash
+++ b/tests/unit/test_helper.bash
@@ -48,6 +48,9 @@ assert_success() {
  fi
 }

+# ShellCheck doesn't know about $status from Bats
+# shellcheck disable=SC2154
+# shellcheck disable=SC2120
 assert_failure() {
  if [[ "$status" -eq 0 ]]; then
    flunk "expected failed exit status"
@@ -203,7 +206,8 @@ assert_nonssl_domain() {

 assert_app_domain() {
  local domain=$1
-  run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null | grep -xF ${domain}"
+  run /bin/bash -c "dokku domains:report $TEST_APP --domains-app-vhosts | tr \" \" \"\n\" | grep -xF ${domain}"
+  echo "app domains: $(dokku domains:report $TEST_APP --domains-app-vhosts | tr \" \" \"\n\" )"
  echo "output: $output"
  echo "status: $status"
  assert_output "${domain}"
@@ -218,6 +222,52 @@ assert_http_redirect() {
  assert_output "${to}"
 }

+assert_external_port() {
+  local CID="$1"
+  local EXTERNAL_PORT_COUNT
+  EXTERNAL_PORT_COUNT="$(docker port "$CID" | wc -l)"
+  run /bin/bash -c "[[ $EXTERNAL_PORT_COUNT -gt 0 ]]"
+  assert_success
+}
+
+assert_not_external_port() {
+  local CID="$1"
+  local EXTERNAL_PORT_COUNT
+  EXTERNAL_PORT_COUNT="$(docker port "$CID" | wc -l)"
+  run /bin/bash -c "[[ $EXTERNAL_PORT_COUNT -gt 0 ]]"
+  assert_failure
+}
+
+assert_url() {
+  url=$1
+  run /bin/bash -c "dokku url $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  echo "url: ${url}"
+  assert_output "${url}"
+}
+
+assert_urls() {
+  urls=$@
+  run /bin/bash -c "dokku urls $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  echo "urls:" "$(tr ' ' '\n' <<< "${urls}" | sort)"
+  assert_output < <(tr ' ' '\n' <<< "${urls}" | sort)
+}
+
+assert_access_log() {
+  local prefix=$1
+  run [ -a "/var/log/nginx/$prefix-access.log" ]
+  assert_success
+}
+
+assert_error_log() {
+  local prefix=$1
+  run [ -a "/var/log/nginx/$prefix-error.log" ]
+  assert_success
+}
+
 deploy_app() {
  declare APP_TYPE="$1" GIT_REMOTE="$2" CUSTOM_TEMPLATE="$3" CUSTOM_PATH="$4"
  local APP_TYPE=${APP_TYPE:="nodejs-express"}