From d4d2e7a4d5ec7fd2035a1b532f9680a963f4e6c8 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 7 Aug 2021 03:02:18 +0700 Subject: [PATCH] [Testing] Fixing MultipleFilesChangedTrait under macOs (#605) * [Testing] Fixing mMultipleFilesChangedTrait under macOs * final touch * [ci-review] Rector Rectify * [ci-review] Rector Rectify * use relative path as key Co-authored-by: GitHub Action --- .../Behavior/MultipleFilesChangedTrait.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/packages/Testing/PHPUnit/Behavior/MultipleFilesChangedTrait.php b/packages/Testing/PHPUnit/Behavior/MultipleFilesChangedTrait.php index ffc99cee721..3fdbd51cf4d 100644 --- a/packages/Testing/PHPUnit/Behavior/MultipleFilesChangedTrait.php +++ b/packages/Testing/PHPUnit/Behavior/MultipleFilesChangedTrait.php @@ -76,12 +76,21 @@ trait MultipleFilesChangedTrait $addedFilesWithContent = $this->removedAndAddedFilesCollector->getAddedFilesWithContent(); $addedFiles = []; foreach ($addedFilesWithContent as $addedFileWithContent) { - $addedFiles[$addedFileWithContent->getFilePath()] = $addedFileWithContent; + [, $addedFilePathWithContentFilePath] = explode( + '_temp_fixture_easy_testing', + $addedFileWithContent->getFilePath() + ); + $addedFiles[$addedFilePathWithContentFilePath] = $addedFileWithContent; } foreach ($expectedFileChanges as $path => $expectedFileChange) { - $addedFile = $addedFiles[$path] ?? null; - $this->assertSame($path, $addedFile ? $addedFile->getFilePath() : null); + [, $relativePath] = explode('_temp_fixture_easy_testing', $path); + $addedFile = $addedFiles[$relativePath] ?? null; + [, $addedFilePathWithContentFilePath] = $addedFile + ? explode('_temp_fixture_easy_testing', $addedFile->getFilePath()) + : null; + + $this->assertSame($relativePath, $addedFilePathWithContentFilePath); $realFileContent = $addedFile ? trim($addedFile->getFileContent()) : null; $this->assertSame($expectedFileChange, $realFileContent); if (file_exists($path)) {