implement model paths

LimeSurvey · Nov 6, 2017 · 55205e3 · 55205e3
1 parent 5e5497a
commit 55205e3
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 10 deletions.
diff --git a/tests/TestBaseClass.php b/tests/TestBaseClass.php
@@ -17,6 +17,11 @@ class TestBaseClass extends TestCase
     /** @var  string $screenshotsFolder */
     protected $screenshotsFolder;
 
+    /** @var  string $surveysFolder */
+    protected $surveysFolder;
+
+    /** @var  string $dataFolder */
+    protected $dataFolder;
 
     /**
      * @var int
@@ -28,6 +33,8 @@ public function setUp()
         parent::setUp();
         self::$testHelper = new TestHelper();
 
+        $this->dataFolder = __DIR__.'/data';
+        $this->surveysFolder = $this->dataFolder.'/surveys';
         $this->tempFolder = __DIR__.'/tmp';
         $this->screenshotsFolder = $this->tempFolder.'/screenshots';
 

diff --git a/tests/questions/DateTimeDefaultAnswerExpressionTest.php b/tests/questions/DateTimeDefaultAnswerExpressionTest.php
@@ -13,15 +13,15 @@ class DateTimeDefaultAnswerExpressionTest extends TestBaseClass
     public function setUp()
     {
         parent::setUp();
-        $surveyFile = __DIR__ . '/../data/surveys/limesurvey_survey_454287.lss';
+        $surveyFile = $this->surveysFolder . '/limesurvey_survey_454287.lss';
         self::importSurvey($surveyFile);
     }
 
 
     /**
      * Destroy what had been imported.
      */
-    public static function teardownAfterClass()
+    public function tearDown()
     {
         $result = \Survey::model()->deleteSurvey(self::$surveyId, true);
         if (!$result) {

diff --git a/tests/questions/DateTimeForwardBackTest.php b/tests/questions/DateTimeForwardBackTest.php
@@ -18,14 +18,16 @@ class DateTimeForwardBackTest extends TestBaseClass
     /**
      * Import survey in tests/surveys/.
      */
-    public static function setupBeforeClass()
+    public function setUp()
     {
+        parent::setUp();
+
         $_POST = [];
         $_SESSION = [];
 
         \Yii::app()->session['loginID'] = 1;
 
-        $surveyFile = __DIR__ . '/../data/surveys/limesurvey_survey_917744.lss';
+        $surveyFile = $this->surveysFolder.'/limesurvey_survey_917744.lss';
         if (!file_exists($surveyFile)) {
             die('Fatal error: found no survey file');
         }
@@ -48,7 +50,7 @@ public static function setupBeforeClass()
     /**
      * Destroy what had been imported.
      */
-    public static function teardownAfterClass()
+    public function tearDown()
     {
         $result = \Survey::model()->deleteSurvey(self::$surveyId, true);
         if (!$result) {

diff --git a/tests/questions/DateTimeTest.php b/tests/questions/DateTimeTest.php
@@ -18,14 +18,16 @@ class DateTimeTest extends TestBaseClass
     /**
      * Import survey in tests/surveys/.
      */
-    public static function setupBeforeClass()
+    public function setUp()
     {
+        parent::setUp();
+
         $_POST = [];
         $_SESSION = [];
 
         \Yii::app()->session['loginID'] = 1;
+        $surveyFile = $this->surveysFolder.'/limesurvey_survey_975622.lss';
 
-        $surveyFile = __DIR__ . '/../data/surveys/limesurvey_survey_975622.lss';
         if (!file_exists($surveyFile)) {
             die('Fatal error: found no survey file');
         }
@@ -48,8 +50,9 @@ public static function setupBeforeClass()
     /**
      * Destroy what had been imported.
      */
-    public static function teardownAfterClass()
+    public function tearDown()
     {
+        parent::tearDown();
         $result = \Survey::model()->deleteSurvey(self::$surveyId, true);
         if (!$result) {
             die('Fatal error: Could not clean up survey ' . self::$surveyId);

diff --git a/tests/questions/DateTimeValidationTest.php b/tests/questions/DateTimeValidationTest.php
@@ -20,11 +20,12 @@ class DateTimeValidationTest extends TestBaseClassWeb
     /**
      * Import survey in tests/surveys/.
      */
-    public static function setupBeforeClass()
+    public function setUp()
     {
+        parent::setUp();
         \Yii::app()->session['loginID'] = 1;
 
-        $surveyFile = __DIR__ . '/../data/surveys/limesurvey_survey_834477.lss';
+        $surveyFile = $this->surveysFolder.'/limesurvey_survey_834477.lss';
         if (!file_exists($surveyFile)) {
             die('Fatal error: found no survey file');
         }