Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* finish task #7960.

Browse Source
This commit is contained in:
z
2020-09-23 16:18:31 +08:00
parent 2cc520cff7
commit 70e78fc672
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/config.php
+2 -2
View File
@@ -22,5 +22,5 @@ $config->testtask->datatable = new stdclass();
$config->testtask->datatable->defaultField = array('id', 'pri', 'title', 'type', 'assignedTo', 'lastRunner', 'lastRunDate', 'lastRunResult', 'status', 'bugs', 'results', 'stepNumber','actions');
$config->testtask->unitResultRules = new stdclass();
$config->testtask->unitResultRules->common = array('path' => array('testsuite/testcase', 'testcase'), 'name' => array('classname', 'name'), 'failure' => 'failure', 'suite' => 'name', 'aliasSuite' => array('classname'));
$config->testtask->unitResultRules->phpunit = array('path' => array('test', 'testsuite/testcase', 'testcase'), 'name' => array('className', 'methodName'), 'aliasName' => array('classname', 'name'), 'failure' => 'failure', 'suite' => 'name', 'aliasSuite' => array('classname', 'className'));
$config->testtask->unitResultRules->common = array('path' => array('testsuite/testcase', 'testcase'), 'name' => array('classname', 'name'), 'failure' => 'failure', 'skipped' => 'skipped', 'suite' => 'name', 'aliasSuite' => array('classname'));
$config->testtask->unitResultRules->phpunit = array('path' => array('test', 'testsuite/testcase', 'testcase'), 'name' => array('className', 'methodName'), 'aliasName' => array('classname', 'name'), 'failure' => 'failure', 'skipped' => 'skipped', 'suite' => 'name', 'aliasSuite' => array('classname', 'className'));
module/testtask/model.php
+7
View File
@@ -1902,6 +1902,7 @@ class testtaskModel extends model
$matchPaths = $rules['path'];
$nameFields = $rules['name'];
$failure = $rules['failure'];
$skipped = $rules['skipped'];
$suiteField = $rules['suite'];
$aliasSuite = zget($rules, 'aliasSuite', array());
$aliasName = zget($rules, 'aliasName', array());
@@ -2027,6 +2028,12 @@ class testtaskModel extends model
$result->stepResults[0]['real'] = (string)$failureAttrs['message'];
}
}
elseif(isset($matchNode->$skipped))
{
$result->caseResult = 'n/a';
$result->stepResults[0]['result'] = 'n/a';
$result->stepResults[0]['real'] = '';
}
$result->stepResults = serialize($result->stepResults);
$case->lastRunner = $this->app->user->account;
$case->lastRunDate = $now;