From 841998bdcbda0eee655b4cb8d93eba4373007a72 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Mon, 20 Oct 2014 13:35:23 +0200 Subject: [PATCH] Add "$_SERVER['REQUEST_URI']" to fix the unit tests Let's hope that works --- tests/lib/templatelayout.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/lib/templatelayout.php b/tests/lib/templatelayout.php index f87db4fa54b..87e5f1b50bd 100644 --- a/tests/lib/templatelayout.php +++ b/tests/lib/templatelayout.php @@ -30,6 +30,9 @@ class OC_TemplateLayout extends \PHPUnit_Framework_TestCase { * @dataProvider validFilePathProvider */ public function testConvertToRelativePath($absolutePath, $expected) { + $_SERVER['REQUEST_URI'] = $expected; + $_SERVER['SCRIPT_NAME'] = '/'; + $relativePath = \Test_Helper::invokePrivate(new \OC_TemplateLayout('user'), 'convertToRelativePath', array($absolutePath)); $this->assertEquals($expected, $relativePath); } @@ -39,6 +42,10 @@ class OC_TemplateLayout extends \PHPUnit_Framework_TestCase { * @expectedExceptionMessage $filePath is not under the \OC::$SERVERROOT */ 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)); } } -- 2.39.5