wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #14007 from owncloud/fix-broken-master

Browse source 
[master] Request requires a second parameter
This commit is contained in:
Morris Jobke 2015-02-09 23:34:14 +01:00
commit 297b52fa4c
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
tests/lib/appframework/controller/OCSControllerTest.php
View file

@ -36,12 +36,13 @@ class OCSControllerTest extends \Test\TestCase {
public function testCors() {
$request = new Request(
array('server' => array('HTTP_ORIGIN' => 'test'))
array('server' => array('HTTP_ORIGIN' => 'test')),
$this->getMock('\OCP\Security\ISecureRandom')
);
$this->controller = new ChildOCSController('app', $request, 'verbs',
$controller = new ChildOCSController('app', $request, 'verbs',
'headers', 100);
$response = $this->controller->preflightedCors();
$response = $controller->preflightedCors();
$headers = $response->getHeaders();
@ -54,7 +55,10 @@ class OCSControllerTest extends \Test\TestCase {
public function testXML() {
$controller = new ChildOCSController('app', new Request);
$controller = new ChildOCSController('app', new Request(
[],
$this->getMock('\OCP\Security\ISecureRandom')
));
$expected = "<?xml version=\"1.0\"?>\n" .
"<ocs>\n" .
" <meta>\n" .
@ -80,7 +84,10 @@ class OCSControllerTest extends \Test\TestCase {
public function testXMLDataResponse() {
$controller = new ChildOCSController('app', new Request);
$controller = new ChildOCSController('app', new Request(
[],
$this->getMock('\OCP\Security\ISecureRandom')
));
$expected = "<?xml version=\"1.0\"?>\n" .
"<ocs>\n" .
" <meta>\n" .
@ -106,7 +113,10 @@ class OCSControllerTest extends \Test\TestCase {
public function testJSON() {
$controller = new ChildOCSController('app', new Request);
$controller = new ChildOCSController('app', new Request(
[],
$this->getMock('\OCP\Security\ISecureRandom')
));
$expected = '{"status":"OK","statuscode":400,"message":"OK",' .
'"totalitems":"","itemsperpage":"","data":{"test":"hi"}}';
$params = [