From d18cb3766c31c2293d37f7a9da61dccc5d585a0b Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 1 Dec 2022 21:51:47 -0500 Subject: [PATCH] fix: correct tests for new domain initialization method --- tests/unit/core_2.bats | 12 ++++-------- tests/unit/test_helper.bash | 6 ------ 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/tests/unit/core_2.bats b/tests/unit/core_2.bats index ab699655d..1a165098f 100644 --- a/tests/unit/core_2.bats +++ b/tests/unit/core_2.bats @@ -38,17 +38,15 @@ teardown() { } @test "(core) urls (non-ssl)" { - assert_urls "http://dokku.me" - build_nginx_config assert_urls "http://${TEST_APP}.dokku.me" add_domain "test.dokku.me" assert_urls "http://${TEST_APP}.dokku.me" "http://test.dokku.me" } @test "(core) urls (app ssl)" { + assert_urls "http://${TEST_APP}.dokku.me" setup_test_tls - assert_urls "https://dokku.me" - build_nginx_config + dokku proxy:build-config "$TEST_APP" assert_urls "http://${TEST_APP}.dokku.me" "https://${TEST_APP}.dokku.me" add_domain "test.dokku.me" assert_urls "http://${TEST_APP}.dokku.me" "http://test.dokku.me" "https://${TEST_APP}.dokku.me" "https://test.dokku.me" @@ -56,15 +54,13 @@ teardown() { @test "(core) url (app ssl)" { setup_test_tls - assert_url "https://dokku.me" - build_nginx_config + dokku proxy:build-config "$TEST_APP" assert_url "https://${TEST_APP}.dokku.me" } @test "(core) urls (wildcard ssl)" { setup_test_tls wildcard - assert_urls "https://dokku.me" - build_nginx_config + dokku proxy:build-config "$TEST_APP" assert_urls "http://${TEST_APP}.dokku.me" "https://${TEST_APP}.dokku.me" add_domain "test.dokku.me" assert_urls "http://${TEST_APP}.dokku.me" "http://test.dokku.me" "https://${TEST_APP}.dokku.me" "https://test.dokku.me" diff --git a/tests/unit/test_helper.bash b/tests/unit/test_helper.bash index 93e63b70d..6f86edeea 100644 --- a/tests/unit/test_helper.bash +++ b/tests/unit/test_helper.bash @@ -532,12 +532,6 @@ add_requirements_txt() { echo "flask" >>"$APP_REPO_DIR/requirements.txt" } -build_nginx_config() { - # simulate nginx post-deploy - dokku domains:setup "$TEST_APP" - dokku proxy:build-config "$TEST_APP" -} - create_network() { local NETWORK_NAME="$1:=$TEST_NETWORK"