More DS corrections.

cakephp · Dec 20, 2014 · e413acc · e413acc
1 parent 243ea3c
commit e413acc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/tests/TestCase/Console/ShellTest.php b/tests/TestCase/Console/ShellTest.php
@@ -481,7 +481,7 @@ public function testCreateFileOverwrite() {
  * @return void
  */
 	public function testCreateFileNoPermissions() {
-		$this->skipIf(DIRECTORY_SEPARATOR === '\\', 'Cant perform operations using permissions on windows.');
+		$this->skipIf(DS === '\\', 'Cant perform operations using permissions on windows.');
 
 		$path = TMP . 'shell_test';
 		$file = $path . DS . 'no_perms';

diff --git a/tests/TestCase/Filesystem/FileTest.php b/tests/TestCase/Filesystem/FileTest.php
@@ -128,7 +128,7 @@ function_exists('mime_content_type') &&
  * @return void
  */
 	public function testPermission() {
-		$this->skipIf(DIRECTORY_SEPARATOR === '\\', 'File permissions tests not supported on Windows.');
+		$this->skipIf(DS === '\\', 'File permissions tests not supported on Windows.');
 
 		$dir = TMP . 'tests' . DS . 'permissions' . DS;
 		$old = umask();

diff --git a/tests/TestCase/Filesystem/FolderTest.php b/tests/TestCase/Filesystem/FolderTest.php
@@ -172,7 +172,7 @@ public function testCreateRelative() {
  * @return void
  */
 	public function testRecursiveCreateFailure() {
-		$this->skipIf(DIRECTORY_SEPARATOR === '\\', 'Cant perform operations using permissions on windows.');
+		$this->skipIf(DS === '\\', 'Cant perform operations using permissions on windows.');
 
 		$path = TMP . 'tests/one';
 		mkdir($path, 0777, true);
@@ -267,7 +267,7 @@ public function testOperations() {
  * @return void
  */
 	public function testChmod() {
-		$this->skipIf(DIRECTORY_SEPARATOR === '\\', 'Folder permissions tests not supported on Windows.');
+		$this->skipIf(DS === '\\', 'Folder permissions tests not supported on Windows.');
 
 		$path = TMP . 'tests/';
 		$Folder = new Folder($path);

diff --git a/tests/TestCase/Shell/PluginAssetsShellTest.php b/tests/TestCase/Shell/PluginAssetsShellTest.php
@@ -36,7 +36,7 @@ public function setUp() {
 		parent::setUp();
 
 		$this->skipIf(
-			DIRECTORY_SEPARATOR === '\\',
+			DS === '\\',
 			'Skip PluginAssetsShell tests on windows to prevent side effects for UrlHelper tests on AppVeyor.'
 		);
 
@@ -74,7 +74,7 @@ public function testSymlink() {
 		$path = WWW_ROOT . 'test_plugin';
 		$link = new \SplFileInfo($path);
 		$this->assertTrue(file_exists($path . DS . 'root.js'));
-		if (DIRECTORY_SEPARATOR === '\\') {
+		if (DS === '\\') {
 			$this->assertTrue($link->isDir());
 			$folder = new Folder($path);
 			$folder->delete();
@@ -107,7 +107,7 @@ public function testSymlinkWhenVendorDirectoryExits() {
 		$this->shell->symlink();
 		$path = WWW_ROOT . 'company' . DS . 'test_plugin_three';
 		$link = new \SplFileInfo($path);
-		if (DIRECTORY_SEPARATOR === '\\') {
+		if (DS === '\\') {
 			$this->assertTrue($link->isDir());
 		} else {
 			$this->assertTrue($link->isLink());