diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2016-03-30 22:26:06 +0300 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2016-03-30 22:26:14 +0300 |
commit | 0ee10a78ff89fdc4f85c0201ed997ab4f25633f0 (patch) | |
tree | 0785ae52ecb55d7650621a02904641e585b4c9d2 /tests | |
parent | 996c04bd0a2e18fa10a8686f92993d6bea6783fd (diff) |
remove proxy code from config since its defined in config/config.php
Diffstat (limited to 'tests')
-rw-r--r-- | tests/unit/config/ConfigTest.php | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/tests/unit/config/ConfigTest.php b/tests/unit/config/ConfigTest.php index d2444fcf4..a30601403 100644 --- a/tests/unit/config/ConfigTest.php +++ b/tests/unit/config/ConfigTest.php @@ -43,11 +43,6 @@ class ConfigTest extends PHPUnit_Framework_TestCase { $this->assertEquals(10, $this->config->getMaxRedirects()); $this->assertEquals(60, $this->config->getFeedFetcherTimeout()); $this->assertEquals(true, $this->config->getUseCronUpdates()); - $this->assertEquals(8080, $this->config->getProxyPort()); - $this->assertEquals('', $this->config->getProxyHost()); - $this->assertEquals(null, $this->config->getProxyAuth()); - $this->assertEquals('', $this->config->getProxyUser()); - $this->assertEquals('', $this->config->getProxyPassword()); $this->assertEquals('', $this->config->getExploreUrl()); $this->assertEquals(1024*1024*100, $this->config->getMaxSize()); } @@ -155,10 +150,6 @@ class ConfigTest extends PHPUnit_Framework_TestCase { 'feedFetcherTimeout = 60' . "\n" . 'useCronUpdates = true'; $this->config->setAutoPurgeCount(3); - $this->config->setProxyHost('yo man'); - $this->config->setProxyPort(12); - $this->config->setProxyUser('this is a test'); - $this->config->setProxyPassword('se'); $this->config->setMaxSize(399); $this->config->setExploreUrl('http://google.de'); @@ -175,10 +166,6 @@ class ConfigTest extends PHPUnit_Framework_TestCase { } - public function testNoProxyAuthReturnsNull() { - $this->assertNull($this->config->getProxyAuth()); - } - public function testReadingNonExistentConfigWillWriteDefaults() { $this->fileSystem->expects($this->once()) @@ -212,14 +199,6 @@ class ConfigTest extends PHPUnit_Framework_TestCase { } - public function testEncodesUserAndPasswordInHTTPBasicAuth() { - $this->config->setProxyUser('this is a test'); - $this->config->setProxyPassword('se'); - - $this->assertEquals('this is a test:se', $this->config->getProxyAuth()); - } - - public function testNoLowMinimumAutoPurgeInterval() { $this->config->setAutoPurgeMinimumInterval(59); $interval = $this->config->getAutoPurgeMinimumInterval(); @@ -248,4 +227,4 @@ class ConfigTest extends PHPUnit_Framework_TestCase { $this->assertSame(2, $timout); } -}
\ No newline at end of file +} |