Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions playwright/e2e/embed.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ test.beforeEach(async ({ page }) => {
})

test('embed whiteboard in another whiteboard', async ({ page }) => {
test.skip(process.env.SERVER_VERSION === 'master', 'The Files smart picker and file reference widget do not work with the Nextcloud 36 viewer yet')
test.setTimeout(90000)
const firstBoardName = `first whiteboard ${Date.now()}`
await createWhiteboard(page, { name: firstBoardName })
Expand Down
3 changes: 2 additions & 1 deletion tests/Unit/Controller/PickerControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use OCP\Files\File;
use OCP\Files\Folder;
use OCP\Files\IRootFolder;
use OCP\Files\IUserFolder;
use OCP\Files\NotFoundException;
use OCP\Files\Template\ITemplateManager;
use OCP\IConfig;
Expand Down Expand Up @@ -67,7 +68,7 @@ public function testIndexMergesOrgAndPersonalEntries(): void {
$templateManager->method('hasTemplateDirectory')->willReturn(true);
$templateManager->method('getTemplatePath')->willReturn('Templates/');

$userFolder = $this->createMock(Folder::class);
$userFolder = $this->createMock(interface_exists(IUserFolder::class) ? IUserFolder::class : Folder::class);
$userFolder->method('get')->with('Templates/')->willReturn($userTemplates);

$rootFolder = $this->createMock(IRootFolder::class);
Expand Down
3 changes: 2 additions & 1 deletion tests/Unit/Controller/WhiteboardControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
use OCP\Files\File;
use OCP\Files\Folder;
use OCP\Files\IRootFolder;
use OCP\Files\IUserFolder;
use OCP\Files\Template\ITemplateManager;
use OCP\ICacheFactory;
use OCP\IConfig;
Expand Down Expand Up @@ -85,7 +86,7 @@ private function makeController(
return $folder;
});

$userFolder = $this->createMock(Folder::class);
$userFolder = $this->createMock(interface_exists(IUserFolder::class) ? IUserFolder::class : Folder::class);
$userFolder->method('get')->with('Templates/')->willReturn($templatesFolder);
$whiteboardFile = $this->createMock(File::class);
$whiteboardFile->method('getId')->willReturn(123);
Expand Down
3 changes: 2 additions & 1 deletion tests/Unit/Service/CanvasTemplateServiceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
use OCP\Files\File;
use OCP\Files\Folder;
use OCP\Files\IRootFolder;
use OCP\Files\IUserFolder;
use OCP\Files\Template\ITemplateManager;
use OCP\IConfig;
use PHPUnit\Framework\MockObject\MockObject;
Expand All @@ -38,7 +39,7 @@ protected function setUp(): void {
$templateManager->method('getTemplatePath')->willReturn('Templates/');

$templatesFolder = $this->mockFolder($this->templatesChildren);
$userFolder = $this->createMock(Folder::class);
$userFolder = $this->createMock(interface_exists(IUserFolder::class) ? IUserFolder::class : Folder::class);
$userFolder->method('get')->with('Templates/')->willReturn($templatesFolder);

$orgCanvasTemplatesFolder = $this->mockFolder($this->orgCanvasTemplates);
Expand Down
3 changes: 2 additions & 1 deletion tests/Unit/Service/WhiteboardLibraryServiceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
use OCP\Files\File;
use OCP\Files\Folder;
use OCP\Files\IRootFolder;
use OCP\Files\IUserFolder;
use OCP\Files\Template\ITemplateManager;
use OCP\IConfig;
use PHPUnit\Framework\MockObject\MockObject;
Expand Down Expand Up @@ -41,7 +42,7 @@ protected function setUp(): void {
$this->templateManager->method('getTemplatePath')->willReturn('Templates/');

$templatesFolder = $this->mockFolder($this->templatesChildren);
$userFolder = $this->createMock(Folder::class);
$userFolder = $this->createMock(interface_exists(IUserFolder::class) ? IUserFolder::class : Folder::class);
$userFolder->method('get')->with('Templates/')->willReturn($templatesFolder);

// App data tree: appdata_test/whiteboard/<dir>. Lazily materialized
Expand Down
Loading