Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch release/21.7.8 of zentao/zentaopms (#13014)

Browse Source
This commit is contained in:
刘刚
2025-12-25 15:58:18 +08:00
committed by Gitfox
parent 3178a6dc71 884b36a054
commit daf2ec75bc
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/test/lib/action.unittest.class.php
+1 -1
View File
@@ -888,7 +888,7 @@ class actionTest
if(dao::isError()) return dao::getError();
return $output;
return str_replace("\n", '', $output);
}
/**
module/action/test/model/printchanges.php
+10 -10
View File
@@ -7,11 +7,11 @@ title=测试 actionModel::printChanges();
timeout=0
cid=14920
- 执行actionTest模块的printChangesTest方法，参数是'task', 1, array @
- 执行actionTest模块的printChangesTest方法，参数是'task', 1, $histories1 @修改了 <strong><i>任务状态</i></strong>，旧值为 "待处理"，新值为 "进行中"。<br />' . "\n"
- 执行actionTest模块的printChangesTest方法，参数是'task', 1, $histories2 @修改了 <strong><i>指派给</i></strong>，旧值为 "admin"，新值为 "user1"。<br />' . "\n" . '修改了 <strong><i>任务状态</i></strong>，旧值为 "待处理"，新值为 "进行中"。<br />' . "\n"
- 执行actionTest模块的printChangesTest方法，参数是'task', 1, $histories3 @修改了 <strong><i>任务描述</i></strong>，区别为：' . "\n" . "<blockquote class='textdiff'></blockquote>" . "\n" . "<blockquote class='original'>&lt;del&gt;旧描述&lt;/del&gt;&lt;ins&gt;新描述&lt;/ins&gt;</blockquote>"
- 执行actionTest模块的printChangesTest方法，参数是'task', 1, $histories3, false @修改了 <strong><i>任务描述</i></strong>，区别为：' . "\n" . "<blockquote class='textdiff'></blockquote>" . "\n" . "<blockquote class='original'>&lt;del&gt;旧描述&lt;/del&gt;&lt;ins&gt;新描述&lt;/ins&gt;</blockquote>"
- 执行actionTest模块的printChangesTest方法，参数是'task', 1, array @0
- 执行actionTest模块的printChangesTest方法，参数是'task', 1, $histories1 @修改了 <strong><i>任务状态</i></strong>，旧值为 "待处理"，新值为 "进行中"。<br />
- 执行actionTest模块的printChangesTest方法，参数是'task', 1, $histories2 @修改了 <strong><i>指派给 </i></strong>，旧值为 "admin"，新值为 "user1"。<br />修改了 <strong><i>任务状态</i></strong>，旧值为 "待处理"，新值为 "进行中"。<br />
- 执行actionTest模块的printChangesTest方法，参数是'task', 1, $histories3 @修改了 <strong><i>任务描述</i></strong>，区别为：<blockquote class='textdiff'><del>旧描述</del><ins>新描述</ins></blockquote><blockquote class='original'><del>旧描述</del><ins>新描述</ins></blockquote>
- 执行actionTest模块的printChangesTest方法，参数是'task', 1, $histories3, false @修改了 <strong><i>任务描述</i></strong>，区别为：<blockquote class='textdiff'></blockquote><blockquote class='original'><del>旧描述</del><ins>新描述</ins></blockquote>
*/
@@ -27,26 +27,26 @@ su('admin');
$actionTest = new actionTest();
// 步骤1：空历史记录测试
r($actionTest->printChangesTest('task', 1, array())) && p() && e('');
r($actionTest->printChangesTest('task', 1, array())) && p() && e('0');
// 步骤2：单个字段变更测试
$histories1 = array(
(object)array('field' => 'status', 'old' => '待处理', 'new' => '进行中', 'diff' => '')
);
r($actionTest->printChangesTest('task', 1, $histories1)) && p() && e('修改了 <strong><i>任务状态</i></strong>，旧值为 "待处理"，新值为 "进行中"。<br />' . "\n");
r($actionTest->printChangesTest('task', 1, $histories1)) && p() && e('修改了 <strong><i>任务状态</i></strong>，旧值为 "待处理"，新值为 "进行中"。<br />');
// 步骤3：多个字段变更测试
$histories2 = array(
(object)array('field' => 'assignedTo', 'old' => 'admin', 'new' => 'user1', 'diff' => ''),
(object)array('field' => 'status', 'old' => '待处理', 'new' => '进行中', 'diff' => '')
);
r($actionTest->printChangesTest('task', 1, $histories2)) && p() && e('修改了 <strong><i>指派给</i></strong>，旧值为 "admin"，新值为 "user1"。<br />' . "\n" . '修改了 <strong><i>任务状态</i></strong>，旧值为 "待处理"，新值为 "进行中"。<br />' . "\n");
r($actionTest->printChangesTest('task', 1, $histories2)) && p() && e('修改了 <strong><i>指派给 </i></strong>，旧值为 "admin"，新值为 "user1"。<br />修改了 <strong><i>任务状态</i></strong>，旧值为 "待处理"，新值为 "进行中"。<br />');
// 步骤4：包含diff信息的变更测试
$histories3 = array(
(object)array('field' => 'desc', 'old' => '旧描述', 'new' => '新描述', 'diff' => '<del>旧描述</del><ins>新描述</ins>')
);
r($actionTest->printChangesTest('task', 1, $histories3)) && p() && e('修改了 <strong><i>任务描述</i></strong>，区别为：' . "\n" . "<blockquote class='textdiff'></blockquote>" . "\n" . "<blockquote class='original'>&lt;del&gt;旧描述&lt;/del&gt;&lt;ins&gt;新描述&lt;/ins&gt;</blockquote>");
r($actionTest->printChangesTest('task', 1, $histories3)) && p() && e("修改了 <strong><i>任务描述</i></strong>，区别为：<blockquote class='textdiff'><del>旧描述</del><ins>新描述</ins></blockquote><blockquote class='original'><del>旧描述</del><ins>新描述</ins></blockquote>");
// 步骤5：canChangeTag为false的diff测试
r($actionTest->printChangesTest('task', 1, $histories3, false)) && p() && e('修改了 <strong><i>任务描述</i></strong>，区别为：' . "\n" . "<blockquote class='textdiff'></blockquote>" . "\n" . "<blockquote class='original'>&lt;del&gt;旧描述&lt;/del&gt;&lt;ins&gt;新描述&lt;/ins&gt;</blockquote>");
r($actionTest->printChangesTest('task', 1, $histories3, false)) && p() && e("修改了 <strong><i>任务描述</i></strong>，区别为：<blockquote class='textdiff'></blockquote><blockquote class='original'><del>旧描述</del><ins>新描述</ins></blockquote>");