Merge branch 'master' into feature-config-golang

tests/unit/10_ps-herokuish.bats

@@ -137,7 +137,7 @@ teardown() {
   echo "status: "$status
   assert_success
 
-  run bash -c "dokku apps"
+  run bash -c "dokku apps:list"
   echo "output: "$output
   echo "status: "$status
   assert_success

tests/unit/20_network.bats

@@ -0,0 +1,69 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  global_setup
+  [[ -f "$DOKKU_ROOT/VHOST" ]] && cp -fp "$DOKKU_ROOT/VHOST" "$DOKKU_ROOT/VHOST.bak"
+  [[ -f "$DOKKU_ROOT/HOSTNAME" ]] && cp -fp "$DOKKU_ROOT/HOSTNAME" "$DOKKU_ROOT/HOSTNAME.bak"
+  create_app
+}
+
+teardown() {
+  destroy_app 0 $TEST_APP
+  [[ -f "$DOKKU_ROOT/VHOST.bak" ]] && mv "$DOKKU_ROOT/VHOST.bak" "$DOKKU_ROOT/VHOST" && chown dokku:dokku "$DOKKU_ROOT/VHOST"
+  [[ -f "$DOKKU_ROOT/HOSTNAME.bak" ]] && mv "$DOKKU_ROOT/HOSTNAME.bak" "$DOKKU_ROOT/HOSTNAME" && chown dokku:dokku "$DOKKU_ROOT/HOSTNAME"
+  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 "(proxy) network:set bind-all-interfaces" {
+  deploy_app
+  assert_nonssl_domain "${TEST_APP}.dokku.me"
+
+  run dokku network:set $TEST_APP bind-all-interfaces true
+  run dokku ps:rebuild $TEST_APP
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+  assert_http_success "${TEST_APP}.dokku.me"
+
+  for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.web.*; do
+    assert_external_port $(< $CID_FILE) success
+  done
+
+  run dokku network:set $TEST_APP bind-all-interfaces false
+  run dokku ps:rebuild $TEST_APP
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+  assert_http_success "${TEST_APP}.dokku.me"
+
+  for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.web.*; do
+    assert_external_port $(< $CID_FILE) failure
+  done
+}

tests/unit/30_client.bats

@@ -23,7 +23,7 @@ teardown() {
 }
 
 @test "(client) no args should print help" {
-  run /bin/bash -c "./contrib/dokku_client.sh | head -1 | egrep -q '^Usage: dokku \[.+\] COMMAND <app>.*'"
+  run /bin/bash -c "./contrib/dokku_client.sh | head -1 | grep -E 'Usage: dokku \[.+\] COMMAND <app>.*'"
   echo "output: "$output
   echo "status: "$status
   assert_success

tests/unit/40_proxy.bats

@@ -51,7 +51,7 @@ assert_external_port() {
   assert_success
 
   for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.web.*; do
-    assert_external_port $(< $CID_FILE) success
+    assert_external_port $(< $CID_FILE) failure
   done
 
   run dokku proxy:enable $TEST_APP