Merge branch release/21.7.5 of zentao/zentaopms (#10786)

module/gitlab/test/model/apideleteproject.php

@@ -3,15 +3,15 @@
 include dirname(__FILE__, 5) . '/test/lib/init.php';
 
 /**
-
 title=测试 gitlabModel::apiDeleteProject();
 timeout=0
 cid=1
 
 - 使用空的projectID删除项目 @0
 - 使用错误gitlabID删除项目 @0
+- 使用空的GitlabID和空的projectID删除项目 @0
+- 使用错误projectID删除项目 @0
 - 通过gitlabID,项目id正确删除项目属性message @202 Accepted
-
 */
 
 zenData('pipeline')->gen(5);
@@ -32,13 +32,11 @@ $gitlab->apiCreateProject($gitlabID, $project);
 
 /* Get projectID. */
 $gitlabProjects = $gitlab->apiGetProjects($gitlabID);
+$unitTestList   = array();
 foreach($gitlabProjects as $gitlabProject)
 {
-    if($gitlabProject->name == $projectName)
-    {
-        $projectID = $gitlabProject->id;
-        break;
-    }
+    if($gitlabProject->name == $projectName) $projectID = $gitlabProject->id;
+    if(strpos($gitlabProject->name, 'unitTest') === 0 || strpos($gitlabProject->name, 'unitest') === 0) $unitTestList[] = $gitlabProject;
 }
 
 $project = new stdclass();
@@ -46,5 +44,15 @@ $project->description = 'apiUpdatedProject';
 
 r($gitlab->apiDeleteProject($gitlabID, 0))  && p() && e('0'); //使用空的projectID删除项目
 r($gitlab->apiDeleteProject(0, $projectID)) && p() && e('0'); //使用错误gitlabID删除项目
+r($gitlab->apiDeleteProject(0, 0))          && p() && e('0'); //使用空的GitlabID和空的projectID删除项目
+r($gitlab->apiDeleteProject(0, 99999))      && p() && e('0'); //使用错误projectID删除项目
 
 r($gitlab->apiDeleteProject($gitlabID, $projectID)) && p('message') && e('202 Accepted');         //通过gitlabID,项目id正确删除项目
+//删除测试数据
+if(!empty($unitTestList))
+{
+    foreach($unitTestList as $unitTestProject)
+    {
+        $gitlab->apiDeleteProject($gitlabID, $unitTestProject->id);
+    }
+}