mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-19 20:21:51 +02:00
Code Issues Releases Wiki Activity

Fixed indentation in some files

Browse Source
This commit is contained in:
Deltik 2018-02-19 15:19:56 -06:00
parent eed4b6b10e
commit ec262c8fed
No known key found for this signature in database
GPG Key ID: 1167C5F9C9897637
3 changed files with 88 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tests/_support/Helper/Base.php
View File

@ -6,8 +6,8 @@ namespace Helper;
abstract class Base extends \Codeception\Module
{
protected $deployer;
protected $deployer_components = ['db', 'fs'];
protected $deployer;
protected $deployer_components = ['db', 'fs'];
protected $db;
@ -31,30 +31,30 @@ abstract class Base extends \Codeception\Module
}
}
public function _afterSuite()
{
public function _afterSuite()
{
if (is_object($this->deployer))
$this->deployer->stop();
}
}
protected function _callbackDeployerStarted()
{
foreach ($this->deployer_components as $component)
{
$method = "_reconfigure_${component}";
$this->$method();
}
}
protected function _callbackDeployerStarted()
{
foreach ($this->deployer_components as $component)
{
$method = "_reconfigure_${component}";
$this->$method();
}
}
protected function _reconfigure_fs()
{
protected function _reconfigure_fs()
{
$url = $this->deployer->getUrl();
$browser = $this->getModule('PhpBrowser');
$browser->_reconfigure(array('url' => $url));
}
}
protected function _reconfigure_db()
{
protected function _reconfigure_db()
{
$db = $this->getHelperDb();
$Db_config = $db->_getConfig();
$Db_config['dsn'] = $this->deployer->getDsn();
@ -63,5 +63,5 @@ abstract class Base extends \Codeception\Module
$db->_reconfigure($Db_config);
// Next line is used to make connection available to any code after this point
//$this->getModule('\Helper\DelayedDb')->_delayedInitialize();
}
}
}

20
tests/_support/Helper/DelayedDb.php
View File

@ -21,25 +21,25 @@ class DelayedDb extends \Codeception\Module\Db
public function _getDbHostname()
{
$matches = [];
$matched = preg_match('~host=([^;]+)~s', $this->config['dsn'], $matches);
if (!$matched)
$matched = preg_match('~host=([^;]+)~s', $this->config['dsn'], $matches);
if (!$matched)
{
return false;
}
return false;
}
return $matches[1];
return $matches[1];
}
public function _getDbName()
{
$matches = [];
$matched = preg_match('~dbname=([^;]+)~s', $this->config['dsn'], $matches);
if (!$matched)
$matched = preg_match('~dbname=([^;]+)~s', $this->config['dsn'], $matches);
if (!$matched)
{
return false;
}
return false;
}
return $matches[1];
return $matches[1];
}
public function _getDbUsername()

120
tests/acceptance/InstallCest.php
View File

@ -3,39 +3,37 @@
class InstallCest
{
public function _before(AcceptanceTester $I)
{
}
public function _before(AcceptanceTester $I)
{
}
public function _after(AcceptanceTester $I)
{
}
public function _after(AcceptanceTester $I)
{
}
// tests
public function installWelcomePageContainsExpectedContent(AcceptanceTester $I)
{
$I->amOnPage('/install.php');
// tests
public function installWelcomePageContainsExpectedContent(AcceptanceTester $I)
{
$I->amOnPage('/install.php');
$I->see("e107 Installation :: Step 1");
$I->see("Language Selection");
}
}
public function installStep1ToStep2(AcceptanceTester $I)
{
$I->amOnPage('/install.php');
$I->wantTo("Verify Proceed to Step 2 of the Installation");
{
$I->amOnPage('/install.php');
$I->wantTo("Verify Proceed to Step 2 of the Installation");
$I->selectOption("language", 'English');
$I->click('start');
$I->see("MySQL Server Details", 'h3');
}
}
public function installStep2ToStep3(AcceptanceTester $I)
{
$I->amOnPage('/install.php');
$I->wantTo("Verify Proceed to Step 3 of the Installation");
$db = $I->getHelperDb();
$this->installStep1ToStep2($I);
public function installStep2ToStep3(AcceptanceTester $I)
{
$I->amOnPage('/install.php');
$I->wantTo("Verify Proceed to Step 3 of the Installation");
$db = $I->getHelperDb();
$this->installStep1ToStep2($I);
$I->fillField('server', $db->_getDbHostname());
$I->fillField('name', $db->_getDbUsername());
@ -48,83 +46,83 @@ class InstallCest
$I->see("MySQL Connection Verification", 'h3');
// ....
}
}
public function installStep3ToStep4(AcceptanceTester $I)
{
{
$I->amOnPage('/install.php');
$I->wantTo("Verify Proceed to Step 4 of the Installation");
$I->amOnPage('/install.php');
$I->wantTo("Verify Proceed to Step 4 of the Installation");
$this->installStep2ToStep3($I);
$this->installStep2ToStep3($I);
// $I->see("Connection to the MySQL server established and verified");
// $I->see("Connection to the MySQL server established and verified");
$I->see("Found existing database");
$I->click('submit');
$I->see("PHP and MySQL Versions Check / File Permissions Check");
}
}
public function installStep4ToStep5(AcceptanceTester $I) // TODO Fails due to e107_config.php being present.
{
public function installStep4ToStep5(AcceptanceTester $I) // TODO Fails due to e107_config.php being present.
{
$I->amOnPage('/install.php');
$I->wantTo("Verify Proceed to Step 5 of the Installation");
$I->amOnPage('/install.php');
$I->wantTo("Verify Proceed to Step 5 of the Installation");
$this->installStep3ToStep4($I);
$I->canSee('You might have an existing installation'); //XXX Triggered if e107_config.php is not empty
$I->click('continue_install');
$I->click('continue_install');
$I->see("Administration", 'h3');
}
}
public function installStep5ToStep6(AcceptanceTester $I)
{
{
$I->amOnPage('/install.php');
$I->wantTo("Verify Proceed to Step 6 of the Installation");
$this->installStep4ToStep5($I);
$I->amOnPage('/install.php');
$I->wantTo("Verify Proceed to Step 6 of the Installation");
$this->installStep4ToStep5($I);
$I->fillField('u_name', 'admin');
$I->fillField('u_name', 'admin');
$I->fillField('d_name', 'admin');
$I->fillField('pass1', 'admin');
$I->fillField('pass2', 'admin');
$I->fillField('email', 'admin@admin.com');
$I->click('submit');
$I->click('submit');
$I->see("Website Preferences", 'h3');
}
}
public function installStep6ToStep7(AcceptanceTester $I)
{
public function installStep6ToStep7(AcceptanceTester $I)
{
$I->amOnPage('/install.php');
$I->wantTo("Verify Proceed to Step 7 of the Installation");
$this->installStep5ToStep6($I);
$I->amOnPage('/install.php');
$I->wantTo("Verify Proceed to Step 7 of the Installation");
$this->installStep5ToStep6($I);
$I->fillField('sitename', 'Test Site');
$I->fillField('sitename', 'Test Site');
$I->click('submit');
$I->click('submit');
$I->see("Install Confirmation", 'h3');
}
}
public function installStep7ToStep8(AcceptanceTester $I)
{
public function installStep7ToStep8(AcceptanceTester $I)
{
$I->amOnPage('/install.php');
$I->wantTo("Verify Proceed to Step 8 of the Installation");
$this->installStep6ToStep7($I);
$I->see("Install Confirmation", 'h3');
$I->click('submit');
$I->amOnPage('/install.php');
$I->wantTo("Verify Proceed to Step 8 of the Installation");
$this->installStep6ToStep7($I);
$I->see("Install Confirmation", 'h3');
}
$I->click('submit');
$I->see("Install Confirmation", 'h3');
}
}