Merge branch 'devops17_mr_update' into 'devops17'

Devops17 mr update See merge request easycorp/zentaopms!1075
2021-12-23 00:49:55 +00:00
parent 66bf2a0f80 b164538b75
commit 36a1c2e6af
3 changed files with 99 additions and 9 deletions
@@ -0,0 +1,57 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+
+/**
+
+title=测试 gitlabModel::apiGetTags();
+cid=1
+pid=1
+
+通过gitlabID,projectID,获取GitLab标签列表                                  >> 2021/12/20
+通过gitlabID,projectID,获取GitLab标签数量                                  >> 1
+当前项目没有标签时,获取GitLab标签列表                                      >> 0
+当gitlabID存在,projectID不存在时,获取GitLab标签列表                        >> 404 Project Not Found
+当gitlabID,projectID都为0时,获取GitLab标签列表                             >> return empty
+通过gitlabID,projectID,按标签名升序获取GitLab标签列表                      >> with_cicredentials
+通过gitlabID,projectID,搜索字符'zentaopms_15.2_20210720'获取GitLab标签列表 >> zentaopms_15.2_20210720
+通过gitlabID,projectID,每页20条记录，分页获取第二页GitLab标签列表          >> zentaopms_2.0_stable_20110503
+
+*/
+
+$gitlab = $tester->loadModel('gitlab');
+
+$gitlabID  = 1;
+$projectID = 1552;
+$result    = $gitlab->apiGetTags($gitlabID, $projectID);
+r($result)        && p('0:name') && e('2021/12/20'); //通过gitlabID,projectID,获取GitLab标签列表
+r(count($result)) && p()         && e(1);         //通过gitlabID,projectID,获取GitLab标签数量
+
+$gitlabID  = 1;
+$projectID = 1570;
+r(count($gitlab->apiGetTags($gitlabID, $projectID))) && p() && e(0); //当前项目没有标签时,获取GitLab标签列表
+
+$gitlabID  = 1;
+$projectID = 0;
+r($gitlab->apiGetTags($gitlabID, $projectID)) && p('message') && e('404 Project Not Found'); //通过gitlabID,projectID,获取GitLab标签列表
+
+$gitlabID  = 0;
+$projectID = 0;
+$result    = $gitlab->apiGetTags($gitlabID, $projectID);
+if(empty($result)) $result = 'return empty';
+r($result) && p() && e('return empty'); //当gitlabID,projectID都为0时,获取GitLab标签列表
+
+$gitlabID  = 1;
+$projectID = 964;
+$orderBy   = 'name_asc';
+$result    = $gitlab->apiGetTags($gitlabID, $projectID, $orderBy);
+r($result) && p('0:name') && e('with_cicredentials'); //通过gitlabID,projectID,按标签名升序获取GitLab标签列表
+
+$keyword = 'zentaopms_15.2_20210720';
+$result  = $gitlab->apiGetTags($gitlabID, $projectID, $orderBy, $keyword);
+r($result) && p('0:name') && e('zentaopms_15.2_20210720'); //通过gitlabID,projectID,搜索字符'zentaopms_15.2_20210720'获取GitLab标签列表
+
+$tester->app->loadClass('pager', $static = true);
+$pager  = new pager(0, 20, 2);
+$result = $gitlab->apiGetTags($gitlabID, $projectID, $orderBy, '', $pager);
+r($result) && p('0:name') && e('zentaopms_2.0_stable_20110503'); //通过gitlabID,projectID,每页20条记录，分页获取第二页GitLab标签列表
@@ -23,15 +23,16 @@ $_POST['repoID']   = 0;
 $result = $mrModel->create();
 r($result) && p('message[gitlabID]:0') && e('『GitLab』不能为空。'); //使用空的repoID, gitlabID。创建mr。

-$_POST['gitlabID']      = 1;
-$_POST['sourceProject'] = 42;
-$_POST['sourceBranch']  = 'branch-08';
-$_POST['targetProject'] = 42;
-$_POST['targetBranch']  = 'branch-09';
-$_POST['title']         = 'test_create';
-$_POST['description']   = 'test_create';
-$_POST['repoID']        = 1;
-$_POST['assignee']      = '';
+$_POST['gitlabID']           = 1;
+$_POST['sourceProject']      = 42;
+$_POST['sourceBranch']       = 'branch-08';
+$_POST['targetProject']      = 42;
+$_POST['targetBranch']       = 'branch-09';
+$_POST['title']              = 'test_create';
+$_POST['description']        = 'test_create';
+$_POST['repoID']             = 1;
+$_POST['assignee']           = '';
+$_POST['removeSourceBranch'] = '1';
 $result = $mrModel->create();
 if($result['result'] == 'success') $result = 'success';
 $result = preg_match('/通过API创建合并请求失败，失败原因：存在另外一个同样的合并请求在源项目分支中: !([0-9]+)/', $result['message'], $matches); //检查错误原因是否是已存在一样的mr请求
@@ -0,0 +1,32 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+
+/**
+
+title=测试 mrModel::update();
+cid=0
+pid=0
+
+POST数据正确修改MR描述    >> success
+使用title为空的数据mr请求 >> 『名称』不能为空。
+
+*/
+
+$mrModel = $tester->loadModel('mr');
+$MRID    = 1;
+
+$_POST = array();
+$_POST['targetBranch']       = 'master';
+$_POST['title']              = 'Test MR';
+$_POST['description']        = date("Y-m-d H:i:s");
+$_POST['repoID']             = 1;
+$_POST['assignee']           = '';
+$_POST['removeSourceBranch'] = '0';
+$result = $mrModel->update($MRID);
+if($result['result'] == 'success') $result = 'success';
+r($result) && p() && e('success'); //POST数据正确修改MR描述
+
+$_POST['title'] = '';
+$result = $mrModel->update($MRID);
+r($result) && p('message[title]:0') && e('『名称』不能为空。'); //使用title为空的数据mr请求