fix tests on windows #2053
fix tests on windows #2053
Conversation
|
@yurii-github, thanks for your PR! By analyzing the history of the files in this pull request, we identified @sarnowski, @splitbrain and @Klap-in to be potential reviewers. |
| } | ||
|
|
||
| $this->file = tempnam($dir, 'css'); | ||
|
|
||
| $import = ''; | ||
| do { |
There was a problem hiding this comment.
removed potential infinite loop
| @@ -14,17 +14,17 @@ public function setUpFiles($subdir = '') { | |||
| mkdir($dir, 0777, true); | |||
| } | |||
| if (!is_dir($dir)) { | |||
| $this->markTestSkipped('Could not create directory.'); | |||
| throw new Exception('Could not create directory.'); | |||
There was a problem hiding this comment.
throw exception instead of skip because this is issue
_test/tests/inc/mailer.test.php
Outdated
| $this->assertEquals('moep@example.com, foo@example.com', $headers['To']); | ||
| } else { | ||
| $this->assertEquals('=?UTF-8?B?TcO2cA==?= <moep@example.com>, foo <foo@example.com>', $headers['To']); | ||
| } |
There was a problem hiding this comment.
I think for tests which's task is testing something that does not work/exist in Windows, it would make more sense to just mark the test as skipped. Eg. here the idea is to test the encoding in the name, but since the name is omitted on windows, there is nothing to test that hasn't been tested above already.
| @@ -38,10 +38,15 @@ private function csstest($input, $expected_css, $expected_less) { | |||
| $this->assertEquals($expected_less, $less); | |||
| } | |||
|
|
|||
| // make relative | |||
| private function importPath($path) { | |||
| return isWindows() ? preg_replace('#(^.*[\\\\])#','', $path) : preg_replace('#(^.*[/])#','', $path); | |||
There was a problem hiding this comment.
I'm not a fan of the tertiary operator here.
There was a problem hiding this comment.
what do you mean?
There was a problem hiding this comment.
I prefer to have a proper if-then-else construct here instead of the ... ? ... : ... shortcut.
inc/init.php
Outdated
| @@ -3,6 +3,20 @@ | |||
| * Initialize some defaults needed for DokuWiki | |||
| */ | |||
|
|
|||
| if (!function_exists('isWindows')) { | |||
| // checks if it is windows OS | |||
There was a problem hiding this comment.
proper doc blocks should be used.
inc/init.php
Outdated
| } | ||
|
|
||
| if (!function_exists('w2u')) { | ||
| // convert windows path to unix-like on windows OS |
There was a problem hiding this comment.
proper doc block should be used
inc/init.php
Outdated
| // convert windows path to unix-like on windows OS | ||
| function w2u($filename) { | ||
| return isWindows() ? str_replace('\\', '/', $filename) : $filename; | ||
| } |
There was a problem hiding this comment.
I am not sure this is needed/useful outside of tests. PHP does not care for forward or backward slashes when accessing files. So this is only ever needed when comparing files read from the file system with predefines (as done in the tests). So if this only needed for testing it could be moved to the test's utility functions.
inc/init.php
Outdated
| @@ -3,6 +3,20 @@ | |||
| * Initialize some defaults needed for DokuWiki | |||
| */ | |||
|
|
|||
| if (!function_exists('isWindows')) { | |||
There was a problem hiding this comment.
why the function_exists check here?
|
I merged this and set up automated windows testing at AppVeyor. See https://ci.appveyor.com/project/splitbrain/dokuwiki |
fixes tests on windows OS