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

* adjust for show result.

Browse Source
This commit is contained in:
wangyidong
2020-04-10 17:04:02 +08:00
parent 6c1c54d103
commit 04f23e6334
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/model.php
+3 -3
View File
@@ -1970,7 +1970,7 @@ class testtaskModel extends model
$result->caseResult = 'pass';
$result->lastRunner = $this->app->user->account;
$result->date = $now;
$result->duration = (float)$attributes['time'];
$result->duration = isset($attributes['time']) ? (float)$attributes['time'] : 0;
$result->xml = $matchNode->asXML();
$result->stepResults[0]['result'] = 'pass';
$result->stepResults[0]['real'] = '';
@@ -2064,14 +2064,14 @@ class testtaskModel extends model
$result->job = $jobID;
$result->compile = $compileID;
$result->date = $now;
$result->duration = $caseResult->duration;
$result->duration = zget($caseResult, 'duration', 0);
$result->stepResults[0]['result'] = 'pass';
$result->stepResults[0]['real'] = '';
if(!empty($caseResult->failure))
{
$result->caseResult = 'fail';
$result->stepResults[0]['result'] = 'fail';
$result->stepResults[0]['real'] = $caseResult->failure->desc;
$result->stepResults[0]['real'] = zget($caseResult->failure, 'desc', '');
}
$result->stepResults = serialize($result->stepResults);
$case->lastRunner = $this->app->user->account;
module/testtask/view/results.html.php
+1 -1
View File
@@ -106,7 +106,7 @@
<td><?php if(isset($result->version)) echo nl2br($result->version);?></td>
<?php if(!empty($stepResult['result'])):?>
<td class='<?php echo $stepResult['result'];?> text-center'><?php echo $lang->testcase->resultList[$stepResult['result']];?></td>
<td><?php echo $stepResult['real'];?></td>
<td><?php echo nl2br(htmlspecialchars($stepResult['real']));?></td>
<td class='text-center'><?php if(!empty($stepResult['files'])) echo html::a("#stepResult{$modalID}", $lang->files . $fileCount, '', "data-toggle='modal' data-type='iframe'")?></td>
<?php else:?>
<td></td>