From a4ddcb67ce116afcb82e101ee0441064972530af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Tue, 18 Oct 2016 12:12:10 +0200
Subject: [PATCH] Add tests for user configuration override
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 .dockerignore       | 1 +
 .travis.yml         | 3 +++
 config.test.inc.php | 2 ++
 3 files changed, 6 insertions(+)
 create mode 100644 config.test.inc.php

diff --git a/.dockerignore b/.dockerignore
index dcd4b68..9251b13 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -7,3 +7,4 @@ Makefile
 world.sql
 test-docker.sh
 phpmyadmin_test.py
+config.test.inc.php
diff --git a/.travis.yml b/.travis.yml
index 2494ff1..1668dd8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,3 +26,6 @@ script:
   # Test for arbitrary database
   - docker run --name arbitraryadmin -d --link db_server:db3 -e PMA_ARBITRARY=1 -p 7070:80 phpmyadmin/phpmyadmin
   - ./test-docker.sh arbitraryadmin 7070 db3
+  # Test for arbitrary database with user config
+  - docker run --name userconfigadmin -d --link db_server:db3 -v `readlink -f ./config.test.inc.php`:/www/config.user.inc.php -p 7080:80 phpmyadmin/phpmyadmin
+  - ./test-docker.sh userconfigadmin 7080 db3
diff --git a/config.test.inc.php b/config.test.inc.php
new file mode 100644
index 0000000..0686a05
--- /dev/null
+++ b/config.test.inc.php
@@ -0,0 +1,2 @@
+<?php
+$cfg['AllowArbitraryServer'] = true;