Skip to content

Commit 8fcf10c

Browse files
authored
Merge pull request #171 from PHPCSStandards/feature/tests-registerstandards-stabilize
RegisterExternalStandardsTest: stabilize test for Composer v1 on Windows with PHP 5.5
2 parents 1f6f9f5 + ccd127f commit 8fcf10c

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

tests/IntegrationTest/RegisterExternalStandardsTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -293,10 +293,11 @@ public function testRegisterOneStandardInSrcSubdir($phpcsVersion)
293293
$this->writeComposerJsonFile($config, static::$tempGlobalPath);
294294

295295
// Install the dependencies and verify that the plugin has run.
296+
$expectedStdOut = $this->willPluginOutputShow() ? 'PHP CodeSniffer Config installed_paths set to ' : null;
296297
$this->assertExecute(
297298
'composer global install -v --no-ansi',
298299
0, // Expected exit code.
299-
'PHP CodeSniffer Config installed_paths set to ', // Expectation for stdout.
300+
$expectedStdOut, // Expectation for stdout.
300301
null, // No stderr expectation.
301302
'Failed to install dependencies.'
302303
);

0 commit comments

Comments
 (0)