flywithu/ocsms
1
0
Fork 0
mirror of https://github.com/nerzhul/ocsms.git synced 2025-06-08 16:36:25 +00:00
Code Issues Releases Wiki Activity

Link App with SmsController

Browse Source
This commit is contained in:
Loic Blot 2014-09-30 05:49:27 +00:00
parent 42df9cc510
commit 860b4a3fb5
3 changed files with 8 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
appinfo/application.php
View File

@ -41,7 +41,8 @@ class Application extends App {
$c->query('AppName'),
$c->query('Request'),
$c->query('UserId'),
$c->query('SmsMapper')
$c->query('SmsMapper'),
$this
);
});
@ -86,5 +87,7 @@ class Application extends App {
}
}
}
return self::$contacts;
}
}

6
controller/smscontroller.php
View File

@ -20,12 +20,14 @@ use \OCA\OcSms\Db\SmsMapper;
class SmsController extends Controller {
private $app;
private $userId;
private $smsMapper;
private $errorMsg;
public function __construct ($appName, IRequest $request, $userId, SmsMapper $mapper){
public function __construct ($appName, IRequest $request, $userId, SmsMapper $mapper, Application $app){
parent::__construct($appName, $request);
$this->app = $app;
$this->userId = $userId;
$this->smsMapper = $mapper;
}
@ -80,7 +82,7 @@ class SmsController extends Controller {
public function getConversation ($phoneNumber, $lastDate = 0) {
$messages = $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $phoneNumber, $lastDate);
// @ TODO: filter correctly
return new JSONResponse(array("conversation" => $messages));
return new JSONResponse(array("conversation" => $messages, $contacts => $this->app->getContacts()));
}
/**

53
tests/unit/controller/PageControllerTest.php
View File

@ -1,53 +0,0 @@
<?php
/**
* ownCloud - ocsms
*
* This file is licensed under the Affero General Public License version 3 or
* later. See the COPYING file.
*
* @author Loic Blot <loic.blot@unix-experience.fr>
* @copyright Loic Blot 2014
*/
namespace OCA\OcSms\Controller;
use \OCP\IRequest;
use \OCP\AppFramework\Http\TemplateResponse;
use \OCP\AppFramework\Http\JSONResponse;
use \OCA\OcSms\AppInfo\Application;
class PageControllerTest extends \PHPUnit_Framework_TestCase {
private $container;
public function setUp () {
$app = new Application();
$phpunit = $this;
$this->container = $app->getContainer();
$this->container->registerService('Request', function($c) use ($phpunit) {
return $phpunit->getMockBuilder('\OCP\IRequest')->getMock();
});
$this->container->registerParameter('UserId', 'john');
}
public function testIndex () {
$result = $this->container->query('PageController')->index();
$this->assertEquals(array('user' => 'john'), $result->getParams());
$this->assertEquals('main', $result->getTemplateName());
$this->assertTrue($result instanceof TemplateResponse);
}
public function testEcho () {
$result = $this->container->query('PageController')->doEcho('hi');
$this->assertEquals(array('echo' => 'hi'), $result);
}
}