Merge pull request giorgiosironi#336 from zerkms/windows-selenium-id-filename

zerkms · zerkms · commit 5ba37149e6a0 · 2014-12-07T17:29:45.000+13:00
Windows `PHPUNIT_SELENIUM_TEST_ID` cookie filename fix
diff --git a/PHPUnit/Extensions/SeleniumCommon/append.php b/PHPUnit/Extensions/SeleniumCommon/append.php
@@ -62,8 +62,8 @@
         $file = $_SERVER['SCRIPT_FILENAME'];
     }
 
-    file_put_contents(
-      $name = $file . '.' . md5(uniqid(rand(), TRUE)) . '.' . $_COOKIE['PHPUNIT_SELENIUM_TEST_ID'],
-      serialize($data)
-    );
+    $sanitizedCookieName = str_replace(array('\\'), '_', $_COOKIE['PHPUNIT_SELENIUM_TEST_ID']);
+    $fullPath = $file . '.' . md5(uniqid(rand(), TRUE)) . '.' . $sanitizedCookieName;
+
+    file_put_contents($fullPath, serialize($data));
 }
diff --git a/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php b/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php
@@ -59,9 +59,10 @@
 
 if (isset($_GET['PHPUNIT_SELENIUM_TEST_ID'])) {
     $facade = new File_Iterator_Facade;
+    $sanitizedCookieName = str_replace(array('\\'), '_', $_GET['PHPUNIT_SELENIUM_TEST_ID']);
     $files  = $facade->getFilesAsArray(
       $GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'],
-      $_GET['PHPUNIT_SELENIUM_TEST_ID']
+      $sanitizedCookieName
     );
 
     $coverage = array();
diff --git a/Tests/Selenium2TestCase/Coverage/SingleFileTest.php b/Tests/Selenium2TestCase/Coverage/SingleFileTest.php
@@ -1,7 +1,7 @@
 <?php
 class Tests_Selenium2TestCase_Coverage_SingleFileTest extends PHPUnit_Framework_TestCase
 {
-    private $dummyTestId = 'dummyTestId';
+    private $dummyTestId = 'ns_dummyTestId';
 
     public function setUp()
     {
diff --git a/Tests/Selenium2TestCase/Coverage/singleFile.php b/Tests/Selenium2TestCase/Coverage/singleFile.php
@@ -1,5 +1,5 @@
 <?php
-$_COOKIE['PHPUNIT_SELENIUM_TEST_ID'] = 'dummyTestId';
+$_COOKIE['PHPUNIT_SELENIUM_TEST_ID'] = 'ns\\dummyTestId';
 require __DIR__ . '/../../../PHPUnit/Extensions/SeleniumCommon/prepend.php';
 
 require_once 'DummyClass.php';

Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,8 @@`
`62`	`62`	`$file = $_SERVER['SCRIPT_FILENAME'];`
`63`	`63`	`}`
`64`	`64`
`65`		`- file_put_contents(`
`66`		`- $name = $file . '.' . md5(uniqid(rand(), TRUE)) . '.' . $_COOKIE['PHPUNIT_SELENIUM_TEST_ID'],`
`67`		`- serialize($data)`
`68`		`- );`
	`65`	`+ $sanitizedCookieName = str_replace(array('\\'), '_', $_COOKIE['PHPUNIT_SELENIUM_TEST_ID']);`
	`66`	`+ $fullPath = $file . '.' . md5(uniqid(rand(), TRUE)) . '.' . $sanitizedCookieName;`
	`67`	`+`
	`68`	`+ file_put_contents($fullPath, serialize($data));`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`	`class Tests_Selenium2TestCase_Coverage_SingleFileTest extends PHPUnit_Framework_TestCase`
`3`	`3`	`{`
`4`		`- private $dummyTestId = 'dummyTestId';`
	`4`	`+ private $dummyTestId = 'ns_dummyTestId';`
`5`	`5`
`6`	`6`	`public function setUp()`
`7`	`7`	`{`