diff --git a/module/testtask/model.php b/module/testtask/model.php index 21c1e22422..3ec11db508 100755 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -1196,9 +1196,9 @@ class testtaskModel extends model * @param int $version * @param int $nodeID * @access public - * @return void + * @return int|false */ - public function initResult($runID = 0, $caseID = 0, $version = 0, $nodeID = 0) + public function createResultForAutomatedTest(int $runID = 0, int $caseID = 0, int $version = 0, int $nodeID = 0): int|false { $result = new stdClass(); $result->run = $runID; @@ -1209,8 +1209,9 @@ class testtaskModel extends model $result->lastRunner = $this->app->user->account; $this->dao->insert(TABLE_TESTRESULT)->data($result)->autoCheck()->exec(); - if(!dao::isError()) return $resultID = $this->dao->lastInsertID(); - return false; + if(dao::isError()) return false; + + return $this->dao->lastInsertID(); } /** diff --git a/module/testtask/zen.php b/module/testtask/zen.php index 05f712ec29..7ab5f7dbc6 100644 --- a/module/testtask/zen.php +++ b/module/testtask/zen.php @@ -590,7 +590,7 @@ class testtaskZen extends testtask /* Perform automated testing related operations after user confirmation. */ if($confirm == 'yes') { - $resultID = $this->testtask->initResult($runID, $caseID, $run->case->version, $automation->node); + $resultID = $this->testtask->createResultForAutomatedTest($runID, $caseID, $run->case->version, $automation->node); if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError(), 'load' => $this->createLink('zanode', 'browse'))); $this->zanode->runZTFScript($automation->id, $caseID, $resultID);