From d05b674893c42e01f82330a10b9a1b943bbfa421 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 18 Jul 2024 15:49:05 +0800
Subject: [PATCH] * [unit,0.3h] Adjust mr unit test case.

---
 module/mr/test/model/apiacceptmr.php    | 2 +-
 module/mr/test/model/apigetsinglemr.php | 4 ++--
 module/mr/test/model/apisyncmr.php      | 4 ++--
 module/mr/test/model/batchsyncmr.php    | 2 +-
 module/mr/test/model/update.php         | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/module/mr/test/model/apiacceptmr.php b/module/mr/test/model/apiacceptmr.php
index 96dd8fb664..e01a41e1ff 100755
--- a/module/mr/test/model/apiacceptmr.php
+++ b/module/mr/test/model/apiacceptmr.php
@@ -36,4 +36,4 @@ sleep(1);
 r($mrModel->apiAcceptMrTester($gitea)) && p() && e('0'); // 已关闭的gitea合并请求
 
 $gogs = 5;
-r($mrModel->apiAcceptMrTester($gogs)) && p() && e('0'); // 已关闭的gogs合并请求
+r($mrModel->apiAcceptMrTester($gogs)) && p() && e('0'); // 已关闭的gogs合并请求
\ No newline at end of file
diff --git a/module/mr/test/model/apigetsinglemr.php b/module/mr/test/model/apigetsinglemr.php
index 2c47741f6c..b783a36941 100755
--- a/module/mr/test/model/apigetsinglemr.php
+++ b/module/mr/test/model/apigetsinglemr.php
@@ -9,7 +9,7 @@ cid=0
 
 - 查询不存在的主机 @0
 - 查询Gitlab的合并请求
- - 属性title @test-merge
+ - 属性title @test-merge（不要关闭或删除）
  - 属性state @opened
 - 查询不存在的Gitlab合并请求属性message @0
 
@@ -35,5 +35,5 @@ $MRID = array(
 
 r($mrModel->apiGetSingleMR($repoID['error'],  $MRID['gitlab'])) && p() && e('0'); // 查询不存在的主机
 
-r($mrModel->apiGetSingleMR($repoID['gitlab'], $MRID['gitlab'])) && p('title,state') && e('test-merge,opened'); // 查询Gitlab的合并请求
+r($mrModel->apiGetSingleMR($repoID['gitlab'], $MRID['gitlab'])) && p('title,state') && e('test-merge（不要关闭或删除）,opened'); // 查询Gitlab的合并请求
 r($mrModel->apiGetSingleMR($repoID['gitlab'], -1))              && p('message')     && e('0');                       // 查询不存在的Gitlab合并请求
\ No newline at end of file
diff --git a/module/mr/test/model/apisyncmr.php b/module/mr/test/model/apisyncmr.php
index 5464378ac1..47637264f8 100755
--- a/module/mr/test/model/apisyncmr.php
+++ b/module/mr/test/model/apisyncmr.php
@@ -16,7 +16,7 @@ cid=0
  - 属性editedBy @~~
 - 正常的合并请求，更新本地MR的标题和编辑者
  - 属性id @1
- - 属性title @test-merge
+ - 属性title @test-merge（不要关闭或删除）
  - 属性editedBy @admin
 
 */
@@ -44,4 +44,4 @@ $localMR = $mrModel->fetchByID(2);
 r($mrModel->apiSyncMR($localMR)) && p('id,editedBy') && e('2,~~'); // 本地MR，无需同步
 
 $MR = $mrModel->fetchByID(1);
-r($mrModel->apiSyncMR($MR)) && p('id,title,editedBy') && e('1,test-merge,admin'); //正常的合并请求，更新本地MR的标题和编辑者
\ No newline at end of file
+r($mrModel->apiSyncMR($MR)) && p('id,title,editedBy') && e('1,test-merge（不要关闭或删除）,admin'); //正常的合并请求，更新本地MR的标题和编辑者
\ No newline at end of file
diff --git a/module/mr/test/model/batchsyncmr.php b/module/mr/test/model/batchsyncmr.php
index 41ec55c5c4..0870ea58f9 100755
--- a/module/mr/test/model/batchsyncmr.php
+++ b/module/mr/test/model/batchsyncmr.php
@@ -30,7 +30,7 @@ $mrYaml->jobID->range(1);
 $mrYaml->title->range('1-100')->prefix('MR-');
 $mrYaml->gen(5);
 
-su('admin', false);
+su('admin');
 
 global $tester;
 $mrModel = $tester->loadModel('mr');
diff --git a/module/mr/test/model/update.php b/module/mr/test/model/update.php
index a4f8dd01d5..f37b5078b3 100755
--- a/module/mr/test/model/update.php
+++ b/module/mr/test/model/update.php
@@ -23,7 +23,7 @@ zenData('mr')->loadYaml('mr')->gen(1);
 $mrModel = new mrTest();
 
 $MR = new stdclass();
-$MR->title              = 'test-merge';
+$MR->title              = 'test-merge（不要关闭或删除）';
 $MR->assignee           = 'admin';
 $MR->repoID             = 1;
 $MR->needCI             = 0;