DEV: restructure tests: fix static paths

# Conflicts: # tests/TestHelper.php
LimeSurvey · Jan 9, 2018 · 96a876d · 96a876d
1 parent c1ca2e0
commit 96a876d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tests/TestHelper.php b/tests/TestHelper.php
@@ -238,7 +238,7 @@ public function updateDbFromVersion($version, $connection = null)
         $inst->connection = $connection;
 
         // Check SQL file.
-        $file = __DIR__ . '/data/sql/create-mysql.' . $version . '.sql';
+        $file = TestBaseClass::getDataFolder() . '/sql/create-mysql.' . $version . '.sql';
         $this->assertFileExists($file, 'SQL file exists: ' . $file);
 
         // Run SQL install file.

diff --git a/tests/helpers/GroupRandomizationTest.php b/tests/helpers/GroupRandomizationTest.php
@@ -26,7 +26,7 @@ public static function setupBeforeClass()
 
         \Yii::app()->session['loginID'] = 1;
 
-        $surveyFile = __DIR__ . '/../data/surveys/limesurvey_survey_88881.lss';
+        $surveyFile = self::getSurveysFolder() . '/limesurvey_survey_88881.lss';
         if (!file_exists($surveyFile)) {
             echo 'Fatal error: found no survey file';
             exit(4);