diff options
| author | Thomas Steur <tsteur@users.noreply.github.com> | 2019-09-17 23:35:22 +0300 |
|---|---|---|
| committer | diosmosis <diosmosis@users.noreply.github.com> | 2019-09-17 23:35:22 +0300 |
| commit | 42b4ab13bc36511fabbf376e098e07ffae0d674a (patch) | |
| tree | 1deef1ec16dca25b3a41cd200d5a481f7803e157 /tests/PHPUnit/Integration/AssetManagerTest.php | |
| parent | 583d8d1c28cf0b96810a81dfb7c76a3c1140d764 (diff) | |
Fix user path was not working as it should (allow placing config file outside webroot) (#14866)
* Fix user path was not working as it should
* fix error
Diffstat (limited to 'tests/PHPUnit/Integration/AssetManagerTest.php')
| -rw-r--r-- | tests/PHPUnit/Integration/AssetManagerTest.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/PHPUnit/Integration/AssetManagerTest.php b/tests/PHPUnit/Integration/AssetManagerTest.php index d6bfcc067a..82654af55a 100644 --- a/tests/PHPUnit/Integration/AssetManagerTest.php +++ b/tests/PHPUnit/Integration/AssetManagerTest.php @@ -336,7 +336,7 @@ class AssetManagerTest extends IntegrationTestCase */ private function getExpectedMergedJs($filename) { - $expectedMergeResult = new OnDiskUIAsset(PIWIK_USER_PATH, self::ASSET_MANAGER_TEST_DIR .'scripts/' . $filename); + $expectedMergeResult = new OnDiskUIAsset(PIWIK_DOCUMENT_ROOT, self::ASSET_MANAGER_TEST_DIR .'scripts/' . $filename); $expectedContent = $expectedMergeResult->getContent(); @@ -357,7 +357,7 @@ class AssetManagerTest extends IntegrationTestCase */ private function getExpectedMergedStylesheet() { - $expectedMergeResult = new OnDiskUIAsset(PIWIK_USER_PATH, self::ASSET_MANAGER_TEST_DIR .'stylesheets/ExpectedMergeResult.css'); + $expectedMergeResult = new OnDiskUIAsset(PIWIK_DOCUMENT_ROOT, self::ASSET_MANAGER_TEST_DIR .'stylesheets/ExpectedMergeResult.css'); $expectedContent = $expectedMergeResult->getContent(); |