Merge branch 'test-restructure10' of https://github.com/TonisOrmisson…

…/LimeSurvey into TonisOrmisson-test-restructure10

.gitignore

@@ -109,6 +109,7 @@ third_party/composer/installed\.json
 !.eslintignore
 !.eslint.json
 !.eslintrc.json
+!.travis.yml
 
 ## ignore Vagrantfile
 Vagrantfile

.travis.yml

@@ -43,7 +43,7 @@ before_script:
     - sudo sed -i -e "s,www-data,travis,g" /etc/apache2/envvars
     - sudo chown -R travis:travis /var/lib/apache2/fastcgi
     - ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
-    - sudo cp -f tests/travis/travis-ci-apache /etc/apache2/sites-available/000-default.conf
+    - sudo cp -f tests/resources/travis/travis-ci-apache /etc/apache2/sites-available/000-default.conf
     - sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf
     - sudo service apache2 restart
 

phpunit.xml

@@ -1,19 +1,13 @@
 <phpunit bootstrap="tests/bootstrap.php" stderr="true" >
     <testsuites>
-        <testsuite name="Questions">
-            <directory>tests/questions</directory>
+        <testsuite name="Acceptance">
+            <directory>tests/acceptance</directory>
         </testsuite>
-        <testsuite name="Helpers">
-            <directory>tests/helpers</directory>
+        <testsuite name="Functional">
+            <directory>tests/functional</directory>
         </testsuite>
-        <testsuite name="Models">
-            <directory>tests/models</directory>
-        </testsuite>
-        <testsuite name="Controllers">
-            <directory>tests/controllers</directory>
-        </testsuite>
-        <testsuite name="Surveys">
-            <directory>tests/surveys</directory>
+        <testsuite name="Unit">
+            <directory>tests/unit</directory>
         </testsuite>
     </testsuites>
 </phpunit>

tests/DummyController.php

@@ -1,18 +1,17 @@
 <?php
 
-namespace ls\tests;
+namespace LimeSurvey\tests;
 
 class DummyController extends \CController
 {
     /**
      * @var string
      */
     public $sTemplate = 'dummyvalue';
-
     /**
      * Do nothing.
      */
     public function redirect($url, $terminate = true, $statusCode = 302)
     {
     }
-}
+}

tests/TestBaseClass.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ls\tests;
+namespace LimeSurvey\tests;
 
 use PHPUnit\Framework\TestCase;
 
@@ -34,15 +34,51 @@ class TestBaseClass extends TestCase
 
     public static function setUpBeforeClass()
     {
-        parent::setUpBeforeClass();
         self::$testHelper = new TestHelper();
-
-        self::$dataFolder = __DIR__.'/data';
-        self::$viewsFolder = self::$dataFolder."/views";
-        self::$surveysFolder = self::$dataFolder.'/surveys';
-        self::$tempFolder = __DIR__.'/tmp';
-        self::$screenshotsFolder = self::$tempFolder.'/screenshots';
+        self::$dataFolder = self::getDataFolder();
+        self::$viewsFolder = self::getViewsFolder();
+        self::$surveysFolder = self::getSurveysFolder();
+        self::$tempFolder = self::getTempFolder();
+        self::$screenshotsFolder = self::getScreenShotsFolder();
         self::$testHelper->importAll();
+        parent::setUpBeforeClass();
+    }
+
+    // the folder getter can be used in @dataProvider methods since the setUpBeforeClass will run after them
+
+    /**
+     * @return string
+     */
+    public static function getDataFolder(){
+        return __DIR__."/resources";
+    }
+
+    /**
+     * @return string
+     */
+    public static function getViewsFolder(){
+        return self::getDataFolder().DIRECTORY_SEPARATOR.'views';
+    }
+
+    /**
+     * @return string
+     */
+    public static function getSurveysFolder(){
+        return self::getDataFolder().DIRECTORY_SEPARATOR.'surveys';
+    }
+
+    /**
+     * @return string
+     */
+    public static function getTempFolder(){
+        return __DIR__."/tmp";
+    }
+
+    /**
+     * @return string
+     */
+    public static function getScreenShotsFolder(){
+        return self::getTempFolder().DIRECTORY_SEPARATOR.'screenshots';
     }
 
     /**

tests/TestBaseClassView.php

@@ -11,13 +11,13 @@
  * See COPYRIGHT.php for copyright notices and details.
  */
 
-namespace ls\tests;
+namespace LimeSurvey\tests;
 
 use Facebook\WebDriver\WebDriverBy;
 use Facebook\WebDriver\WebDriverExpectedCondition;
 
 /**
- * @package ls\tests
+ * @package LimeSurvey\tests
  */
 class TestBaseClassView extends TestBaseClassWeb
 {

tests/TestBaseClassWeb.php

@@ -11,7 +11,7 @@
  * See COPYRIGHT.php for copyright notices and details.
  */
 
-namespace ls\tests;
+namespace LimeSurvey\tests;
 
 use Facebook\WebDriver\WebDriver;
 use Facebook\WebDriver\WebDriverBy;
@@ -21,7 +21,7 @@
 /**
  * Class TestBaseClassWeb
  * this is the base class for functional tests that need browser simulation
- * @package ls\tests
+ * @package LimeSurvey\tests
  */
 class TestBaseClassWeb extends TestBaseClass
 {