mirror of
				https://github.com/thib8956/nginx-proxy
				synced 2025-11-03 18:49:20 +00:00 
			
		
		
		
	Normalized indentation, added explicit CERT_NAME
This commit is contained in:
		@@ -17,7 +17,9 @@ function setup {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
@test "[$TEST_FILE] test SSL for VIRTUAL_HOST=*.nginx-proxy.bats" {
 | 
					@test "[$TEST_FILE] test SSL for VIRTUAL_HOST=*.nginx-proxy.bats" {
 | 
				
			||||||
	# WHEN
 | 
						# WHEN
 | 
				
			||||||
    prepare_web_container bats-ssl-hosts-1 "80 443" -e VIRTUAL_HOST=*.nginx-proxy.bats
 | 
						prepare_web_container bats-ssl-hosts-1 "80 443" \
 | 
				
			||||||
 | 
							-e VIRTUAL_HOST=*.nginx-proxy.bats \
 | 
				
			||||||
 | 
							-e CERT_NAME=nginx-proxy.bats
 | 
				
			||||||
	dockergen_wait_for_event $SUT_CONTAINER start bats-ssl-hosts-1
 | 
						dockergen_wait_for_event $SUT_CONTAINER start bats-ssl-hosts-1
 | 
				
			||||||
	sleep 1
 | 
						sleep 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -28,8 +30,11 @@ function setup {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
@test "[$TEST_FILE] test HTTPS_METHOD=nohttp" {
 | 
					@test "[$TEST_FILE] test HTTPS_METHOD=nohttp" {
 | 
				
			||||||
	# WHEN
 | 
						# WHEN
 | 
				
			||||||
    prepare_web_container bats-ssl-hosts-1 "80 443" -e VIRTUAL_HOST=*.nginx-proxy.bats -e HTTPS_METHOD=nohttp
 | 
						prepare_web_container bats-ssl-hosts-2 "80 443" \
 | 
				
			||||||
    dockergen_wait_for_event $SUT_CONTAINER start bats-ssl-hosts-1
 | 
							-e VIRTUAL_HOST=*.nginx-proxy.bats \
 | 
				
			||||||
 | 
							-e CERT_NAME=nginx-proxy.bats \
 | 
				
			||||||
 | 
							-e HTTPS_METHOD=nohttp
 | 
				
			||||||
 | 
						dockergen_wait_for_event $SUT_CONTAINER start bats-ssl-hosts-2
 | 
				
			||||||
	sleep 1
 | 
						sleep 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	# THEN
 | 
						# THEN
 | 
				
			||||||
@@ -39,8 +44,11 @@ function setup {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
@test "[$TEST_FILE] test HTTPS_METHOD=noredirect" {
 | 
					@test "[$TEST_FILE] test HTTPS_METHOD=noredirect" {
 | 
				
			||||||
	# WHEN
 | 
						# WHEN
 | 
				
			||||||
    prepare_web_container bats-ssl-hosts-1 "80 443" -e VIRTUAL_HOST=*.nginx-proxy.bats -e HTTPS_METHOD=noredirect
 | 
						prepare_web_container bats-ssl-hosts-3 "80 443" \
 | 
				
			||||||
    dockergen_wait_for_event $SUT_CONTAINER start bats-ssl-hosts-1
 | 
							-e VIRTUAL_HOST=*.nginx-proxy.bats \
 | 
				
			||||||
 | 
							-e CERT_NAME=nginx-proxy.bats \
 | 
				
			||||||
 | 
							-e HTTPS_METHOD=noredirect
 | 
				
			||||||
 | 
						dockergen_wait_for_event $SUT_CONTAINER start bats-ssl-hosts-3
 | 
				
			||||||
	sleep 1
 | 
						sleep 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	# THEN
 | 
						# THEN
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user