Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(deps): update dependency doctrine/orm to v2.16.1 #3647

Merged
merged 2 commits into from
Aug 14, 2023
Merged

fix(deps): update dependency doctrine/orm to v2.16.1 #3647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2716fef
fix(deps): update dependency doctrine/orm to v2.16.1
renovate[bot] Aug 14, 2023
bb9aa30
fix api tests
usu Aug 14, 2023
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
2 changes: 1 addition & 1 deletion api/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"cweagans/composer-patches": "1.7.3",
"doctrine/doctrine-bundle": "2.10.2",
"doctrine/doctrine-migrations-bundle": "3.2.4",
"doctrine/orm": "2.15.4",
"doctrine/orm": "2.16.1",
"exercise/htmlpurifier-bundle": "4.1.2",
"google/recaptcha": "1.3.0",
"guzzlehttp/guzzle": "7.7.0",
Expand Down
18 changes: 9 additions & 9 deletions api/composer.lock
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions api/tests/Api/Activities/ReadActivityTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function testGetSingleActivityIsAllowedForGuest() {
'location' => $activity->location,
'_links' => [
'rootContentNode' => ['href' => $this->getIriFor('columnLayout1')],
// 'contentNodes' => ['href' => '/content_nodes?owner=%2Factivities%2F'.$activity->getId()],
'contentNodes' => ['href' => '/content_nodes?root='.urlencode($this->getIriFor('columnLayout1'))],
'category' => ['href' => $this->getIriFor('category1')],
'camp' => ['href' => $this->getIriFor('camp1')],
'scheduleEntries' => ['href' => '/schedule_entries?activity=%2Factivities%2F'.$activity->getId()],
Expand Down Expand Up @@ -93,7 +93,7 @@ public function testGetSingleActivityIsAllowedForMember() {
$this->assertEquals($this->getIriFor($activity->getRootContentNode()), $data['_embedded']['rootContentNode']['_links']['self']['href']);
$this->assertEquals($this->getIriFor($activity->getRootContentNode()), $data['_embedded']['rootContentNode']['_links']['root']['href']);
$this->assertContains(['href' => $this->getIriFor('multiSelect1')], $data['_embedded']['rootContentNode']['_links']['children']);
$this->assertEquals($this->getIriFor('materialNode1'), $data['_embedded']['contentNodes'][0]['_links']['self']['href']);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Testing for the first item if flaky, because it depends on the sorting of the embedded items. At the moment, sorting of embedded items is undefined (#2651). Hence switching to count of embedded items.

$this->assertEquals(10, count($data['_embedded']['contentNodes']));
}

public function testGetSingleActivityIsAllowedForManager() {
Expand All @@ -107,7 +107,7 @@ public function testGetSingleActivityIsAllowedForManager() {
'location' => $activity->location,
'_links' => [
'rootContentNode' => ['href' => $this->getIriFor('columnLayout1')],
// 'contentNodes' => ['href' => '/content_nodes?owner=%2Factivities%2F'.$activity->getId()],
'contentNodes' => ['href' => '/content_nodes?root='.urlencode($this->getIriFor('columnLayout1'))],
'category' => ['href' => $this->getIriFor('category1')],
'camp' => ['href' => $this->getIriFor('camp1')],
'scheduleEntries' => ['href' => '/schedule_entries?activity=%2Factivities%2F'.$activity->getId()],
Expand Down
Loading