diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-10-08 13:41:53 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-10-08 13:41:53 +0200 |
commit | 2c07af4842fa69d95070e2a9676c5d4306cf3d86 (patch) | |
tree | 245da6c261b892ccf597f7daa8bf89f8f7268f9f /tests/unit/utility | |
parent | 323dab9b9cd4e013d9a806e3169cc5996f5c4c78 (diff) |
remove dead proxy code from favicon fetcher
Diffstat (limited to 'tests/unit/utility')
-rw-r--r-- | tests/unit/utility/FaviconFetcherTest.php | 65 |
1 files changed, 1 insertions, 64 deletions
diff --git a/tests/unit/utility/FaviconFetcherTest.php b/tests/unit/utility/FaviconFetcherTest.php index b7499fd36..a9c1416dc 100644 --- a/tests/unit/utility/FaviconFetcherTest.php +++ b/tests/unit/utility/FaviconFetcherTest.php @@ -20,15 +20,9 @@ class FaviconFetcherTest extends \PHPUnit_Framework_TestCase { private $fetcher; private $fileFactory; private $png; - private $proxyHost; - private $proxyPort; - private $proxyAuth; protected function setUp(){ $this->png = "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A"; - $this->proxyHost = 'test'; - $this->proxyPort = 3; - $this->proxyAuth = 'hi'; $this->fileFactory = $this->getMockBuilder( '\OCA\News\Utility\SimplePieAPIFactory') ->disableOriginalConstructor() @@ -37,16 +31,7 @@ class FaviconFetcherTest extends \PHPUnit_Framework_TestCase { '\OCA\News\Utility\Config') ->disableOriginalConstructor() ->getMock(); - $this->config->expects($this->any()) - ->method('getProxyHost') - ->will($this->returnValue('')); - $this->config->expects($this->any()) - ->method('getProxyAuth') - ->will($this->returnValue($this->proxyAuth)); - $this->config->expects($this->any()) - ->method('getProxyPort') - ->will($this->returnValue($this->proxyPort)); - $this->fetcher = new FaviconFetcher($this->fileFactory, $this->config); + $this->fetcher = new FaviconFetcher($this->fileFactory); } @@ -84,54 +69,6 @@ class FaviconFetcherTest extends \PHPUnit_Framework_TestCase { } - public function testProxySettingsAreUsed() { - $this->config = $this->getMockBuilder( - '\OCA\News\Utility\Config') - ->disableOriginalConstructor() - ->getMock(); - $this->config->expects($this->any()) - ->method('getProxyHost') - ->will($this->returnValue($this->proxyHost)); - $this->config->expects($this->any()) - ->method('getProxyAuth') - ->will($this->returnValue($this->proxyAuth)); - $this->config->expects($this->any()) - ->method('getProxyPort') - ->will($this->returnValue($this->proxyPort)); - $this->fetcher = new FaviconFetcher($this->fileFactory, $this->config); - - $faviconPath = "/owncloud/core/img/favicon.png"; - $html = $this->getFaviconHTML($faviconPath); - - $url = 'http://google.com'; - $pageMock = $this->getFileMock($html); - $pngMock = $this->getFileMock($this->png); - - $this->fileFactory->expects($this->at(0)) - ->method('getFile') - ->with($this->equalTo('http://google.com')) - ->will($this->returnValue($pageMock)); - - $this->fileFactory->expects($this->at(1)) - ->method('getFile') - ->with($this->equalTo( - 'http://google.com/owncloud/core/img/favicon.png'), - $this->equalTo(10), - $this->equalTo(5), - $this->equalTo(null), - $this->equalTo(null), - $this->equalTo(false), - $this->equalTo($this->proxyHost), - $this->equalTo($this->proxyPort), - $this->equalTo($this->proxyAuth)) - ->will($this->returnValue($pngMock)); - - $favicon = $this->fetcher->fetch($url); - - $this->assertEquals('http://google.com/owncloud/core/img/favicon.png', $favicon); - } - - public function testNoProxySettingsAreUsed() { $faviconPath = "/owncloud/core/img/favicon.png"; $html = $this->getFaviconHTML($faviconPath); |