Skip to content
Snippets Groups Projects
Commit 4ce3c25c authored by Lukas Reschke's avatar Lukas Reschke
Browse files

Add "$_SERVER['REQUEST_URI']" to fix the unit tests

Let's hope that works
parent 8f8abdba
No related branches found
No related tags found
No related merge requests found
...@@ -30,6 +30,9 @@ class OC_TemplateLayout extends \PHPUnit_Framework_TestCase { ...@@ -30,6 +30,9 @@ class OC_TemplateLayout extends \PHPUnit_Framework_TestCase {
* @dataProvider validFilePathProvider * @dataProvider validFilePathProvider
*/ */
public function testConvertToRelativePath($absolutePath, $expected) { public function testConvertToRelativePath($absolutePath, $expected) {
$_SERVER['REQUEST_URI'] = $expected;
$_SERVER['SCRIPT_NAME'] = '/';
$relativePath = \Test_Helper::invokePrivate(new \OC_TemplateLayout('user'), 'convertToRelativePath', array($absolutePath)); $relativePath = \Test_Helper::invokePrivate(new \OC_TemplateLayout('user'), 'convertToRelativePath', array($absolutePath));
$this->assertEquals($expected, $relativePath); $this->assertEquals($expected, $relativePath);
} }
...@@ -39,6 +42,10 @@ class OC_TemplateLayout extends \PHPUnit_Framework_TestCase { ...@@ -39,6 +42,10 @@ class OC_TemplateLayout extends \PHPUnit_Framework_TestCase {
* @expectedExceptionMessage $filePath is not under the \OC::$SERVERROOT * @expectedExceptionMessage $filePath is not under the \OC::$SERVERROOT
*/ */
public function testInvalidConvertToRelativePath() { public function testInvalidConvertToRelativePath() {
\Test_Helper::invokePrivate(new \OC_TemplateLayout('user'), 'convertToRelativePath', array('/this/file/is/invalid')); $invalidFile = '/this/file/is/invalid';
$_SERVER['REQUEST_URI'] = $invalidFile;
$_SERVER['SCRIPT_NAME'] = '/';
\Test_Helper::invokePrivate(new \OC_TemplateLayout('user'), 'convertToRelativePath', array($invalidFile));
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment