From 45f05615c4c620b0d94e7e94bb793b6376c505cc Mon Sep 17 00:00:00 2001
From: Ilya Semenov <semenov@inetss.com>
Date: Wed, 7 Sep 2016 20:06:02 +0700
Subject: [PATCH] Clarify domains help, improve domains unit tests

---
 plugins/domains/commands   |  8 ++---
 tests/unit/20_domains.bats | 72 +++++++++++++++++++++++++++++++++++---
 2 files changed, 71 insertions(+), 9 deletions(-)

diff --git a/plugins/domains/commands b/plugins/domains/commands
index e7f12bf2f..f59e9fc60 100755
--- a/plugins/domains/commands
+++ b/plugins/domains/commands
@@ -8,13 +8,13 @@ case "$1" in
       declare desc="return domains plugin help content"
       cat<<help_content
     domains [<app>], List domains
-    domains:add <app> DOMAIN, Add a domain to app
-    domains:add-global DOMAIN, Add global domain name
+    domains:add <app> <domain> [<domain>...], Add domain(s) to app
+    domains:add-global <domain> [<domain>...], Add global domain name(s)
     domains:clear <app>, Clear all domains for app
     domains:disable <app>, Disable VHOST support
     domains:enable <app>, Enable VHOST support
-    domains:remove <app> DOMAIN, Remove a domain from app
-    domains:remove-global DOMAIN, Remove global domain name
+    domains:remove <app> <domain> [<domain>...], Remove domain(s) from app
+    domains:remove-global <domain> [<domain>...], Remove global domain name(s)
 help_content
     }
 
diff --git a/tests/unit/20_domains.bats b/tests/unit/20_domains.bats
index 4cd358825..3aba4aa8f 100644
--- a/tests/unit/20_domains.bats
+++ b/tests/unit/20_domains.bats
@@ -29,25 +29,46 @@ teardown() {
   echo "output: "$output
   echo "status: "$status
   assert_success
+
   run dokku domains:add $TEST_APP test.app.dokku.me
   echo "output: "$output
   echo "status: "$status
   assert_success
+
   run dokku domains:add $TEST_APP 2.app.dokku.me
   echo "output: "$output
   echo "status: "$status
   assert_success
+
   run dokku domains:add $TEST_APP a--domain.with--hyphens
   echo "output: "$output
   echo "status: "$status
   assert_success
-}
 
-@test "(domains) domains:add (multiple)" {
-  run dokku domains:add $TEST_APP 2.app.dokku.me www.test.app.dokku.me test.app.dokku.me
+  run dokku domains $TEST_APP
   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
+}
+
+@test "(domains) domains:add (multiple)" {
+  run dokku domains:add $TEST_APP www.test.app.dokku.me test.app.dokku.me 2.app.dokku.me a--domain.with--hyphens
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  run dokku domains $TEST_APP
+  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
 }
 
 @test "(domains) domains:add (duplicate)" {
@@ -74,10 +95,37 @@ teardown() {
   echo "output: "$output
   echo "status: "$status
   assert_success
+
   run dokku domains:remove $TEST_APP test.app.dokku.me
   echo "output: "$output
   echo "status: "$status
-  refute_line "test.app.dokku.me"
+  assert_success
+
+  run dokku domains $TEST_APP
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+  refute_line test.app.dokku.me
+}
+
+@test "(domains) domains:remove (multiple)" {
+  run dokku domains:add $TEST_APP www.test.app.dokku.me test.app.dokku.me 2.app.dokku.me
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  run dokku domains:remove $TEST_APP www.test.app.dokku.me test.app.dokku.me
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  run dokku domains $TEST_APP
+  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
 }
 
 @test "(domains) domains:remove (wildcard domain)" {
@@ -85,10 +133,17 @@ teardown() {
   echo "output: "$output
   echo "status: "$status
   assert_success
+
   run dokku domains:remove $TEST_APP *.dokku.me
   echo "output: "$output
   echo "status: "$status
-  refute_line "*.dokku.me"
+  assert_success
+
+  run dokku domains $TEST_APP
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+  refute_line *.dokku.me
 }
 
 @test "(domains) domains:clear" {
@@ -96,10 +151,17 @@ teardown() {
   echo "output: "$output
   echo "status: "$status
   assert_success
+
   run dokku domains:clear $TEST_APP
   echo "output: "$output
   echo "status: "$status
   assert_success
+
+  run dokku domains $TEST_APP
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+  refute_line test.app.dokku.me
 }
 
 @test "(domains) domains:add-global" {