Dev: Trying to get test to work on Travis...

LimeSurvey · Feb 8, 2018 · 4ee2a82 · 4ee2a82
1 parent 12ee0b8
commit 4ee2a82
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/tests/questions/MultipleChoiceMandatoryWithCommentTest.php b/tests/questions/MultipleChoiceMandatoryWithCommentTest.php
@@ -13,13 +13,22 @@ class MultipleChoiceMandatoryWithComment extends TestBaseClassWeb
 {
 
     /**
-     * Import and activate survey at every test.
+     *
      */
-    public function setup()
+    public static function setUpBeforeClass()
     {
+        parent::setUpBeforeClass();
+
         // Import survey.
-        $surveyFile = self::$surveysFolder . '/limesurvey_survey_479717.lss';
+        $surveyFile =  'tests/data/surveys/limesurvey_survey_479717.lss';
         self::importSurvey($surveyFile);
+    }
+
+    /**
+     * Import and activate survey at every test.
+     */
+    public function setup()
+    {
         self::$testHelper->activateSurvey(self::$surveyId);
     }
 
@@ -28,14 +37,7 @@ public function setup()
      */
     public function tearDown()
     {
-        if (self::$testSurvey) {
-            $sid = self::$testSurvey->sid;
-            // TODO: Delete survey does not clear answer table?
-            self::$testHelper->deactivateSurvey($sid);
-            $result = self::$testSurvey->delete();
-            $this->assertTrue($result, 'Could delete survey ' . $sid);
-            self::$testSurvey = null;
-        }
+        self::$testHelper->deactivateSurvey(self::$surveyId);
     }
     /**
      * Test submit question without comment.