Merge branch 'master' into 1091_mh-switch-to-herokuish

tests/unit/backup.bats

@@ -1,20 +0,0 @@
-#!/usr/bin/env bats
-
-# load test_helper
-
-# setup() {
-#   create_app
-#   backup_file=$(mktemp /tmp/backup.XXXXXX)
-#   rm $backup_file
-# }
-
-# teardown() {
-#   destroy_app
-# }
-
-# @test "(backup) backup:export" {
-#   run dokku backup:export $backup_file
-#   echo "output: "$output
-#   echo "status: "$status
-#   assert_success
-# }

tests/unit/core_ports.bats

@@ -13,6 +13,15 @@ teardown() {
   [[ -f "$DOKKU_ROOT/HOSTNAME.bak" ]] && mv "$DOKKU_ROOT/HOSTNAME.bak" "$DOKKU_ROOT/HOSTNAME"
 }
 
+
+check_urls() {
+  local PATTERN="$1"
+  run bash -c "dokku --quiet urls $TEST_APP | egrep \"${1}\""
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+}
+
 @test "(core) port exposure (with global VHOST)" {
   echo "dokku.me" > "$DOKKU_ROOT/VHOST"
   deploy_app
@@ -21,17 +30,22 @@ teardown() {
   echo "output: "$output
   echo "status: "$status
   assert_failure
+
+  check_urls http://${TEST_APP}.dokku.me
 }
 
 @test "(core) port exposure (without global VHOST and real HOSTNAME)" {
   rm "$DOKKU_ROOT/VHOST"
-  echo "dokku.me" > "$DOKKU_ROOT/HOSTNAME"
+  echo "${TEST_APP}.dokku.me" > "$DOKKU_ROOT/HOSTNAME"
   deploy_app
   CONTAINER_ID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
   run bash -c "docker port $CONTAINER_ID | sed 's/[0-9.]*://' | egrep -q '[0-9]*'"
   echo "output: "$output
   echo "status: "$status
   assert_success
+
+  HOSTNAME=$(< "$DOKKU_ROOT/HOSTNAME")
+  check_urls http://${HOSTNAME}:[0-9]+
 }
 
 @test "(core) port exposure (with NO_VHOST set)" {
@@ -42,6 +56,9 @@ teardown() {
   echo "output: "$output
   echo "status: "$status
   assert_success
+
+  HOSTNAME=$(< "$DOKKU_ROOT/HOSTNAME")
+  check_urls http://${HOSTNAME}:[0-9]+
 }
 
 @test "(core) port exposure (without global VHOST and IPv4 address as HOSTNAME)" {
@@ -53,6 +70,9 @@ teardown() {
   echo "output: "$output
   echo "status: "$status
   assert_success
+
+  HOSTNAME=$(< "$DOKKU_ROOT/HOSTNAME")
+  check_urls http://${HOSTNAME}:[0-9]+
 }
 
 @test "(core) port exposure (without global VHOST and IPv6 address as HOSTNAME)" {
@@ -64,6 +84,9 @@ teardown() {
   echo "output: "$output
   echo "status: "$status
   assert_success
+
+  HOSTNAME=$(< "$DOKKU_ROOT/HOSTNAME")
+  check_urls http://${HOSTNAME}:[0-9]+
 }
 
 @test "(core) port exposure (pre-deploy domains:add)" {
@@ -86,6 +109,8 @@ teardown() {
   echo "output: "$output
   echo "status: "$status
   assert_success
+
+  check_urls http://www.test.app.dokku.me
 }
 
 @test "(core) port exposure (no global VHOST and domains:add post deploy)" {
@@ -112,6 +137,8 @@ teardown() {
   echo "output: "$output
   echo "status: "$status
   assert_success
+
+  check_urls http://www.test.app.dokku.me
 }
 
 @test "(core) dockerfile port exposure" {
@@ -120,6 +147,8 @@ teardown() {
   echo "output: "$output
   echo "status: "$status
   assert_success
+
+  check_urls http://${TEST_APP}.dokku.me
 }
 
 @test "(core) port exposure (xip.io style hostnames)" {
@@ -130,4 +159,6 @@ teardown() {
   echo "output: "$output
   echo "status: "$status
   assert_success
+
+  check_urls http://my-cool-guy-test-app.127.0.0.1.xip.io
 }