Skip to content
This repository was archived by the owner on Aug 4, 2026. It is now read-only.

chore(brand): align app-store hex to canonical cobalt #21468B #15

Merged
rubenvdlinde merged 5 commits into from
May 20, 2026
Merged

chore(brand): align app-store hex to canonical cobalt #21468B #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
73196b2
chore(brand): align app-store hex to canonical cobalt #21468B
rubenvdlinde May 13, 2026
8cfc501
Merge remote-tracking branch 'origin/development' into chore/brand-co…
rubenvdlinde May 20, 2026
17e14bc
chore(security): bump symfony/yaml + twig/twig past advisories
rubenvdlinde May 20, 2026
518b0dc
fix(tests): rename OCA\AppTemplate → OCA\DeskDesk in PHPUnit tests
rubenvdlinde May 20, 2026
ac710e6
fix(tests): update PHPUnit tests to match deskdesk production state
rubenvdlinde May 20, 2026
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
76 changes: 40 additions & 36 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions tests/Unit/AppTemplateTest.php → tests/Unit/DeskDeskTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

declare(strict_types=1);

namespace OCA\AppTemplate\Tests\Unit;
namespace OCA\DeskDesk\Tests\Unit;

use PHPUnit\Framework\TestCase;

/**
* Placeholder unit test — replace with real tests for your app logic.
*/
class AppTemplateTest extends TestCase
class DeskDeskTest extends TestCase
{

public function testPlaceholder(): void
Expand Down
2 changes: 1 addition & 1 deletion tests/bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
}

\OC_App::loadApps();
\OC_App::loadApp('app-template');
\OC_App::loadApp('deskdesk');
OC_Hook::clear();
}
8 changes: 4 additions & 4 deletions tests/unit/Controller/ItemControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* (the actual auth check) lives in ItemService.
*
* @category Test
* @package OCA\AppTemplate\Tests\Unit\Controller
* @package OCA\DeskDesk\Tests\Unit\Controller
*
* @author Conduction Development Team <info@conduction.nl>
* @copyright 2026 Conduction B.V.
Expand All @@ -23,10 +23,10 @@

declare(strict_types=1);

namespace OCA\AppTemplate\Tests\Unit\Controller;
namespace OCA\DeskDesk\Tests\Unit\Controller;

use OCA\AppTemplate\Controller\ItemController;
use OCA\AppTemplate\Service\ItemService;
use OCA\DeskDesk\Controller\ItemController;
use OCA\DeskDesk\Service\ItemService;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\JSONResponse;
use OCP\IRequest;
Expand Down
8 changes: 4 additions & 4 deletions tests/unit/Controller/SettingsControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Unit tests for SettingsController.
*
* @category Test
* @package OCA\AppTemplate\Tests\Unit\Controller
* @package OCA\DeskDesk\Tests\Unit\Controller
*
* @author Conduction Development Team <info@conduction.nl>
* @copyright 2026 Conduction B.V.
Expand All @@ -17,10 +17,10 @@

declare(strict_types=1);

namespace OCA\AppTemplate\Tests\Unit\Controller;
namespace OCA\DeskDesk\Tests\Unit\Controller;

use OCA\AppTemplate\Controller\SettingsController;
use OCA\AppTemplate\Service\SettingsService;
use OCA\DeskDesk\Controller\SettingsController;
use OCA\DeskDesk\Service\SettingsService;
use OCP\AppFramework\Http\JSONResponse;
use OCP\IRequest;
use PHPUnit\Framework\MockObject\MockObject;
Expand Down
8 changes: 4 additions & 4 deletions tests/unit/Service/ItemServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* security-critical branches.
*
* @category Test
* @package OCA\AppTemplate\Tests\Unit\Service
* @package OCA\DeskDesk\Tests\Unit\Service
*
* @author Conduction Development Team <info@conduction.nl>
* @copyright 2026 Conduction B.V.
Expand All @@ -23,9 +23,9 @@

declare(strict_types=1);

namespace OCA\AppTemplate\Tests\Unit\Service;
namespace OCA\DeskDesk\Tests\Unit\Service;

use OCA\AppTemplate\Service\ItemService;
use OCA\DeskDesk\Service\ItemService;
use OCP\App\IAppManager;
use OCP\IAppConfig;
use OCP\IGroupManager;
Expand Down Expand Up @@ -209,7 +209,7 @@ public function markObjectDeleted(): void
private function arrangeOpenRegister(): void
{
$this->appManager->method('isInstalled')->willReturn(true);
$this->appConfig->method('getValueString')->willReturn('app-template');
$this->appConfig->method('getValueString')->willReturn('deskdesk');
$this->container->method('get')->willReturn($this->objectService);
}//end arrangeOpenRegister()

Expand Down
Loading
Loading