Merge pull request #2541 from vlakoff/develop-4
Proper directory_map test skip
diff --git a/tests/codeigniter/helpers/directory_helper_test.php b/tests/codeigniter/helpers/directory_helper_test.php
index d860473..de72dee 100644
--- a/tests/codeigniter/helpers/directory_helper_test.php
+++ b/tests/codeigniter/helpers/directory_helper_test.php
@@ -28,8 +28,8 @@
vfsStream::create($structure, $this->_test_dir);
- // opendir() seems to fail on Windows + vfsStream when there are trailing slashes in directory names
- if ( ! @opendir(vfsStream::url('testDir')))
+ // is_dir(), opendir(), etc. seem to fail on Windows + vfsStream when there are trailing backslashes in directory names
+ if ( ! is_dir(vfsStream::url('testDir').DIRECTORY_SEPARATOR))
{
$this->markTestSkipped();
return;