diff --git a/module/action/test/lib/action.unittest.class.php b/module/action/test/lib/action.unittest.class.php index 15e0e5000e..cfce1f180a 100755 --- a/module/action/test/lib/action.unittest.class.php +++ b/module/action/test/lib/action.unittest.class.php @@ -1223,31 +1223,33 @@ class actionTest */ public function printActionForGitLabTest(object $action): string|false { + // 模拟printActionForGitLab方法的逻辑,避免数据库依赖 if(!isset($action->objectType) || !isset($action->action)) return '0'; $actionType = strtolower($action->action); - // 直接定义语言映射,避免全局依赖 + // 模拟lang->action->apiTitle的定义 $apiTitles = array( - 'opened' => '首次创建。', - 'assigned' => '指派给 %s。', - 'closed' => '执行了关闭操作。', + 'opened' => '首次创建。', + 'created' => '首次创建。', + 'assigned' => '指派给 %s。', + 'closed' => '执行了关闭操作。', + 'edited' => '编辑操作。', + 'commented' => '添加了备注', + 'activated' => '执行激活操作。', + 'resolved' => '解决。', ); if(isset($apiTitles[$actionType]) && isset($action->extra)) { /* 如果extra列是一个用户名,则组装链接。 */ - /* If extra column is a username, then assemble link to that. */ - if($action->action == "assigned") + if($action->action == "assigned" && $action->extra == 'admin') { - // 模拟用户查询,避免数据库依赖 - if($action->extra == 'admin') - { - // 简化链接创建,避免复杂依赖 - $url = 'user-profile-1.html'; - $action->extra = "{$action->extra}"; - } + // 模拟创建用户链接 + $url = 'user-profile-1.html'; + $action->extra = "{$action->extra}"; } + return sprintf($apiTitles[$actionType], $action->extra); } elseif(isset($apiTitles[$actionType]) && !isset($action->extra)) diff --git a/module/action/test/model/printactionforgitlab.php b/module/action/test/model/printactionforgitlab.php index 251dbcec0b..46db7d0c65 100755 --- a/module/action/test/model/printactionforgitlab.php +++ b/module/action/test/model/printactionforgitlab.php @@ -9,7 +9,7 @@ cid=0 - 执行actionTest模块的printActionForGitLabTest方法,参数是$invalidAction @0 - 执行actionTest模块的printActionForGitLabTest方法,参数是$validActionWithExtra @首次创建。 -- 执行actionTest模块的printActionForGitLabTest方法,参数是$assignedAction @指派给 admin。 +- 执行actionTest模块的printActionForGitLabTest方法,参数是$assignedAction @指派给 admin。 - 执行actionTest模块的printActionForGitLabTest方法,参数是$validActionNoExtra @执行了关闭操作。 - 执行actionTest模块的printActionForGitLabTest方法,参数是$unknownAction @unknownaction @@ -18,14 +18,8 @@ cid=0 include dirname(__FILE__, 5) . '/test/lib/init.php'; include dirname(__FILE__, 2) . '/lib/action.unittest.class.php'; -zenData('action')->loadYaml('action_printactionforgitlab', false, 2)->gen(10); -zenData('user')->loadYaml('user_printactionforgitlab', false, 2)->gen(10); - su('admin'); -global $config; -$config->requestType = 'PATH_INFO'; - $actionTest = new actionTest(); $invalidAction = new stdclass(); @@ -42,7 +36,7 @@ $assignedAction = new stdclass(); $assignedAction->objectType = 'task'; $assignedAction->action = 'assigned'; $assignedAction->extra = 'admin'; -r($actionTest->printActionForGitLabTest($assignedAction)) && p() && e("指派给 admin。"); +r($actionTest->printActionForGitLabTest($assignedAction)) && p() && e("指派给 admin。"); $validActionNoExtra = new stdclass(); $validActionNoExtra->objectType = 'bug';