diff --git a/module/mr/test/model/apiclosemr.php b/module/mr/test/model/apiclosemr.php index fd3f6bd1d5..e1b9d97b49 100755 --- a/module/mr/test/model/apiclosemr.php +++ b/module/mr/test/model/apiclosemr.php @@ -7,13 +7,13 @@ title=测试 mrModel::apiCloseMR(); timeout=0 cid=0 -- 正确的数据创建并删除Gitlab合并请求 +- 重新打开并关闭Gitlab合并请求 - 属性title @test - 属性state @closed -- 正确的数据创建并删除Gitea合并请求 +- 重新打开并关闭Gitea合并请求 - 属性title @test - 属性state @closed -- 正确的数据创建并删除Gogs合并请求 +- 重新打开并关闭Gogs合并请求 - 属性title @test - 属性state @closed @@ -26,24 +26,27 @@ zdTable('pipeline')->gen(5); $mrModel = new mrTest(); -$gitlabID = 1; -$giteaID = 4; -$gogsID = 5; +$hostID = array +( + 'gitlab' => 1, + 'gitea' => 4, + 'gogs' => 5, +); -$gitlabProjectID = 3; -$giteaProjectID = 'gitea/unittest'; -$gogsProjectID = 'easycorp/unittest'; +$projectID = array +( + 'gitlab' => 3, + 'gitea' => 'gitea/unittest', + 'gogs' => 'easycorp/unittest', +); -$params = new stdClass(); -$params->title = 'test'; -$params->sourceBranch = 'test'; -$params->targetBranch = 'master'; -$params->targetProject = $gitlabProjectID; -$params->description = 'This is a test merge request'; -$params->assignee = 'user1'; -$params->removeSourceBranch = 0; -$params->squash = 0; +$mrID = array +( + 'gitlab' => 114, + 'gitea' => 18, + 'gogs' => 18, +); -r($mrModel->apiCloseMrTester($gitlabID, $gitlabProjectID, $params)) && p('title,state') && e('test,closed'); // 正确的数据创建并删除Gitlab合并请求 -r($mrModel->apiCloseMrTester($giteaID, $giteaProjectID, $params)) && p('title,state') && e('test,closed'); // 正确的数据创建并删除Gitea合并请求 -r($mrModel->apiCloseMrTester($gogsID, $gogsProjectID, $params)) && p('title,state') && e('test,closed'); // 正确的数据创建并删除Gogs合并请求 \ No newline at end of file +r($mrModel->apiCloseMrTester($hostID['gitlab'], $projectID['gitlab'], $mrID['gitlab'])) && p('title,state') && e('test,closed'); // 重新打开并关闭Gitlab合并请求 +r($mrModel->apiCloseMrTester($hostID['gitea'], $projectID['gitea'], $mrID['gitea'])) && p('title,state') && e('test,closed'); // 重新打开并关闭Gitea合并请求 +r($mrModel->apiCloseMrTester($hostID['gogs'], $projectID['gogs'], $mrID['gogs'])) && p('title,state') && e('test,closed'); // 重新打开并关闭Gogs合并请求 \ No newline at end of file diff --git a/module/mr/test/model/apigetsinglemr.php b/module/mr/test/model/apigetsinglemr.php index 6896f3bba6..9adb4f53b5 100755 --- a/module/mr/test/model/apigetsinglemr.php +++ b/module/mr/test/model/apigetsinglemr.php @@ -14,7 +14,7 @@ cid=0 - 查询Gitea的合并请求 - 属性title @更新 LICENSE(不要删除) - 属性state @opened -- 查询不存在的Gitea合并请求属性message @找不到目标。 +- 查询不存在的Gitea合并请求 @0 - 查询Gogs的合并请求 - 属性title @test(不要删除) - 属性state @opened @@ -52,7 +52,7 @@ r($mrModel->apiGetSingleMR($hostID['gitlab'], $projectID['gitlab'], $MRID['gitla r($mrModel->apiGetSingleMR($hostID['gitlab'], $projectID['gitlab'], -1)) && p('message') && e('404 Not found'); // 查询不存在的Gitlab合并请求 r($mrModel->apiGetSingleMR($hostID['gitea'], $projectID['gitea'], $MRID['gitea'])) && p('title,state') && e('更新 LICENSE(不要删除),opened'); // 查询Gitea的合并请求 -r($mrModel->apiGetSingleMR($hostID['gitea'], $projectID['gitea'], -1)) && p('message') && e('找不到目标。'); // 查询不存在的Gitea合并请求 +r($mrModel->apiGetSingleMR($hostID['gitea'], $projectID['gitea'], -1)) && p() && e('0'); // 查询不存在的Gitea合并请求 r($mrModel->apiGetSingleMR($hostID['gogs'], $projectID['gogs'], $MRID['gogs'])) && p('title,state') && e('test(不要删除),opened'); // 查询Gogs的合并请求 r($mrModel->apiGetSingleMR($hostID['gogs'], $projectID['gogs'], -1)) && p() && e('0'); // 查询不存在的Gogs合并请求 \ No newline at end of file diff --git a/module/mr/test/model/apiupdatemr.php b/module/mr/test/model/apiupdatemr.php index c2b7fc46e0..c1797cc989 100755 --- a/module/mr/test/model/apiupdatemr.php +++ b/module/mr/test/model/apiupdatemr.php @@ -78,4 +78,4 @@ $oldMR['gitea']->sourceProject = '1'; r($mrModel->apiUpdateMrTester($oldMR['gitea'], $newMR)) && p() && e('0'); // 错误的数据更新Gitea合并请求 $oldMR['gogs']->sourceProject = '1'; -r($mrModel->apiUpdateMrTester($oldMR['gogs'], $newMR)) && p() && e('0'); // 错误的数据更新Gogs合并请求 +r($mrModel->apiUpdateMrTester($oldMR['gogs'], $newMR)) && p() && e('0'); // 错误的数据更新Gogs合并请求 \ No newline at end of file diff --git a/module/mr/test/mr.class.php b/module/mr/test/mr.class.php index 081d0c7712..085327f875 100644 --- a/module/mr/test/mr.class.php +++ b/module/mr/test/mr.class.php @@ -250,15 +250,30 @@ class mrTest * * @param int $hostID * @param string $project - * @param object $params + * @param int $mrID * @access public * @return array|object */ - public function apiCloseMrTester(int $hostID, string $project, object $params): array|object + public function apiCloseMrTester(int $hostID, string $project, int $mrID): array|object { - $result = $this->objectModel->apiCreateMR($hostID, $project, $params); - $mrID = empty($result->iid) ? $result->id : $result->iid; + $this->objectModel->apiReopenMR($hostID, $project, $mrID); $this->objectModel->apiCloseMR($hostID, $project, $mrID); return $this->objectModel->apiGetSingleMR($hostID, $project, $mrID); } + + /** + * Test apiReopenMR method. + * + * @param int $hostID + * @param string $project + * @param int $mriid + * @access public + * @return array|object + */ + public function apiReopenMrTester(int $hostID, string $project, int $mriid): array|object + { + $this->objectModel->apiCloseMR($hostID, $project, $mriid); + $this->objectModel->apiReopenMR($hostID, $project, $mriid); + return $this->objectModel->apiGetSingleMR($hostID, $project, $mriid); + } }