Skip to content

Fix entry order test expectations #611

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

Open
duncanmcclean wants to merge 6 commits into
base: 5.x
Choose a base branch
from
Open

Fix entry order test expectations #611

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1817f4c
wip
duncanmcclean Jun 1, 2026
b3f7a61
wip
duncanmcclean Jun 1, 2026
2a82622
Merge branch '5.x' into fix/release-permissions
duncanmcclean Jun 1, 2026
db27196
fix entry order test expectations for statamic/cms order fix
duncanmcclean Aug 31, 2026
11a16b1
Merge branch '5.x' into fix-entry-order-test-expectations
duncanmcclean Aug 31, 2026
d3baf93
assert order is unchanged relative to its pre-save state, not hardcoded
duncanmcclean Aug 31, 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
34 changes: 16 additions & 18 deletions tests/Entries/EntryRepositoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ public function it_updates_the_order_of_all_entries_in_a_collection()
(new Entry)->id(3)->collection($collection)->slug('charlie')->save();
(new Entry)->id(4)->collection($collection)->slug('delta')->save();

$orderBeforeStructureSave = EntryModel::all()->mapWithKeys(fn ($e) => [$e->id => $e->order])->all();

$collection->structure()->in('en')->tree([
['entry' => 4],
['entry' => 2],
Expand All @@ -103,12 +105,10 @@ public function it_updates_the_order_of_all_entries_in_a_collection()

// Assert that the order is unchanged, to make sure that saving
// the structure isn't what caused the order to be updated.
$this->assertEquals([
1 => 1,
2 => 1,
3 => 1,
4 => 1,
], EntryModel::all()->mapWithKeys(fn ($e) => [$e->id => $e->order])->all());
$this->assertEquals(
$orderBeforeStructureSave,
EntryModel::all()->mapWithKeys(fn ($e) => [$e->id => $e->order])->all()
);

(new EntryRepository(new Stache))->updateOrders($collection);

Expand All @@ -134,6 +134,8 @@ public function it_updates_the_order_of_specific_entries_in_a_collection()
(new Entry)->id(3)->collection($collection)->slug('charlie')->save();
(new Entry)->id(4)->collection($collection)->slug('delta')->save();

$orderBeforeStructureSave = EntryModel::all()->mapWithKeys(fn ($e) => [$e->id => $e->order])->all();

$collection->structure()->in('en')->tree([
['entry' => 4],
['entry' => 2],
Expand All @@ -143,21 +145,17 @@ public function it_updates_the_order_of_specific_entries_in_a_collection()

// Assert that the order is unchanged, to make sure that saving
// the structure isn't what caused the order to be updated.
$this->assertEquals([
1 => 1,
2 => 1,
3 => 1,
4 => 1,
], EntryModel::all()->mapWithKeys(fn ($e) => [$e->id => $e->order])->all());
$this->assertEquals(
$orderBeforeStructureSave,
EntryModel::all()->mapWithKeys(fn ($e) => [$e->id => $e->order])->all()
);

(new EntryRepository(new Stache))->updateOrders($collection, [2, 3]);

$this->assertEquals([
1 => 1,
2 => 2,
3 => 4,
4 => 1,
], EntryModel::all()->mapWithKeys(fn ($e) => [$e->id => $e->order])->all());
$this->assertEquals(
[2 => 2, 3 => 4] + $orderBeforeStructureSave,
EntryModel::all()->mapWithKeys(fn ($e) => [$e->id => $e->order])->all()
);
}

#[Test]
Expand Down