From ee5b0f96ad75d4f2a89469ff4b25808a83282b15 Mon Sep 17 00:00:00 2001 From: Thomas LEVEIL Date: Fri, 27 Jan 2017 02:08:35 +0100 Subject: [PATCH] TESTS: add test for custom per vhost configuration in location block --- .../test_custom-location-per-vhost.py | 22 ++++++++++++++++++ .../test_custom-location-per-vhost.yml | 23 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 test2/test_custom/test_custom-location-per-vhost.py create mode 100644 test2/test_custom/test_custom-location-per-vhost.yml diff --git a/test2/test_custom/test_custom-location-per-vhost.py b/test2/test_custom/test_custom-location-per-vhost.py new file mode 100644 index 0000000..b99996e --- /dev/null +++ b/test2/test_custom/test_custom-location-per-vhost.py @@ -0,0 +1,22 @@ +import pytest + +def test_custom_conf_does_not_apply_to_unknown_vhost(docker_compose, nginxproxy): + r = nginxproxy.get("http://nginx-proxy/") + assert r.status_code == 503 + assert "X-test" not in r.headers + +def test_custom_conf_applies_to_web1(docker_compose, nginxproxy): + r = nginxproxy.get("http://web1.nginx-proxy.local/port") + assert r.status_code == 200 + assert r.text == "answer from port 81\n" + assert "X-test" in r.headers + assert "f00" == r.headers["X-test"] + +def test_custom_conf_does_not_apply_to_web2(docker_compose, nginxproxy): + r = nginxproxy.get("http://web2.nginx-proxy.local/port") + assert r.status_code == 200 + assert r.text == "answer from port 82\n" + assert "X-test" not in r.headers + +def test_custom_block_is_present_in_nginx_generated_conf(docker_compose, nginxproxy): + assert "include /etc/nginx/vhost.d/web1.nginx-proxy.local_location;" in nginxproxy.get_conf() \ No newline at end of file diff --git a/test2/test_custom/test_custom-location-per-vhost.yml b/test2/test_custom/test_custom-location-per-vhost.yml new file mode 100644 index 0000000..7ec9992 --- /dev/null +++ b/test2/test_custom/test_custom-location-per-vhost.yml @@ -0,0 +1,23 @@ +version: '2' +services: + nginx-proxy: + image: jwilder/nginx-proxy:test + volumes: + - /var/run/docker.sock:/tmp/docker.sock:ro + - ./my_custom_proxy_settings.conf:/etc/nginx/vhost.d/web1.nginx-proxy.local_location:ro + + web1: + image: web + expose: + - "81" + environment: + WEB_PORTS: 81 + VIRTUAL_HOST: web1.nginx-proxy.local + + web2: + image: web + expose: + - "82" + environment: + WEB_PORTS: 82 + VIRTUAL_HOST: web2.nginx-proxy.local \ No newline at end of file