Skip to content
Merged
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions src/Test/MakerTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ protected function executeMakerCommand(MakerTestDetails $testDetails)
$testEnv->prepare();

try {
// run tests
$makerTestProcess = $testEnv->runMaker();
// Run tests

$files = $testEnv->getGeneratedFilesFromOutputText();

foreach ($files as $file) {
Expand All @@ -48,13 +47,13 @@ protected function executeMakerCommand(MakerTestDetails $testDetails)
}
}

//run internal tests
// run internal tests
$internalTestProcess = $testEnv->runInternalTests();
if (null !== $internalTestProcess) {
$this->assertTrue($internalTestProcess->isSuccessful(), sprintf("Error while running the PHPUnit tests *in* the project: \n\n %s \n\n Command Output: %s", $internalTestProcess->getOutput(), $makerTestProcess->getOutput()));
}

//checkout user asserts
// checkout user asserts
if (null === $testDetails->getAssert()) {
$this->assertContains('Success', $makerTestProcess->getOutput(), $makerTestProcess->getErrorOutput());
} else {
Expand Down