Merge branch 'master' into mh-ps-scale

tests/unit/core.bats

@@ -115,3 +115,9 @@ build_nginx_config() {
   assert_urls "https://${TEST_APP}.dokku.me" "https://test.dokku.me" "http://dokku.example.com"
 }
 
+@test "(core) git-remote (off-port)" {
+  run deploy_app nodejs-express ssh://dokku@127.0.0.1:22333/$TEST_APP
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+}

tests/unit/core_ports.bats

@@ -97,7 +97,12 @@ teardown() {
   echo "status: "$status
   assert_success
 
-  CONTAINER_ID=$(docker ps --no-trunc| grep dokku/$TEST_APP | grep "start web" | awk '{ print $1 }')
+  run dokku ps:restart $TEST_APP
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  CONTAINER_ID=$(docker ps --no-trunc| grep dokku/$TEST_APP | grep "start web" | awk '{ print $1 }' | head -1)
   run bash -c "docker port $CONTAINER_ID | sed 's/[0-9.]*://' | egrep '[0-9]*'"
   echo "output: "$output
   echo "status: "$status

tests/unit/docker-options.bats

@@ -149,3 +149,14 @@ teardown() {
   assert_success
   deploy_app
 }
+
+@test "docker-options:add (all phases over SSH)" {
+  run ssh dokku@dokku.me docker-options:add $TEST_APP build,deploy,run \"-v /tmp\"
+  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"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+}

tests/unit/domains.bats

@@ -28,6 +28,13 @@ teardown() {
   assert_success
 }
 
+@test "(domains) domains:add (multiple)" {
+  run dokku domains:add $TEST_APP www.test.app.dokku.me test.app.dokku.me
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+}
+
 @test "(domains) domains:remove" {
   run dokku domains:add $TEST_APP test.app.dokku.me
   echo "output: "$output

tests/unit/test_helper.bash

@@ -89,7 +89,9 @@ create_app() {
 }
 
 destroy_app() {
+  RC="$1"; RC=${RC:=0}
   echo $TEST_APP | dokku apps:destroy $TEST_APP
+  return $RC
 }
 
 add_domain() {
@@ -98,18 +100,20 @@ add_domain() {
 
 deploy_app() {
   APP_TYPE="$1"; APP_TYPE=${APP_TYPE:="nodejs-express"}
+  GIT_REMOTE="$2"; GIT_REMOTE=${GIT_REMOTE:="dokku@dokku.me:$TEST_APP"}
   TMP=$(mktemp -d -t "dokku.me.XXXXX")
   rmdir $TMP && cp -r ./tests/apps/$APP_TYPE $TMP
   cd $TMP
   git init
   git config user.email "robot@example.com"
   git config user.name "Test Robot"
-  git remote add target dokku@dokku.me:$TEST_APP
+  echo "setting up remote: $GIT_REMOTE"
+  git remote add target $GIT_REMOTE
 
   [[ -f gitignore ]] && mv gitignore .gitignore
   git add .
   git commit -m 'initial commit'
-  git push target master || destroy_app
+  git push target master || destroy_app $?
 }
 
 setup_client_repo() {