From 518d7f9e567b784812b83823d39976fbe8df4e2c Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Wed, 18 Nov 2015 18:04:50 -0500 Subject: [PATCH] make custom template tests actually test --- tests/unit/nginx-vhosts.bats | 2 ++ tests/unit/test_helper.bash | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/unit/nginx-vhosts.bats b/tests/unit/nginx-vhosts.bats index 1436c6a68..b9791950f 100644 --- a/tests/unit/nginx-vhosts.bats +++ b/tests/unit/nginx-vhosts.bats @@ -98,6 +98,7 @@ assert_error_log() { deploy_app assert_ssl_domain "wildcard1.dokku.me" assert_ssl_domain "wildcard2.dokku.me" + assert_http_success "customssltemplate.dokku.me" } @test "(nginx-vhosts) nginx:build-config (wildcard SSL & unrelated domain)" { @@ -125,6 +126,7 @@ assert_error_log() { custom_nginx_template deploy_app assert_nonssl_domain "www.test.app.dokku.me" + assert_http_success "customtemplate.dokku.me" } @test "(nginx-vhosts) nginx:build-config (no global VHOST and domains:add)" { diff --git a/tests/unit/test_helper.bash b/tests/unit/test_helper.bash index 05f99d213..fe04298a4 100644 --- a/tests/unit/test_helper.bash +++ b/tests/unit/test_helper.bash @@ -183,14 +183,14 @@ cat< $DOKKU_ROOT/$APP/nginx.conf.template server { listen [::]:\$NGINX_PORT; listen \$NGINX_PORT; - server_name \$NOSSL_SERVER_NAME; + server_name \$NOSSL_SERVER_NAME customssltemplate.dokku.me; return 301 https://\\\$host:\$NGINX_SSL_PORT\\\$request_uri; } server { listen [::]:\$NGINX_SSL_PORT ssl spdy; listen \$NGINX_SSL_PORT ssl spdy; - server_name \$SSL_SERVER_NAME; + server_name \$SSL_SERVER_NAME customssltemplate.dokku.me; \$SSL_DIRECTIVES keepalive_timeout 70; @@ -218,7 +218,7 @@ cat< $DOKKU_ROOT/$APP/nginx.conf.template server { listen [::]:\$NGINX_PORT; listen \$NGINX_PORT; - server_name \$NOSSL_SERVER_NAME; + server_name \$NOSSL_SERVER_NAME customtemplate.dokku.me; location / { proxy_pass http://\$APP;