Skip to content

Commit 3695c8f

Browse files
committed
fix: codeception
1 parent df98c56 commit 3695c8f

File tree

4 files changed

+18
-15
lines changed

4 files changed

+18
-15
lines changed

.github/ci/files/config/packages/test/config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ doctrine:
2525
mapping_types:
2626
enum: string
2727
bit: boolean
28-
server_version: '10.11.4-MariaDB-1:10.11.4+maria~ubu2204'
2928

3029
parameters:
3130
pimcore_test.db.dsn: '%env(PIMCORE_TEST_DB_DSN)%'

.github/workflows/elastic-search-codeception.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ env:
1818
PIMCORE_PROJECT_ROOT: ${{ github.workspace }}
1919
APP_ENV: test
2020
PIMCORE_TEST: 1
21-
PIMCORE_TEST_DB_DSN: "mysql://[email protected]:33006/pimcore_test?serverVersion=mariadb-10.11.4"
21+
PIMCORE_TEST_DB_DSN: "mysql://[email protected]:33006/pimcore_test"
2222
PIMCORE_ELASTIC_SEARCH_HOST: "localhost:5300"
2323
CODECEPTION_BUNDLE_PATH: "bundles/pimcore/generic-data-index-bundle/"
2424

@@ -34,7 +34,7 @@ jobs:
3434

3535
services:
3636
mariadb:
37-
image: "mariadb:10.11.4"
37+
image: "mariadb:10.11"
3838
ports:
3939
- 33006:3306
4040
env:

.github/workflows/open-search-codeception.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ env:
1818
PIMCORE_PROJECT_ROOT: ${{ github.workspace }}
1919
APP_ENV: test
2020
PIMCORE_TEST: 1
21-
PIMCORE_TEST_DB_DSN: "mysql://[email protected]:33006/pimcore_test?serverVersion=mariadb-10.11.4"
21+
PIMCORE_TEST_DB_DSN: "mysql://[email protected]:33006/pimcore_test"
2222
PIMCORE_OPEN_SEARCH_HOST: "localhost:39200"
2323
CODECEPTION_BUNDLE_PATH: "bundles/pimcore/generic-data-index-bundle/"
2424

@@ -36,7 +36,7 @@ jobs:
3636

3737
services:
3838
mariadb:
39-
image: "mariadb:10.11.4"
39+
image: "mariadb:10.11"
4040
ports:
4141
- 33006:3306
4242
env:

tests/Unit/Service/Permission/PermissionServiceTest.php

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ final class PermissionServiceTest extends Unit
5454
public function _before(): void
5555
{
5656
$this->user = new User();
57-
$this->assetSearchResult = new AssetSearchResultItem();
58-
$this->dataObjectSearchResult = new DataObjectSearchResultItem();
59-
$this->documentSearchResultItem = new DocumentSearchResultItem();
57+
$this->assetSearchResult = (new AssetSearchResultItem())->setParentId(1);
58+
$this->dataObjectSearchResult = (new DataObjectSearchResultItem())->setParentId(1);
59+
$this->documentSearchResultItem = (new DocumentSearchResultItem())->setParentId(1);
6060
}
6161

6262
public function testAssetPermissionWithUserOnRoot(): void
@@ -67,13 +67,14 @@ public function testAssetPermissionWithUserOnRoot(): void
6767
type: AssetWorkspace::WORKSPACE_TYPE
6868
)]);
6969
$assetPermission = $this->getPermissionServiceWithUser()->getAssetPermissions(
70-
$this->assetSearchResult->setFullPath('/'),
70+
$this->assetSearchResult->setParentId(0)->setFullPath('/'),
7171
$this->user
7272
);
7373

7474
$this->assertTrue($assetPermission->isView());
7575
$this->assertTrue($assetPermission->isList());
7676
$this->assertFalse($assetPermission->isDelete());
77+
$this->assertFalse($assetPermission->isRename());
7778
}
7879

7980
public function testAssetPermissionWithUserOnCustomPath(): void
@@ -160,12 +161,13 @@ public function testAssetPermissionWithoutUserOnRoot(): void
160161
{
161162
$permissionService = $this->getPermissionServiceWithoutUser();
162163
$assetPermission = $permissionService->getAssetPermissions(
163-
$this->assetSearchResult->setFullPath('/'),
164+
$this->assetSearchResult->setParentId(0)->setFullPath('/'),
164165
null
165166
);
166167
$this->assertSame(self::DEFAULT_VALUE, $assetPermission->isList());
167168
$this->assertSame(self::DEFAULT_VALUE, $assetPermission->isView());
168169
$this->assertSame(self::DEFAULT_VALUE, $assetPermission->isRename());
170+
$this->assertSame(self::DEFAULT_VALUE, $assetPermission->isDelete());
169171
}
170172

171173
public function testObjectPermissionWithUserOnRoot(): void
@@ -176,15 +178,16 @@ public function testObjectPermissionWithUserOnRoot(): void
176178
type: DataObjectWorkspace::WORKSPACE_TYPE
177179
)]);
178180
$permission = $this->getPermissionServiceWithUser()->getDataObjectPermissions(
179-
$this->dataObjectSearchResult->setFullPath('/'),
181+
$this->dataObjectSearchResult->setParentId(0)->setFullPath('/'),
180182
$this->user
181183
);
182184

183185
$this->assertTrue($permission->isView());
184186
$this->assertTrue($permission->isList());
185187
$this->assertTrue($permission->isPublish());
186-
$this->assertTrue($permission->isUnpublish());
187188
$this->assertFalse($permission->isDelete());
189+
$this->assertFalse($permission->isUnpublish());
190+
$this->assertFalse($permission->isRename());
188191
}
189192

190193
public function testObjectPermissionWithUserOnCustomPath(): void
@@ -272,7 +275,7 @@ public function testObjectPermissionWithoutUserOnRoot(): void
272275
{
273276
$permissionService = $this->getPermissionServiceWithoutUser();
274277
$permission = $permissionService->getDataObjectPermissions(
275-
$this->dataObjectSearchResult->setFullPath('/'),
278+
$this->dataObjectSearchResult->setParentId(0)->setFullPath('/'),
276279
null
277280
);
278281

@@ -290,15 +293,16 @@ public function testDocumentPermissionWithUserOnRoot(): void
290293
type: DocumentWorkspace::WORKSPACE_TYPE
291294
)]);
292295
$permission = $this->getPermissionServiceWithUser()->getDocumentPermissions(
293-
$this->documentSearchResultItem->setFullPath('/'),
296+
$this->documentSearchResultItem->setParentId(0)->setFullPath('/'),
294297
$this->user
295298
);
296299

297300
$this->assertTrue($permission->isView());
298301
$this->assertTrue($permission->isSave());
299302
$this->assertTrue($permission->isPublish());
300-
$this->assertTrue($permission->isUnpublish());
303+
$this->assertFalse($permission->isUnpublish());
301304
$this->assertFalse($permission->isList());
305+
$this->assertFalse($permission->isDelete());
302306
}
303307

304308
public function testDocumentPermissionWithUserOnCustomPath(): void

0 commit comments

Comments
 (0)