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

MNT Fix unit test #11519

Merged
merged 1 commit into from
Dec 19, 2024
Merged

MNT Fix unit test #11519

merged 1 commit into from
Dec 19, 2024

Conversation

emteknetnz
Copy link
Member

@emteknetnz emteknetnz commented Dec 19, 2024 •
edited
Loading

Issue silverstripe/.github#349

Fixes https://github.com/silverstripe/recipe-kitchen-sink/actions/runs/12402183570/job/34623193042#step:12:142

Happens when subsites extension is applied

 1) SilverStripe\ORM\Tests\HierarchyTest::testGetTreeTitleExtension
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'<i>&lt;b&gt;My group&lt;/b&gt;</i>'
+'<i>&lt;b&gt;My group&lt;/b&gt; <i>(global group)</i></i>'

@emteknetnz emteknetnz mentioned this pull request Dec 19, 2024
Closed
@emteknetnz emteknetnz marked this pull request as ready for review December 19, 2024 22:10
GuySartorelli
GuySartorelli approved these changes Dec 19, 2024
View reviewed changes
Copy link
Member

@GuySartorelli GuySartorelli left a comment

Choose a reason for hiding this comment

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

lol oh yeah.
LGTM.

GuySartorelli
GuySartorelli requested changes Dec 19, 2024
View reviewed changes
Copy link
Member

@GuySartorelli GuySartorelli left a comment

Choose a reason for hiding this comment

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

Actually let's avoid hardcoded strings when we can use ::class syntax.

tests/php/ORM/HierarchyTest.php Outdated Show resolved Hide resolved
@emteknetnz emteknetnz force-pushed the pulls/6.0/broken-builds3 branch from a16c883 to 5a91951 Compare December 19, 2024 22:51
GuySartorelli
GuySartorelli approved these changes Dec 19, 2024
View reviewed changes
Copy link
Member

@GuySartorelli GuySartorelli left a comment

Choose a reason for hiding this comment

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

LGTM

@GuySartorelli GuySartorelli merged commit 0edb872 into silverstripe:6.0 Dec 19, 2024
12 checks passed
@GuySartorelli GuySartorelli deleted the pulls/6.0/broken-builds3 branch December 19, 2024 23:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GuySartorelli GuySartorelli GuySartorelli approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@emteknetnz @GuySartorelli