mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix usage of Sabre\HTTP\Request in unit tests 

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
This commit is contained in:
Georg Ehrke 2020-03-10 13:43:18 +01:00 committed by Roeland Jago Douma
parent 52ba75f644
commit 102a328e65
No known key found for this signature in database
GPG Key ID: F941078878347C0C
5 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/dav/tests/unit/CalDAV/Publishing/PublishingTest.php
View File

@ -82,9 +82,8 @@ class PluginTest extends TestCase {
$this->book->expects($this->once())->method('setPublishStatus')->with(true);
// setup request
$request = new Request();
$request = new Request('POST', 'cal1');
$request->addHeader('Content-Type', 'application/xml');
$request->setUrl('cal1');
$request->setBody('<o:publish-calendar xmlns:o="http://calendarserver.org/ns/"/>');
$response = new Response();
$this->plugin->httpPost($request, $response);
@ -95,9 +94,8 @@ class PluginTest extends TestCase {
$this->book->expects($this->once())->method('setPublishStatus')->with(false);
// setup request
$request = new Request();
$request = new Request('POST', 'cal1');
$request->addHeader('Content-Type', 'application/xml');
$request->setUrl('cal1');
$request->setBody('<o:unpublish-calendar xmlns:o="http://calendarserver.org/ns/"/>');
$response = new Response();
$this->plugin->httpPost($request, $response);

5
apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php
View File

@ -47,7 +47,7 @@ class PluginTest extends TestCase {
protected function setUp(): void {
parent::setUp();
/** @var Auth | \PHPUnit_Framework_MockObject_MockObject $authBackend */
$authBackend = $this->getMockBuilder(Auth::class)->disableOriginalConstructor()->getMock();
$authBackend->method('isDavAuthenticated')->willReturn(true);
@ -75,9 +75,8 @@ class PluginTest extends TestCase {
]], ['mailto:wilfredo@example.com']);
// setup request
$request = new Request();
$request = new Request('POST', 'addressbook1.vcf');
$request->addHeader('Content-Type', 'application/xml');
$request->setUrl('addressbook1.vcf');
$request->setBody('<?xml version="1.0" encoding="utf-8" ?><CS:share xmlns:D="DAV:" xmlns:CS="http://owncloud.org/ns"><CS:set><D:href>principal:principals/admin</D:href><CS:read-write/></CS:set> <CS:remove><D:href>mailto:wilfredo@example.com</D:href></CS:remove></CS:share>');
$response = new Response();
$this->plugin->httpPost($request, $response);

4
apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php
View File

@ -54,7 +54,7 @@ class CopyEtagHeaderPluginTest extends TestCase {
}
public function testCopyEtag() {
$request = new \Sabre\Http\Request();
$request = new \Sabre\Http\Request('GET', 'dummy.file');
$response = new \Sabre\Http\Response();
$response->setHeader('Etag', 'abcd');
@ -64,7 +64,7 @@ class CopyEtagHeaderPluginTest extends TestCase {
}
public function testNoopWhenEmpty() {
$request = new \Sabre\Http\Request();
$request = new \Sabre\Http\Request('GET', 'dummy.file');
$response = new \Sabre\Http\Response();
$this->plugin->afterMethod($request, $response);

12
apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
View File

@ -66,7 +66,7 @@ class QuotaPluginTest extends TestCase {
$this->init(0);
$this->plugin->expects($this->never())
->method('getFileChunking');
$this->server->httpRequest = new \Sabre\HTTP\Request(null, null, $headers);
$this->server->httpRequest = new \Sabre\HTTP\Request('POST', 'dummy.file', $headers);
$length = $this->plugin->getLength();
$this->assertEquals($expected, $length);
}
@ -79,7 +79,7 @@ class QuotaPluginTest extends TestCase {
$this->plugin->expects($this->never())
->method('getFileChunking');
$this->server->httpRequest = new \Sabre\HTTP\Request(null, null, $headers);
$this->server->httpRequest = new \Sabre\HTTP\Request('POST', 'dummy.file', $headers);
$result = $this->plugin->checkQuota('');
$this->assertTrue($result);
}
@ -94,7 +94,7 @@ class QuotaPluginTest extends TestCase {
$this->plugin->expects($this->never())
->method('getFileChunking');
$this->server->httpRequest = new \Sabre\HTTP\Request(null, null, $headers);
$this->server->httpRequest = new \Sabre\HTTP\Request('POST', 'dummy.file', $headers);
$this->plugin->checkQuota('');
}
@ -106,7 +106,7 @@ class QuotaPluginTest extends TestCase {
$this->plugin->expects($this->never())
->method('getFileChunking');
$this->server->httpRequest = new \Sabre\HTTP\Request(null, null, $headers);
$this->server->httpRequest = new \Sabre\HTTP\Request('POST', 'dummy.file', $headers);
$result = $this->plugin->checkQuota('/sub/test.txt');
$this->assertTrue($result);
}
@ -191,7 +191,7 @@ class QuotaPluginTest extends TestCase {
->willReturn($mockChunking);
$headers['OC-CHUNKED'] = 1;
$this->server->httpRequest = new \Sabre\HTTP\Request(null, null, $headers);
$this->server->httpRequest = new \Sabre\HTTP\Request('POST', 'dummy.file', $headers);
$result = $this->plugin->checkQuota('/sub/test.txt-chunking-12345-3-1');
$this->assertTrue($result);
}
@ -228,7 +228,7 @@ class QuotaPluginTest extends TestCase {
->willReturn($mockChunking);
$headers['OC-CHUNKED'] = 1;
$this->server->httpRequest = new \Sabre\HTTP\Request(null, null, $headers);
$this->server->httpRequest = new \Sabre\HTTP\Request('POST', 'dummy.file', $headers);
$this->plugin->checkQuota('/sub/test.txt-chunking-12345-3-1');
}

5
apps/dav/tests/unit/DAV/Sharing/PluginTest.php
View File

@ -47,7 +47,7 @@ class PluginTest extends TestCase {
protected function setUp(): void {
parent::setUp();
/** @var Auth | \PHPUnit_Framework_MockObject_MockObject $authBackend */
$authBackend = $this->getMockBuilder(Auth::class)->disableOriginalConstructor()->getMock();
$authBackend->method('isDavAuthenticated')->willReturn(true);
@ -77,9 +77,8 @@ class PluginTest extends TestCase {
]], ['mailto:wilfredo@example.com']);
// setup request
$request = new Request();
$request = new Request('POST', 'addressbook1.vcf');
$request->addHeader('Content-Type', 'application/xml');
$request->setUrl('addressbook1.vcf');
$request->setBody('<?xml version="1.0" encoding="utf-8" ?><CS:share xmlns:D="DAV:" xmlns:CS="http://owncloud.org/ns"><CS:set><D:href>principal:principals/admin</D:href><CS:read-write/></CS:set> <CS:remove><D:href>mailto:wilfredo@example.com</D:href></CS:remove></CS:share>');
$response = new Response();
$this->plugin->httpPost($request, $response);