Merge pull request #14651 from owncloud/add-some-headers-to-htaccess-for-my-best-friend-jenkins

Let users configure security headers in their Webserver

1 files changed, 0 insertions, 71 deletions

diff --git a/tests/settings/controller/securitysettingscontrollertest.php b/tests/settings/controller/securitysettingscontrollertest.php
index d89e4932368..56848d8df30 100644
--- a/tests/settings/controller/securitysettingscontrollertest.php
+++ b/tests/settings/controller/securitysettingscontrollertest.php
@@ -31,77 +31,6 @@ class SecuritySettingsControllerTest extends \PHPUnit_Framework_TestCase {
 		$this->securitySettingsController = $this->container['SecuritySettingsController'];
 	}
 
-
-	public function testEnforceSSLEmpty() {
-		$this->container['Config']
-			->expects($this->once())
-			->method('setSystemValue')
-			->with('forcessl', false);
-
-		$response = $this->securitySettingsController->enforceSSL();
-		$expectedResponse = array('status' => 'success');
-
-		$this->assertSame($expectedResponse, $response);
-	}
-
-	public function testEnforceSSL() {
-		$this->container['Config']
-			->expects($this->once())
-			->method('setSystemValue')
-			->with('forcessl', true);
-
-		$response = $this->securitySettingsController->enforceSSL(true);
-		$expectedResponse = array('status' => 'success');
-
-		$this->assertSame($expectedResponse, $response);
-	}
-
-	public function testEnforceSSLInvalid() {
-		$this->container['Config']
-			->expects($this->exactly(0))
-			->method('setSystemValue');
-
-		$response = $this->securitySettingsController->enforceSSL('blah');
-		$expectedResponse = array('status' => 'error');
-
-		$this->assertSame($expectedResponse, $response);
-	}
-
-	public function testEnforceSSLForSubdomainsEmpty() {
-		$this->container['Config']
-			->expects($this->once())
-			->method('setSystemValue')
-			->with('forceSSLforSubdomains', false);
-
-		$response = $this->securitySettingsController->enforceSSLForSubdomains();
-		$expectedResponse = array('status' => 'success');
-
-		$this->assertSame($expectedResponse, $response);
-	}
-
-	public function testEnforceSSLForSubdomains() {
-		$this->container['Config']
-			->expects($this->once())
-			->method('setSystemValue')
-			->with('forceSSLforSubdomains', true);
-
-		$response = $this->securitySettingsController->enforceSSLForSubdomains(true);
-		$expectedResponse = array('status' => 'success');
-
-		$this->assertSame($expectedResponse, $response);
-	}
-
-	public function testEnforceSSLForSubdomainsInvalid() {
-		$this->container['Config']
-			->expects($this->exactly(0))
-			->method('setSystemValue');
-
-		$response = $this->securitySettingsController->enforceSSLForSubdomains('blah');
-		$expectedResponse = array('status' => 'error');
-
-		$this->assertSame($expectedResponse, $response);
-	}
-
 	public function testTrustedDomainsWithExistingValues() {
 		$this->container['Config']
 			->expects($this->once())