From 24255749586771d24c657260aa60ec9945268ff9 Mon Sep 17 00:00:00 2001 From: Thomas LEVEIL Date: Fri, 27 Jan 2017 01:55:46 +0100 Subject: [PATCH] TESTS: add test for custom proxy-wide configuration --- .../test_custom/my_custom_proxy_settings.conf | 1 + test2/test_custom/test_custom-proxy-wide.py | 20 ++++++++++++++++ test2/test_custom/test_custom-proxy-wide.yml | 23 +++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 test2/test_custom/my_custom_proxy_settings.conf create mode 100644 test2/test_custom/test_custom-proxy-wide.py create mode 100644 test2/test_custom/test_custom-proxy-wide.yml diff --git a/test2/test_custom/my_custom_proxy_settings.conf b/test2/test_custom/my_custom_proxy_settings.conf new file mode 100644 index 0000000..8d8502d --- /dev/null +++ b/test2/test_custom/my_custom_proxy_settings.conf @@ -0,0 +1 @@ +add_header X-test f00; \ No newline at end of file diff --git a/test2/test_custom/test_custom-proxy-wide.py b/test2/test_custom/test_custom-proxy-wide.py new file mode 100644 index 0000000..c338628 --- /dev/null +++ b/test2/test_custom/test_custom-proxy-wide.py @@ -0,0 +1,20 @@ +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_applies_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" in r.headers + assert "f00" == r.headers["X-test"] diff --git a/test2/test_custom/test_custom-proxy-wide.yml b/test2/test_custom/test_custom-proxy-wide.yml new file mode 100644 index 0000000..3018131 --- /dev/null +++ b/test2/test_custom/test_custom-proxy-wide.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/conf.d/my_custom_proxy_settings.conf: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