diff --git a/module/bug/model.php b/module/bug/model.php index 6132a63518..0d465ff800 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -124,6 +124,7 @@ class bugModel extends model } /** + * gitlab问题转为bug。 * Create bug from gitlab issue. * * @param object $bug @@ -131,11 +132,11 @@ class bugModel extends model * @access public * @return int|bool */ - public function createBugFromGitlabIssue($bug, $executionID) + public function createBugFromGitlabIssue(object $bug, int $executionID): int|bool { $bug->openedBy = $this->app->user->account; $bug->openedDate = helper::now(); - $bug->assignedDate = isset($bug->assignedTo) ? helper::now() : 0; + $bug->assignedDate = isset($bug->assignedTo) ? helper::now() : null; $bug->openedBuild = 'trunk'; $bug->story = 0; $bug->task = 0; diff --git a/module/bug/test/bug.class.php b/module/bug/test/bug.class.php index 2eaa6d6d7c..01db24a804 100644 --- a/module/bug/test/bug.class.php +++ b/module/bug/test/bug.class.php @@ -127,14 +127,15 @@ class bugTest } /** + * 测试gitlab问题转bug。 * Test create bug from gitlab issue. * - * @param array $bug - * @param int $executionID + * @param object $bug + * @param int $executionID * @access public - * @return object|int + * @return object|int|array */ - public function createBugFromGitlabIssueTest($bug, $executionID) + public function createBugFromGitlabIssueTest(object $bug, int $executionID): object|int|array { $objectID = $this->objectModel->createBugFromGitlabIssue($bug, $executionID); diff --git a/module/bug/test/model/createbugfromgitlabissue.php b/module/bug/test/model/createbugfromgitlabissue.php index 1249e33143..a46671eb41 100755 --- a/module/bug/test/model/createbugfromgitlabissue.php +++ b/module/bug/test/model/createbugfromgitlabissue.php @@ -2,6 +2,10 @@ config('execution')->gen(2); +zdTable('user')->gen(2); + su('admin'); /** @@ -10,16 +14,9 @@ title=bugModel->createBugFromGitlabIssue (); cid=1 pid=1 -测试正常的创建来源于gitlab issue的bug的title >> 问题1 -测试正常的创建来源于gitlab issue的bug的execution >> 101 -测试正常的创建来源于gitlab issue的bug的pri >> 3 -测试正常的创建来源于gitlab issue的bug的severity >> 3 -测试创建没有标题 来源于gitlab issue的异常bug >> 『Bug标题』不能为空。 -测试短时间内重复创建来源于gitlab issue的bug >> 0 - */ -$executionID = 101; +$executionID = 11; $bug1 = new stdclass(); $bug1->title = '问题1'; @@ -43,7 +40,7 @@ $bug5->execution = $executionID; $bug=new bugTest(); r($bug->createBugFromGitlabIssueTest($bug1, $executionID)) && p('title') && e('问题1'); // 测试正常的创建来源于gitlab issue的bug的title -r($bug->createBugFromGitlabIssueTest($bug2, $executionID)) && p('execution') && e('101'); // 测试正常的创建来源于gitlab issue的bug的execution +r($bug->createBugFromGitlabIssueTest($bug2, $executionID)) && p('execution') && e('11'); // 测试正常的创建来源于gitlab issue的bug的execution r($bug->createBugFromGitlabIssueTest($bug3, $executionID)) && p('pri') && e('3'); // 测试正常的创建来源于gitlab issue的bug的pri r($bug->createBugFromGitlabIssueTest($bug4, $executionID)) && p('severity') && e('3'); // 测试正常的创建来源于gitlab issue的bug的severity r($bug->createBugFromGitlabIssueTest($bug5, $executionID)) && p('title:0') && e('『Bug标题』不能为空。'); // 测试创建没有标题 来源于gitlab issue的异常bug