Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Revert "Merge branch 'TonisOrmisson-test-restructure10'"
This reverts commit 8812885, reversing
changes made to 6588f0e.
  • Loading branch information
olleharstedt committed Jan 17, 2018
1 parent 40822e6 commit 2df5080
Show file tree
Hide file tree
Showing 55 changed files with 498 additions and 658 deletions.
1 change: 0 additions & 1 deletion .gitignore
Expand Up @@ -109,7 +109,6 @@ third_party/composer/installed\.json
!.eslintignore
!.eslint.json
!.eslintrc.json
!.travis.yml

## ignore Vagrantfile
Vagrantfile
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -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/resources/travis/travis-ci-apache /etc/apache2/sites-available/000-default.conf
- sudo cp -f tests/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

Expand Down
18 changes: 12 additions & 6 deletions phpunit.xml
@@ -1,13 +1,19 @@
<phpunit bootstrap="tests/bootstrap.php" stderr="true" >
<testsuites>
<testsuite name="Acceptance">
<directory>tests/acceptance</directory>
<testsuite name="Questions">
<directory>tests/questions</directory>
</testsuite>
<testsuite name="Functional">
<directory>tests/functional</directory>
<testsuite name="Helpers">
<directory>tests/helpers</directory>
</testsuite>
<testsuite name="Unit">
<directory>tests/unit</directory>
<testsuite name="Models">
<directory>tests/models</directory>
</testsuite>
<testsuite name="Controllers">
<directory>tests/controllers</directory>
</testsuite>
<testsuite name="Surveys">
<directory>tests/surveys</directory>
</testsuite>
</testsuites>
</phpunit>
5 changes: 3 additions & 2 deletions tests/DummyController.php
@@ -1,17 +1,18 @@
<?php

namespace LimeSurvey\tests;
namespace ls\tests;

class DummyController extends \CController
{
/**
* @var string
*/
public $sTemplate = 'dummyvalue';

/**
* Do nothing.
*/
public function redirect($url, $terminate = true, $statusCode = 302)
{
}
}
}
52 changes: 8 additions & 44 deletions tests/TestBaseClass.php
@@ -1,6 +1,6 @@
<?php

namespace LimeSurvey\tests;
namespace ls\tests;

use PHPUnit\Framework\TestCase;

Expand Down Expand Up @@ -34,51 +34,15 @@ class TestBaseClass extends TestCase

public static function setUpBeforeClass()
{
self::$testHelper = new TestHelper();
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";
}
self::$testHelper = new TestHelper();

/**
* @return string
*/
public static function getScreenShotsFolder(){
return self::getTempFolder().DIRECTORY_SEPARATOR.'screenshots';
self::$dataFolder = __DIR__.'/data';
self::$viewsFolder = self::$dataFolder."/views";
self::$surveysFolder = self::$dataFolder.'/surveys';
self::$tempFolder = __DIR__.'/tmp';
self::$screenshotsFolder = self::$tempFolder.'/screenshots';
self::$testHelper->importAll();
}

/**
Expand Down
4 changes: 2 additions & 2 deletions tests/TestBaseClassView.php
Expand Up @@ -11,13 +11,13 @@
* See COPYRIGHT.php for copyright notices and details.
*/

namespace LimeSurvey\tests;
namespace ls\tests;

use Facebook\WebDriver\WebDriverBy;
use Facebook\WebDriver\WebDriverExpectedCondition;

/**
* @package LimeSurvey\tests
* @package ls\tests
*/
class TestBaseClassView extends TestBaseClassWeb
{
Expand Down
4 changes: 2 additions & 2 deletions tests/TestBaseClassWeb.php
Expand Up @@ -11,7 +11,7 @@
* See COPYRIGHT.php for copyright notices and details.
*/

namespace LimeSurvey\tests;
namespace ls\tests;

use Facebook\WebDriver\WebDriver;
use Facebook\WebDriver\WebDriverBy;
Expand All @@ -21,7 +21,7 @@
/**
* Class TestBaseClassWeb
* this is the base class for functional tests that need browser simulation
* @package LimeSurvey\tests
* @package ls\tests
*/
class TestBaseClassWeb extends TestBaseClass
{
Expand Down

0 comments on commit 2df5080

Please sign in to comment.