From 9d396d55be2ad2fbbd30badafb0c3c2de26056d9 Mon Sep 17 00:00:00 2001
From: Mitchell Krog <mitchellkrog@gmail.com>
Date: Mon, 24 Jun 2019 16:46:49 +0200
Subject: [PATCH] Fix testing of whitelist-domain.conf | Change method of
 resetting in test-blocker

---
 .dev-tools/test-blocker.sh                   | 14 +++++++++++++-
 .dev-tools/test_units/whitelist-domains.conf |  4 ++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.dev-tools/test-blocker.sh b/.dev-tools/test-blocker.sh
index 944f2fd87..7c911aa23 100755
--- a/.dev-tools/test-blocker.sh
+++ b/.dev-tools/test-blocker.sh
@@ -38,7 +38,19 @@ echo "${bold}${green}------------------------------------------------"
 echo "${bold}${green}Disable any User Whitelisting and set to Default"
 echo "${bold}${green}------------------------------------------------"
 printf "\n\n"
-sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/blacklist-user-agents-none.conf /etc/nginx/bots.d/blacklist-user-agents.conf
+
+sudo rm /etc/nginx/conf.d/*.conf
+sudo rm /etc/nginx/bots.d/*.conf
+ls -la /etc/nginx/conf.d/
+ls -la /etc/nginx/bots.d/
+
+printf "\n"
+echo "${bold}${magenta}-------------------------"
+echo "${bold}${magenta}Execute update-ngxblocker"
+echo "${bold}${magenta}-------------------------"
+printf "\n"
+cd /usr/sbin
+sudo bash ./update-ngxblocker -n
 
 echo "${bold}${green}---------------"
 echo "${bold}${green}Reloading Nginx"
diff --git a/.dev-tools/test_units/whitelist-domains.conf b/.dev-tools/test_units/whitelist-domains.conf
index 75e762def..0eae22add 100644
--- a/.dev-tools/test_units/whitelist-domains.conf
+++ b/.dev-tools/test_units/whitelist-domains.conf
@@ -42,6 +42,6 @@
 #	"~*\bmyfirstowndomainname\.com\b" 			0;
 #	"~*\bmy\-second\-owndomainname\.com\b"		0;
 
-	"~*\bmyowndomain\.com\b" 			0;
-	"~*\bmyotherdomain\.com\b" 			0;
+	"~*(?:\b)myowndomain\.com(?:\b|)" 			0;
+	"~*(?:\b)myotherdomain\.com(?:\b|)" 			0;