Merge pull request #3540 from dokku/3529-better-default-vhost

Do not append the global domain for matching subdomains
This commit is contained in:
Jose Diaz-Gonzalez authored and GitHub committed 2019-05-19 23:00:17 -07:00
commit 2315a127ea
4 files changed
+24 -16

No files matched your search

+19
View File
@@ -302,3 +302,22 @@ teardown() {
assert_line ${TEST_APP}.global3.dokku.me
assert_line ${TEST_APP}.global4.dokku.me
}
@test "(domains) app name overlaps with global domain.tld" {
run /bin/bash -c "dokku domains:set-global dokku.test"
echo "output: $output"
echo "status: $status"
assert_success
# run domains:clear in order to invoke default vhost creation
dokku --quiet apps:create test.dokku.test
dokku --quiet domains:clear test.dokku.test
run /bin/bash -c "dokku domains:report test.dokku.test --domains-app-vhosts"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "test.dokku.test"
dokku --force apps:destroy test.dokku.test
}