upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Redirection now only happens when dir is empty

Browse source 
Otherwise dir it's just ignored and fileid is used

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
This commit is contained in:
Carl Schwan 2022-02-21 11:35:22 +01:00
parent 3d0e8a5002
commit 9bc0e01d24
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/files/tests/Controller/ViewControllerTest.php
View file

@ -459,7 +459,7 @@ class ViewControllerTest extends TestCase {
->willReturn('/apps/files/?dir=/test/sub');
$expected = new Http\RedirectResponse('/apps/files/?dir=/test/sub');
$this->assertEquals($expected, $this->viewController->index('/whatever', '', '123'));
$this->assertEquals($expected, $this->viewController->index('', '', '123'));
}
public function testShowFileRouteWithFile() {
@ -499,7 +499,7 @@ class ViewControllerTest extends TestCase {
->willReturn('/apps/files/?dir=/test/sub&scrollto=somefile.txt');
$expected = new Http\RedirectResponse('/apps/files/?dir=/test/sub&scrollto=somefile.txt');
$this->assertEquals($expected, $this->viewController->index('/whatever', '', '123'));
$this->assertEquals($expected, $this->viewController->index('', '', '123'));
}
public function testShowFileRouteWithInvalidFileId() {
@ -519,7 +519,7 @@ class ViewControllerTest extends TestCase {
->with('files.view.index', ['fileNotFound' => true])
->willReturn('redirect.url');
$response = $this->viewController->index('MyDir', 'MyView', '123');
$response = $this->viewController->index('', 'MyView', '123');
$this->assertInstanceOf('OCP\AppFramework\Http\RedirectResponse', $response);
$this->assertEquals('redirect.url', $response->getRedirectURL());
}
@ -576,6 +576,6 @@ class ViewControllerTest extends TestCase {
->willReturn('/apps/files/?view=trashbin&dir=/test.d1462861890/sub&scrollto=somefile.txt');
$expected = new Http\RedirectResponse('/apps/files/?view=trashbin&dir=/test.d1462861890/sub&scrollto=somefile.txt');
$this->assertEquals($expected, $this->viewController->index('/whatever', '', '123'));
$this->assertEquals($expected, $this->viewController->index('', '', '123'));
}
}