diff options
author | Bjoern Schiessle <bjoern@schiessle.org> | 2016-07-12 16:30:09 +0200 |
---|---|---|
committer | Bjoern Schiessle <bjoern@schiessle.org> | 2016-07-14 16:39:48 +0200 |
commit | 2f23054b0126ec3497a7b632ff2399f6f3843a0f (patch) | |
tree | 603a047056a9e3893112a92b5565aa50aa62028d /apps/federatedfilesharing | |
parent | 33a685bc41628e1236015bd79cc8f82b9cb6cabf (diff) | |
download | nextcloud-server-2f23054b0126ec3497a7b632ff2399f6f3843a0f.tar.gz nextcloud-server-2f23054b0126ec3497a7b632ff2399f6f3843a0f.zip |
s/ownCloud/Nextcloud
Diffstat (limited to 'apps/federatedfilesharing')
-rw-r--r-- | apps/federatedfilesharing/appinfo/routes.php | 2 | ||||
-rw-r--r-- | apps/federatedfilesharing/lib/Controller/SaveToNextcloudController.php (renamed from apps/federatedfilesharing/lib/Controller/SaveToOwnCloudController.php) | 8 | ||||
-rw-r--r-- | apps/federatedfilesharing/tests/Controller/SaveToNextcloudControllerTest.php (renamed from apps/federatedfilesharing/tests/Controller/SaveToOwnCloudControllerTest.php) | 16 |
3 files changed, 13 insertions, 13 deletions
diff --git a/apps/federatedfilesharing/appinfo/routes.php b/apps/federatedfilesharing/appinfo/routes.php index 534733e001f..2a90ef5b59b 100644 --- a/apps/federatedfilesharing/appinfo/routes.php +++ b/apps/federatedfilesharing/appinfo/routes.php @@ -21,6 +21,6 @@ return [ 'routes' => [ - ['name' => 'SaveToOwnCloud#saveToOwnCloud', 'url' => '/saveToOwnCloud', 'verb' => 'POST'], + ['name' => 'SaveToNextcloud#saveToNextcloud', 'url' => '/saveToNextcloud', 'verb' => 'POST'], ] ]; diff --git a/apps/federatedfilesharing/lib/Controller/SaveToOwnCloudController.php b/apps/federatedfilesharing/lib/Controller/SaveToNextcloudController.php index 2318d21afb5..f2788cf1ccd 100644 --- a/apps/federatedfilesharing/lib/Controller/SaveToOwnCloudController.php +++ b/apps/federatedfilesharing/lib/Controller/SaveToNextcloudController.php @@ -32,7 +32,7 @@ use OCP\IRequest; use OCP\ISession; use OCP\Share\IManager; -class SaveToOwnCloudController extends Controller { +class SaveToNextcloudController extends Controller { /** @var FederatedShareProvider */ private $federatedShareProvider; @@ -47,7 +47,7 @@ class SaveToOwnCloudController extends Controller { private $session; /** - * SaveToOwnCloudController constructor. + * SaveToNextcloudController constructor. * * @param string $appName * @param IRequest $request @@ -72,7 +72,7 @@ class SaveToOwnCloudController extends Controller { } /** - * save public link to my ownCloud by asking the owner to create a federated + * save public link to my Nextcloud by asking the owner to create a federated * share with me * * @NoCSRFRequired @@ -83,7 +83,7 @@ class SaveToOwnCloudController extends Controller { * @param string $password * @return JSONResponse */ - public function saveToOwnCloud($shareWith, $token, $password = '') { + public function saveToNextcloud($shareWith, $token, $password = '') { try { list(, $server) = $this->addressHandler->splitUserRemote($shareWith); diff --git a/apps/federatedfilesharing/tests/Controller/SaveToOwnCloudControllerTest.php b/apps/federatedfilesharing/tests/Controller/SaveToNextcloudControllerTest.php index 9189ac76601..60136212c31 100644 --- a/apps/federatedfilesharing/tests/Controller/SaveToOwnCloudControllerTest.php +++ b/apps/federatedfilesharing/tests/Controller/SaveToNextcloudControllerTest.php @@ -24,7 +24,7 @@ namespace OCA\FederatedFileSharing\Tests\Controller; use OC\HintException; use OCA\FederatedFileSharing\AddressHandler; -use OCA\FederatedFileSharing\Controller\SaveToOwnCloudController; +use OCA\FederatedFileSharing\Controller\SaveToNextcloudController; use OCA\FederatedFileSharing\FederatedShareProvider; use OCP\AppFramework\Http; use OCP\Files\IRootFolder; @@ -34,9 +34,9 @@ use OCP\Share; use OCP\Share\IManager; use OCP\Share\IShare; -class SaveToOwnCloudControllerTest extends \Test\TestCase { +class SaveToNextcloudControllerTest extends \Test\TestCase { - /** @var SaveToOwnCloudController */ + /** @var SaveToNextcloudController */ private $controller; /** @var \OCP\IRequest | \PHPUnit_Framework_MockObject_MockObject */ @@ -77,7 +77,7 @@ class SaveToOwnCloudControllerTest extends \Test\TestCase { $this->share = new \OC\Share20\Share($this->rootFolder, $this->userManager); $this->session = $this->getMock('OCP\ISession'); - $this->controller = new SaveToOwnCloudController( + $this->controller = new SaveToNextcloudController( 'federatedfilesharing', $this->request, $this->federatedShareProvider, $this->shareManager, @@ -87,7 +87,7 @@ class SaveToOwnCloudControllerTest extends \Test\TestCase { } /** - * @dataProvider dataTestSaveToOwnCloud + * @dataProvider dataTestSaveToNextcloud * * @param string $shareWith * @param bool $validShareWith @@ -96,7 +96,7 @@ class SaveToOwnCloudControllerTest extends \Test\TestCase { * @param bool $createSuccessful * @param string $expectedReturnData */ - public function testSaveToOwnCloud($shareWith, $validShareWith, $token, $validToken, $createSuccessful, $expectedReturnData) { + public function testSaveToNextcloud($shareWith, $validShareWith, $token, $validToken, $createSuccessful, $expectedReturnData) { $this->addressHandler->expects($this->any())->method('splitUserRemote') ->with($shareWith) ->willReturnCallback( @@ -133,7 +133,7 @@ class SaveToOwnCloudControllerTest extends \Test\TestCase { } ); - $result = $this->controller->saveToOwnCloud($shareWith, $token); + $result = $this->controller->saveToNextcloud($shareWith, $token); $errorCase = !$validShareWith || !$validToken || !$createSuccessful; @@ -150,7 +150,7 @@ class SaveToOwnCloudControllerTest extends \Test\TestCase { } - public function dataTestSaveToOwnCloud() { + public function dataTestSaveToNextcloud() { return [ //shareWith, validShareWith, token, validToken, createSuccessful, expectedReturnData ['user@server', true, 'token', true, true, 'server'], |