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

Merge branch '12.x'

Browse Source
This commit is contained in:
z
2020-10-30 16:58:47 +08:00
parent 1767bfe6ea 1bccfd5744
commit 5644b81408
153 changed files with 2002 additions and 838 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/model.php
+12 -4
View File
@@ -75,8 +75,8 @@ class testtaskModel extends model
}
$pageNav .= $selectHtml;
$this->lang->modulePageNav = $pageNav;
$this->lang->TRActions = $pageActions;
$this->lang->modulePageNav = $pageNav;
$this->lang->TRActions = $pageActions;
foreach($this->lang->testtask->menu as $key => $value)
{
$this->loadModel('qa')->setSubMenu('testtask', $key, $productID);
@@ -137,8 +137,8 @@ class testtaskModel extends model
}
$pageNav .= $selectHtml;
$this->lang->modulePageNav = $pageNav;
$this->lang->TRActions = $pageActions;
$this->lang->modulePageNav = $pageNav;
$this->lang->TRActions = $pageActions;
if($this->config->global->flow != 'full') $this->lang->testtask->menu = new stdclass();
foreach($this->lang->testtask->menu as $key => $value)
{
@@ -427,6 +427,7 @@ class testtaskModel extends model
return $this->dao->select('*')->from(TABLE_CASE)->where($query)
->andWhere('id')->notIN($linkedCases)
->andWhere('status')->ne('wait')
->andWhere('type')->ne('unit')
->beginIF($task->branch)->andWhere('branch')->in("0,$task->branch")->fi()
->andWhere('deleted')->eq(0)
->orderBy('id desc')
@@ -1813,6 +1814,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());
@@ -1938,6 +1940,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;