galads/icehrm
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove invalid dates from sample data and fix tests

Browse Source
This commit is contained in:
gamonoid
2017-09-04 07:52:14 +02:00
parent 4821ab2d65
commit 9c5e38a8df
5 changed files with 51 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/bootstrap.php
View File

@@ -22,7 +22,6 @@ $scripts = array(
APP_BASE_PATH."scripts/icehrmdb.sql",
APP_BASE_PATH."scripts/icehrm_master_data.sql",
APP_BASE_PATH."scripts/icehrm_sample_data.sql",
//APP_BASE_PATH."scripts/unit_tests.sql"
);
foreach ($scripts as $insql){
@@ -31,4 +30,4 @@ foreach ($scripts as $insql){
exec($command);
}
echo "Bootstrapping done!!"."\r\n";
echo "Bootstrapping done!!"."\r\n";

6
test/classes/ApprovalStatusTest.php
View File

@@ -37,7 +37,7 @@ class ApprovalStatusTest extends TestTemplate{
$this->travelRec->status = 'Pending';
$this->travelRec->Save();
}
protected function tearDown(){
parent::tearDown();
}
@@ -45,7 +45,7 @@ class ApprovalStatusTest extends TestTemplate{
public function testInitializeApprovalChain(){
$id = $this->travelRec->id;
$this->initializeObjects();
//$this->initializeObjects();
$as = \Classes\Approval\ApprovalStatus::getInstance();
$as->initializeApprovalChain('EmployeeTravelRecord',$id);
$status = $as->getAllStatuses('EmployeeTravelRecord',$id);
@@ -55,7 +55,7 @@ class ApprovalStatusTest extends TestTemplate{
public function testUpdateApprovalStatus(){
$id = $this->travelRec->id;
$this->initializeObjects();
//$this->initializeObjects();
$as = \Classes\Approval\ApprovalStatus::getInstance();
$as->initializeApprovalChain('EmployeeTravelRecord',$id);

6
test/test.config.php
View File

@@ -13,14 +13,14 @@ define('CLIENT_NAME', 'app');
if(!defined('MYSQL_ROOT_USER') || !defined('MYSQL_ROOT_PASS')){
//Tests running on vagrant
define('APP_BASE_PATH', TEST_BASE_PATH.'../app/');
define('APP_BASE_PATH', TEST_BASE_PATH.'../');
define('CLIENT_BASE_PATH', TEST_BASE_PATH.'../../deployment/clients/test/');
define('BASE_URL','http://app.app.dev/');
define('CLIENT_BASE_URL','http://clients.app.dev/dev/');
}else{
//Tests running on deploy
define('APP_BASE_PATH', realpath(dirname(__FILE__).'/../app')."/");
define('CLIENT_BASE_PATH', APP_BASE_PATH.'app/');
define('CLIENT_BASE_PATH', APP_BASE_PATH.'');
define('BASE_URL','http://apps.gamonoid.com/icehrmcore/');
define('CLIENT_BASE_URL','http://apps.gamonoid.com/icehrm/');
@@ -41,7 +41,7 @@ if(!defined('MYSQL_ROOT_USER') || !defined('MYSQL_ROOT_PASS')){
define('MYSQL_ROOT_PASS', 'dev');
}
define('APP_HOST', 'localhost');
define('APP_HOST', '127.0.0.1');
define('APP_CON_STR', 'mysqli://'.APP_USERNAME.':'.APP_PASSWORD.'@'.APP_HOST.'/'.APP_DB);
//file upload