Move overwritehost check to isTrustedDomain

Signed-off-by: Julius Härtl <jus@bitgrid.net>

1 files changed, 16 insertions, 1 deletions

diff --git a/tests/lib/Security/TrustedDomainHelperTest.php b/tests/lib/Security/TrustedDomainHelperTest.php
index 25586a1bc27..973ff29e46f 100644
--- a/tests/lib/Security/TrustedDomainHelperTest.php
+++ b/tests/lib/Security/TrustedDomainHelperTest.php
@@ -31,7 +31,11 @@ class TrustedDomainHelperTest extends \Test\TestCase {
 	 * @param bool $result
 	 */
 	public function testIsTrustedDomain($trustedDomains, $testDomain, $result) {
-		$this->config->expects($this->once())
+		$this->config->expects($this->at(0))
+			->method('getSystemValue')
+			->with('overwritehost')
+			->will($this->returnValue(''));
+		$this->config->expects($this->at(1))
 			->method('getSystemValue')
 			->with('trusted_domains')
 			->will($this->returnValue($trustedDomains));
@@ -108,4 +112,15 @@ class TrustedDomainHelperTest extends \Test\TestCase {
 			[$trustedHostTestList, 'bad..der.leading.host', false],
 		];
 	}
+
+	public function testIsTrustedDomainOverwriteHost() {
+		$this->config->expects($this->at(0))
+			->method('getSystemValue')
+			->with('overwritehost')
+			->will($this->returnValue('myproxyhost'));
+
+		$trustedDomainHelper = new TrustedDomainHelper($this->config);
+		$this->assertTrue($trustedDomainHelper->isTrustedDomain('myproxyhost'));
+		$this->assertTrue($trustedDomainHelper->isTrustedDomain('myotherhost'));
+	}
 }