diff options
author | Morris Jobke <hey@morrisjobke.de> | 2016-01-20 10:42:19 +0100 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2016-01-20 10:42:19 +0100 |
commit | d6a63016ae0e14efeefd763a1042c515b60b3f7d (patch) | |
tree | 2a9a10e609a79402bc5ea40ff25cfea76d92e8b4 /tests | |
parent | c2a1a02fe452fe93057f36e6d37a8634df2e0bd6 (diff) | |
download | nextcloud-server-d6a63016ae0e14efeefd763a1042c515b60b3f7d.tar.gz nextcloud-server-d6a63016ae0e14efeefd763a1042c515b60b3f7d.zip |
move lost controller to core/controller
* lostpassword.css is unneeded since #11696 is merged - 1b50d4f7ceb92fffe0d38f823f175cf7e419c69e
* js is already in core/js
* css is moved to core/css/lostpassword
* template is moved to core/templates/lostpassword
Diffstat (limited to 'tests')
-rw-r--r-- | tests/core/controller/lostcontrollertest.php (renamed from tests/core/lostpassword/controller/lostcontrollertest.php) | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/core/lostpassword/controller/lostcontrollertest.php b/tests/core/controller/lostcontrollertest.php index 0843d82da3f..44bc539247f 100644 --- a/tests/core/lostpassword/controller/lostcontrollertest.php +++ b/tests/core/controller/lostcontrollertest.php @@ -19,7 +19,7 @@ * */ -namespace OC\Core\LostPassword\Controller; +namespace OC\Core\Controller; use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Utility\ITimeFactory; @@ -36,7 +36,7 @@ use PHPUnit_Framework_MockObject_MockObject; /** * Class LostControllerTest * - * @package OC\Core\LostPassword\Controller + * @package OC\Core\Controller */ class LostControllerTest extends \PHPUnit_Framework_TestCase { @@ -124,8 +124,8 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase { ->will($this->returnValue('https://ownCloud.com/index.php/lostpassword/')); $response = $this->lostController->resetform($token, $userId); - $expectedResponse = new TemplateResponse('core/lostpassword', - 'resetpassword', + $expectedResponse = new TemplateResponse('core', + 'lostpassword/resetpassword', array( 'link' => 'https://ownCloud.com/index.php/lostpassword/', ), |