From ad58726ae96e11ae2abe6bab37d954fb4b0129a6 Mon Sep 17 00:00:00 2001 From: zenggang Date: Tue, 9 Jan 2024 09:12:23 +0000 Subject: [PATCH] * Add gitlab edituser unit test --- module/gitlab/test/gitlab.class.php | 9 +++ module/gitlab/test/model/apiupdateproject.php | 2 +- module/gitlab/test/model/edituser.php | 56 +++++++++++++++++++ 3 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 module/gitlab/test/model/edituser.php diff --git a/module/gitlab/test/gitlab.class.php b/module/gitlab/test/gitlab.class.php index 0644932e69..d8846abdde 100644 --- a/module/gitlab/test/gitlab.class.php +++ b/module/gitlab/test/gitlab.class.php @@ -323,6 +323,15 @@ class gitlabTest return $result; } + public function editUserTest(int $gitlabID, object $gitlabUser) + { + $result = $this->gitlab->editUser($gitlabID, $gitlabUser); + + if(dao::isError()) return dao::getError(); + + return $result; + } + public function createProjectTest(int $gitlabID, object $project) { $result = $this->gitlab->createProject($gitlabID, $project); diff --git a/module/gitlab/test/model/apiupdateproject.php b/module/gitlab/test/model/apiupdateproject.php index 118a778db6..ddcf5d161d 100644 --- a/module/gitlab/test/model/apiupdateproject.php +++ b/module/gitlab/test/model/apiupdateproject.php @@ -47,4 +47,4 @@ r($gitlab->apiUpdateProject($gitlabID, $project)) && p() && e('0'); //使用空 r($gitlab->apiUpdateProject(0, $project)) && p() && e('0'); //使用错误gitlabID创建群组 $project->id = $projectID; -r($gitlab->apiUpdateProject($gitlabID, $project)) && p('description') && e('apiUpdatedProject'); //通过gitlabID,用户对象正确更新项目描述 \ No newline at end of file +r($gitlab->apiUpdateProject($gitlabID, $project)) && p('description') && e('apiUpdatedProject'); //通过gitlabID,用户对象正确更新项目描述 diff --git a/module/gitlab/test/model/edituser.php b/module/gitlab/test/model/edituser.php new file mode 100644 index 0000000000..3a96978306 --- /dev/null +++ b/module/gitlab/test/model/edituser.php @@ -0,0 +1,56 @@ +#!/usr/bin/env php +gen(5); +zdTable('oauth')->gen(5); + +$gitlab = $tester->loadModel('gitlab'); + +$gitlabID = 1; + +/* Create user. */ +$user = new stdclass(); +$user->name = 'apiCreatedUser'; +$user->username = 'apiuser17'; +$user->email = 'apiuser17@test.com'; +$user->password = '12345678'; +$gitlab->apiCreateUser($gitlabID, $user); + +/* Get userID. */ +$gitlabUsers = $gitlab->apiGetUsers($gitlabID); +foreach($gitlabUsers as $gitlabUser) +{ + if($gitlabUser->account == 'apiuser17') + { + $userID = $gitlabUser->id; + break; + } +} + +$user->name = 'apiUpdatedUser'; +$user->password_repeat = ''; + +$gitlabTest = new gitlabTest(); +r($gitlabTest->editUserTest($gitlabID, $user)) && p('account:0') && e('禅道用户不能为空'); //使用空的account更新gitlab用户 + +$user->account = 'admin'; +r($gitlabTest->editUserTest($gitlabID, $user)) && p('0') && e('二次密码不一致!'); //设置了密码的情况下更新gitlab用户 + +unset($user->password); +$user->id = $userID; +r($gitlabTest->editUserTest($gitlabID, $user)) && p() && e('1'); //通过gitlabID,用户对象正确更新用户名字