clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace IHTTPResult for CurlResult usages

Browse Source
This commit is contained in:
Philipp
2021-08-20 19:48:14 +02:00
parent 7009d90add
commit 05ecd1e3d4
4 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/src/Core/InstallerTest.php
View File

@@ -25,7 +25,7 @@ namespace Friendica\Core;
use Dice\Dice;
use Friendica\Core\Config\Cache;
use Friendica\DI;
use Friendica\Network\CurlResult;
use Friendica\Network\IHTTPResult;
use Friendica\Network\IHTTPRequest;
use Friendica\Test\MockedTest;
use Friendica\Test\Util\VFSTrait;
@@ -319,14 +319,14 @@ class InstallerTest extends MockedTest
$this->l10nMock->shouldReceive('t')->andReturnUsing(function ($args) { return $args; });
// Mocking the CURL Response
$curlResult = Mockery::mock(CurlResult::class);
$curlResult
$IHTTPResult = Mockery::mock(IHTTPResult::class);
$IHTTPResult
->shouldReceive('getReturnCode')
->andReturn('404');
$curlResult
$IHTTPResult
->shouldReceive('getRedirectUrl')
->andReturn('');
$curlResult
$IHTTPResult
->shouldReceive('getError')
->andReturn('test Error');
@@ -335,11 +335,11 @@ class InstallerTest extends MockedTest
$networkMock
->shouldReceive('fetchFull')
->with('https://test/install/testrewrite')
->andReturn($curlResult);
->andReturn($IHTTPResult);
$networkMock
->shouldReceive('fetchFull')
->with('http://test/install/testrewrite')
->andReturn($curlResult);
->andReturn($IHTTPResult);
$this->dice->shouldReceive('create')
->with(IHTTPRequest::class)
@@ -366,14 +366,14 @@ class InstallerTest extends MockedTest
$this->l10nMock->shouldReceive('t')->andReturnUsing(function ($args) { return $args; });
// Mocking the failed CURL Response
$curlResultF = Mockery::mock(CurlResult::class);
$curlResultF
$IHTTPResultF = Mockery::mock(IHTTPResult::class);
$IHTTPResultF
->shouldReceive('getReturnCode')
->andReturn('404');
// Mocking the working CURL Response
$curlResultW = Mockery::mock(CurlResult::class);
$curlResultW
$IHTTPResultW = Mockery::mock(IHTTPResult::class);
$IHTTPResultW
->shouldReceive('getReturnCode')
->andReturn('204');
@@ -382,11 +382,11 @@ class InstallerTest extends MockedTest
$networkMock
->shouldReceive('fetchFull')
->with('https://test/install/testrewrite')
->andReturn($curlResultF);
->andReturn($IHTTPResultF);
$networkMock
->shouldReceive('fetchFull')
->with('http://test/install/testrewrite')
->andReturn($curlResultW);
->andReturn($IHTTPResultW);
$this->dice->shouldReceive('create')
->with(IHTTPRequest::class)