From 40decc5349cf4a56d50dcbaaa24d0ecfdb2d55ba Mon Sep 17 00:00:00 2001 From: floraachy <1622042529@qq.com> Date: Tue, 9 Jan 2024 13:49:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4gitlink=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/settings.py | 47 +++++--- .../projects/branch/test_branches.yaml | 2 +- .../projects/branch/test_branches_all.yaml | 2 +- .../projects/branch/test_delete_branch.yaml | 2 +- .../projects/branch/test_new_branch.yaml | 2 +- .../branch/test_set_default_branch.yaml | 2 +- .../projects/issues/get_issue_detail.yaml | 2 +- .../issues/get_issue_journals_detail.yaml | 2 +- .../projects/issues/get_issue_list.yaml | 2 +- .../projects/issues/new_issue_journals.yaml | 2 +- .../issues/new_issue_journals_reply.yaml | 2 +- .../projects/issues/test_new_issue.yaml | 5 +- .../pull_request/test_edit_pull_request.yaml | 2 +- .../pull_request/test_new_pull_request.yaml | 2 +- .../projects/pull_request/test_pr_merge.yaml | 2 +- .../pull_request/test_pull_request.yaml | 2 +- .../pull_request/test_refuse_merge.yaml | 2 +- .../projects/releases/test_new_releases.yaml | 2 +- .../repository/test_create_files.yaml | 2 +- .../repository/test_project_detail_full.yaml | 2 +- .../test_project_detail_simple.yaml | 2 +- .../repository/test_repo_contributors.yaml | 2 +- .../repository/test_repo_entries.yaml | 2 +- .../repository/test_repo_sub_entries.yaml | 2 +- .../repository/test_update_files.yaml | 2 +- .../gitlink/projects/test_follow_project.yaml | 83 ++++++++++++- .../gitlink/projects/test_fork_project.yaml | 46 ++++++-- .../gitlink/projects/test_like_project.yaml | 111 ++++++++++++++---- .../gitlink/projects/test_new_project.yaml | 20 +--- .../projects/test_unfollow_project.yaml | 54 --------- .../gitlink/projects/test_unlike_project.yaml | 52 -------- .../gitlink/projects/wiki/test_new_wiki.yaml | 24 ++-- 32 files changed, 285 insertions(+), 203 deletions(-) delete mode 100644 interface/gitlink/projects/test_unfollow_project.yaml delete mode 100644 interface/gitlink/projects/test_unlike_project.yaml diff --git a/config/settings.py b/config/settings.py index c3bbc02..1245c72 100644 --- a/config/settings.py +++ b/config/settings.py @@ -16,20 +16,26 @@ ENV_VARS = { "env": "" }, "test": { - # 示例测试环境及示例测试账号 + # 环境相关域名 "host": "https://testforgeplus.trustie.net", "wiki_host": "", "pms_host": "https://testpm.trustie.net", - "client_id": "****client_id****", # 获取oauth_token需要的参数 - "client_secret": "****client_secret****", # 获取oauth_token需要的参数 - "green_code": "****green_code-test****", # 万能验证码 + # 获取oauth_token需要的参数 + "client_id": "****client_id****", + "client_secret": "****client_secret****", + # 万能验证码 + "green_code": "****green_code-test****", + # 测试账号 - 普通用户 "env_login": "autotest", "env_password": "****autotest_password_test****", # 运行时需要手动更改密码 "env_nickname": "autotest", "env_user_id": 106, + # 测试账号 - 超级管理员 "env_super_login": "floraachy", "env_super_password": "****floraachy_password_test****", # 运行时需要手动更改密码 - "env_project_url": "/autotest/auotest", + # 测试仓库 env_repo_owner/env_repo_identifier + "env_repo_owner": "autotest", + "env_repo_identifier": "auotest", "env_project_id": "59", # pms相关环境变量 "env_pms_product_id": "215", @@ -52,20 +58,26 @@ ENV_VARS = { }, "pre": { - # 示例测试环境及示例测试账号 + # 环境相关域名 "host": "http://172.20.32.202:4000", "wiki_host": "http://172.20.32.202:8093", "pms_host": "https://testpm.trustie.net", - "client_id": "****client_id-pre****", # 获取oauth_token需要的参数 - "client_secret": "****client_secret-pre****", # 获取oauth_token需要的参数 - "green_code": "****green_code-pre****", # 万能验证码 + # 获取oauth_token需要的参数 + "client_id": "****client_id-pre****", + "client_secret": "****client_secret-pre****", + # 万能验证码 + "green_code": "****green_code-pre****", + # 测试账号 - 普通用户 "env_login": "autotest", "env_password": "****autotest-pre****", # 运行时需要手动更改密码 "env_nickname": "autotest", "env_user_id": 115, + # 测试账号 - 超级管理员 "env_super_login": "floraachy", "env_super_password": "****floraachy-pre****", # 运行时需要手动更改密码 - "env_project_url": "/floraachy/autotest", + # 测试仓库 env_repo_owner/env_repo_identifier + "env_repo_owner": "floraachy", + "env_repo_identifier": "autotest", "env_project_id": "161", # pms相关环境变量 "env_pms_product_id": "", @@ -88,19 +100,26 @@ ENV_VARS = { }, "live": { + # 环境相关域名 "host": "https://www.gitlink.org.cn", "wiki_host": "https://wiki.gitlink.org.cn", "pms_host": "https://*****", - "client_id": "****client_id-live****", # 获取oauth_token需要的参数 - "client_secret": "****client_secret-live****", # 获取oauth_token需要的参数 - "green_code": "****green_code-live****", # 万能验证码 + # 获取oauth_token需要的参数 + "client_id": "****client_id-live****", + "client_secret": "****client_secret-live****", + # 万能验证码 + "green_code": "****green_code-live****", + # 测试账号 - 普通用户 "env_login": "floraachy", "env_password": "****floraachy-live****", # 运行时需要手动更改密码 "env_nickname": "🌼陈银花", "env_user_id": 87611, + # 测试账号 - 超级管理员 "env_super_login": "chenyh", "env_super_password": "****chenyh-live****", # 运行时需要手动更改密码 - "env_project_url": "/floraachy/auotest", + # 测试仓库 env_repo_owner/env_repo_identifier + "env_repo_owner": "floraachy", + "env_repo_identifier": "autotest", "env_project_id": "1445676", # pms相关环境变量 "env_pms_product_id": "", diff --git a/interface/gitlink/projects/branch/test_branches.yaml b/interface/gitlink/projects/branch/test_branches.yaml index ffb879b..8645796 100644 --- a/interface/gitlink/projects/branch/test_branches.yaml +++ b/interface/gitlink/projects/branch/test_branches.yaml @@ -14,7 +14,7 @@ case_info: title: 获取项目分支列表 severity: run: True - url: /api/v1/${env_project_url}/branches.json + url: /api/v1/${env_repo_owner}/${env_repo_identifier}/branches.json method: GET headers: Content-Type: application/json; charset=utf-8; diff --git a/interface/gitlink/projects/branch/test_branches_all.yaml b/interface/gitlink/projects/branch/test_branches_all.yaml index 40b78a9..99d9ee6 100644 --- a/interface/gitlink/projects/branch/test_branches_all.yaml +++ b/interface/gitlink/projects/branch/test_branches_all.yaml @@ -14,7 +14,7 @@ case_info: title: 获取项目分支列表（无分页） severity: run: True - url: /api/v1/${env_project_url}/branches/all.json + url: /api/v1/${env_repo_owner}/${env_repo_identifier}/branches/all.json method: GET headers: Content-Type: application/json; charset=utf-8; diff --git a/interface/gitlink/projects/branch/test_delete_branch.yaml b/interface/gitlink/projects/branch/test_delete_branch.yaml index 1cd0232..911f5f8 100644 --- a/interface/gitlink/projects/branch/test_delete_branch.yaml +++ b/interface/gitlink/projects/branch/test_delete_branch.yaml @@ -15,7 +15,7 @@ case_info: title: 删除一个项目分支 severity: run: True - url: /api/v1/${env_project_url}/branches/${branch}.json + url: /api/v1/${env_repo_owner}/${env_repo_identifier}/branches/${branch}.json method: DELETE headers: Content-Type: application/json; charset=utf-8; diff --git a/interface/gitlink/projects/branch/test_new_branch.yaml b/interface/gitlink/projects/branch/test_new_branch.yaml index 7b12fc3..6123b49 100644 --- a/interface/gitlink/projects/branch/test_new_branch.yaml +++ b/interface/gitlink/projects/branch/test_new_branch.yaml @@ -15,7 +15,7 @@ case_info: title: 创建一个项目分支 severity: run: True - url: /api/v1/${env_project_url}/branches.json + url: /api/v1/${env_repo_owner}/${env_repo_identifier}/branches.json method: POST headers: Content-Type: application/json; charset=utf-8; diff --git a/interface/gitlink/projects/branch/test_set_default_branch.yaml b/interface/gitlink/projects/branch/test_set_default_branch.yaml index 42460cf..7d17b84 100644 --- a/interface/gitlink/projects/branch/test_set_default_branch.yaml +++ b/interface/gitlink/projects/branch/test_set_default_branch.yaml @@ -15,7 +15,7 @@ case_info: title: 更新项目默认分支 severity: run: True - url: /api/${env_project_url}.json + url: /api/${env_repo_owner}/${env_repo_identifier}.json method: PUT headers: Content-Type: application/json; charset=utf-8; diff --git a/interface/gitlink/projects/issues/get_issue_detail.yaml b/interface/gitlink/projects/issues/get_issue_detail.yaml index 4843c2c..48a032f 100644 --- a/interface/gitlink/projects/issues/get_issue_detail.yaml +++ b/interface/gitlink/projects/issues/get_issue_detail.yaml @@ -13,7 +13,7 @@ case_info: title: 项目内获取疑修详情接口 run: True severity: normal - url: /api/v1/${env_project_url}/issues/${issue_id} + url: /api/v1/${env_repo_owner}/${env_repo_identifier}/issues/${issue_id} method: GET headers: Content-Type: application/json; charset=utf-8; diff --git a/interface/gitlink/projects/issues/get_issue_journals_detail.yaml b/interface/gitlink/projects/issues/get_issue_journals_detail.yaml index ace3f6d..7f0db7d 100644 --- a/interface/gitlink/projects/issues/get_issue_journals_detail.yaml +++ b/interface/gitlink/projects/issues/get_issue_journals_detail.yaml @@ -13,7 +13,7 @@ case_info: title: 项目内获取疑修列表接口 run: True severity: normal - url: /api/v1/${env_project_url}/issues/{issue_id}/journals?category=comment&page=${page}&limit=${limit} + url: /api/v1/${env_repo_owner}/${env_repo_identifier}/issues/{issue_id}/journals?category=comment&page=${page}&limit=${limit} method: GET headers: Content-Type: application/json; charset=utf-8; diff --git a/interface/gitlink/projects/issues/get_issue_list.yaml b/interface/gitlink/projects/issues/get_issue_list.yaml index 647b64a..920759a 100644 --- a/interface/gitlink/projects/issues/get_issue_list.yaml +++ b/interface/gitlink/projects/issues/get_issue_list.yaml @@ -13,7 +13,7 @@ case_info: title: 项目内获取疑修列表接口 run: True severity: normal - url: /api/v1/${env_project_url}/issues?participant_category=all&category=all&limit=${limit}&page=${page} + url: /api/v1/${env_repo_owner}/${env_repo_identifier}/issues?participant_category=all&category=all&limit=${limit}&page=${page} method: GET headers: Content-Type: application/json; charset=utf-8; diff --git a/interface/gitlink/projects/issues/new_issue_journals.yaml b/interface/gitlink/projects/issues/new_issue_journals.yaml index 10fd194..8f5fae5 100644 --- a/interface/gitlink/projects/issues/new_issue_journals.yaml +++ b/interface/gitlink/projects/issues/new_issue_journals.yaml @@ -13,7 +13,7 @@ case_info: title: 项目内新建疑修评论接口 run: True severity: normal - url: /api/v1/${env_project_url}/issues/${issue_id}/journals + url: /api/v1/${env_repo_owner}/${env_repo_identifier}/issues/${issue_id}/journals method: POST headers: Content-Type": application/json; charset=utf-8; diff --git a/interface/gitlink/projects/issues/new_issue_journals_reply.yaml b/interface/gitlink/projects/issues/new_issue_journals_reply.yaml index 65c1591..e67c53c 100644 --- a/interface/gitlink/projects/issues/new_issue_journals_reply.yaml +++ b/interface/gitlink/projects/issues/new_issue_journals_reply.yaml @@ -13,7 +13,7 @@ case_info: title: 项目内新建疑修评论回复接口 run: True severity: normal - url: /api/v1/${env_project_url}/issues/${issue_id}/journals + url: /api/v1/${env_repo_owner}/${env_repo_identifier}/issues/${issue_id}/journals method: POST headers: Content-Type: application/json; charset=utf-8; diff --git a/interface/gitlink/projects/issues/test_new_issue.yaml b/interface/gitlink/projects/issues/test_new_issue.yaml index 849d276..13ebeb3 100644 --- a/interface/gitlink/projects/issues/test_new_issue.yaml +++ b/interface/gitlink/projects/issues/test_new_issue.yaml @@ -16,9 +16,10 @@ case_info: title: 项目内新建疑修接口 run: True severity: normal - url: /api/v1/${env_project_url}/issues + url: /api/v1/${env_repo_owner}/${env_repo_identifier}/issues method: POST - headers: {"Content-Type": "application/json; charset=utf-8;"} + headers: + Content-Type: application/json; charset=utf-8; cookies: ${cookies} request_type: json payload: diff --git a/interface/gitlink/projects/pull_request/test_edit_pull_request.yaml b/interface/gitlink/projects/pull_request/test_edit_pull_request.yaml index 0147ff1..148092a 100644 --- a/interface/gitlink/projects/pull_request/test_edit_pull_request.yaml +++ b/interface/gitlink/projects/pull_request/test_edit_pull_request.yaml @@ -15,7 +15,7 @@ case_info: title: 编辑一个合并请求 severity: run: True - url: /api/v1/${env_project_url}/edit/${pr_id}.json + url: /api/v1/${env_repo_owner}/${env_repo_identifier}/edit/${pr_id}.json method: PUT headers: Content-Type: application/json; charset=utf-8; diff --git a/interface/gitlink/projects/pull_request/test_new_pull_request.yaml b/interface/gitlink/projects/pull_request/test_new_pull_request.yaml index 666843c..36dfd02 100644 --- a/interface/gitlink/projects/pull_request/test_new_pull_request.yaml +++ b/interface/gitlink/projects/pull_request/test_new_pull_request.yaml @@ -15,7 +15,7 @@ case_info: title: 创建一个合并请求 severity: run: True - url: /api/v1/${env_project_url}/pulls.json + url: /api/v1/${env_repo_owner}/${env_repo_identifier}/pulls.json method: POST headers: Content-Type: application/json; charset=utf-8; diff --git a/interface/gitlink/projects/pull_request/test_pr_merge.yaml b/interface/gitlink/projects/pull_request/test_pr_merge.yaml index 4e65cc9..1bd9b94 100644 --- a/interface/gitlink/projects/pull_request/test_pr_merge.yaml +++ b/interface/gitlink/projects/pull_request/test_pr_merge.yaml @@ -15,7 +15,7 @@ case_info: title: 合并一个合并请求 severity: run: True - url: /api/v1/${env_project_url}/edit/${pr_id}/pr_merge.json + url: /api/v1/${env_repo_owner}/${env_repo_identifier}/edit/${pr_id}/pr_merge.json method: POST headers: Content-Type: application/json; charset=utf-8; diff --git a/interface/gitlink/projects/pull_request/test_pull_request.yaml b/interface/gitlink/projects/pull_request/test_pull_request.yaml index 6eb13cb..9d1a93d 100644 --- a/interface/gitlink/projects/pull_request/test_pull_request.yaml +++ b/interface/gitlink/projects/pull_request/test_pull_request.yaml @@ -14,7 +14,7 @@ case_info: title: 获取合并请求列表 severity: run: True - url: /api/v1/${env_project_url}/pulls.json + url: /api/v1/${env_repo_owner}/${env_repo_identifier}/pulls.json method: GET headers: Content-Type: application/json; charset=utf-8; diff --git a/interface/gitlink/projects/pull_request/test_refuse_merge.yaml b/interface/gitlink/projects/pull_request/test_refuse_merge.yaml index 5d1fa38..5f391b9 100644 --- a/interface/gitlink/projects/pull_request/test_refuse_merge.yaml +++ b/interface/gitlink/projects/pull_request/test_refuse_merge.yaml @@ -15,7 +15,7 @@ case_info: title: 拒绝一个合并请求 severity: run: True - url: /api/v1/${env_project_url}/edit/${pr_id}/refuse_merge.json + url: /api/v1/${env_repo_owner}/${env_repo_identifier}/edit/${pr_id}/refuse_merge.json method: POST headers: Content-Type: application/json; charset=utf-8; diff --git a/interface/gitlink/projects/releases/test_new_releases.yaml b/interface/gitlink/projects/releases/test_new_releases.yaml index 207e6f9..b1ae160 100644 --- a/interface/gitlink/projects/releases/test_new_releases.yaml +++ b/interface/gitlink/projects/releases/test_new_releases.yaml @@ -15,7 +15,7 @@ case_info: title: 创建发行版 severity: run: True - url: /api/${env_project_url}/releases.json + url: /api/${env_repo_owner}/${env_repo_identifier}/releases.json method: POST headers: Content-Type: application/json; charset=utf-8; diff --git a/interface/gitlink/projects/repository/test_create_files.yaml b/interface/gitlink/projects/repository/test_create_files.yaml index f5795dc..6b666fe 100644 --- a/interface/gitlink/projects/repository/test_create_files.yaml +++ b/interface/gitlink/projects/repository/test_create_files.yaml @@ -15,7 +15,7 @@ case_info: title: 代码库新建/上传文件，提交的分支是默认分支master severity: run: True - url: /api/${env_project_url}/create_file.json + url: /api/${env_repo_owner}/${env_repo_identifier}/create_file.json method: POST headers: Content-Type: application/json; charset=utf-8; diff --git a/interface/gitlink/projects/repository/test_project_detail_full.yaml b/interface/gitlink/projects/repository/test_project_detail_full.yaml index d184fa4..4ba229f 100644 --- a/interface/gitlink/projects/repository/test_project_detail_full.yaml +++ b/interface/gitlink/projects/repository/test_project_detail_full.yaml @@ -14,7 +14,7 @@ case_info: title: 项目详情 severity: run: True - url: /api/${env_project_url}/detail.json + url: /api/${env_repo_owner}/${env_repo_identifier}/detail.json method: GET headers: Content-Type: application/json; charset=utf-8; diff --git a/interface/gitlink/projects/repository/test_project_detail_simple.yaml b/interface/gitlink/projects/repository/test_project_detail_simple.yaml index 096fc9f..4fea09c 100644 --- a/interface/gitlink/projects/repository/test_project_detail_simple.yaml +++ b/interface/gitlink/projects/repository/test_project_detail_simple.yaml @@ -14,7 +14,7 @@ case_info: title: 项目详情（简版） severity: run: True - url: /api/${env_project_url}/simple.json + url: /api/${env_repo_owner}/${env_repo_identifier}/simple.json method: GET headers: Content-Type: application/json; charset=utf-8; diff --git a/interface/gitlink/projects/repository/test_repo_contributors.yaml b/interface/gitlink/projects/repository/test_repo_contributors.yaml index 31ba785..45b0759 100644 --- a/interface/gitlink/projects/repository/test_repo_contributors.yaml +++ b/interface/gitlink/projects/repository/test_repo_contributors.yaml @@ -14,7 +14,7 @@ case_info: title: 获取项目贡献者列表 severity: run: True - url: /api/${env_project_url}/contributors.json + url: /api/${env_repo_owner}/${env_repo_identifier}/contributors.json method: GET headers: Content-Type: application/json; charset=utf-8; diff --git a/interface/gitlink/projects/repository/test_repo_entries.yaml b/interface/gitlink/projects/repository/test_repo_entries.yaml index a487cdf..db001a9 100644 --- a/interface/gitlink/projects/repository/test_repo_entries.yaml +++ b/interface/gitlink/projects/repository/test_repo_entries.yaml @@ -14,7 +14,7 @@ case_info: title: 获取项目代码目录 severity: run: True - url: /api/${env_project_url}/entries.json + url: /api/${env_repo_owner}/${env_repo_identifier}/entries.json method: GET headers: Content-Type: application/json; charset=utf-8; diff --git a/interface/gitlink/projects/repository/test_repo_sub_entries.yaml b/interface/gitlink/projects/repository/test_repo_sub_entries.yaml index 15df4d1..63e6eb6 100644 --- a/interface/gitlink/projects/repository/test_repo_sub_entries.yaml +++ b/interface/gitlink/projects/repository/test_repo_sub_entries.yaml @@ -15,7 +15,7 @@ case_info: title: 获取项目代码子目录或者文件 severity: run: True - url: /api/${env_project_url}/sub_entries.json + url: /api/${env_repo_owner}/${env_repo_identifier}/sub_entries.json method: GET headers: Content-Type: application/json; charset=utf-8; diff --git a/interface/gitlink/projects/repository/test_update_files.yaml b/interface/gitlink/projects/repository/test_update_files.yaml index a320ca4..eff667e 100644 --- a/interface/gitlink/projects/repository/test_update_files.yaml +++ b/interface/gitlink/projects/repository/test_update_files.yaml @@ -15,7 +15,7 @@ case_info: title: 代码库更新文件 severity: run: True - url: /api/${env_project_url}/update_file.json + url: /api/${env_repo_owner}/${env_repo_identifier}/update_file.json method: POST headers: Content-Type: application/json; charset=utf-8; diff --git a/interface/gitlink/projects/test_follow_project.yaml b/interface/gitlink/projects/test_follow_project.yaml index 1369653..8ec8ead 100644 --- a/interface/gitlink/projects/test_follow_project.yaml +++ b/interface/gitlink/projects/test_follow_project.yaml @@ -9,6 +9,14 @@ case_common: - follow_project - usefixtures: gitlink_login +common_dependence: + setup: + interface: + - gitlink_projects_new_project_01 + teardown: + interface: + - gitlink_projects_delete_project_01 + case_info: - id: gitlink_projects_follow_project_01 @@ -46,7 +54,74 @@ case_info: assert_sql: extract: case_dependence: - setup: - interface: gitlink_projects_new_project_01 - teardown: - interface: gitlink_projects_delete_project_01 \ No newline at end of file + + +- + id: gitlink_projects_follow_project_02 + title: 关注项目 - 已关注过了继续关注 + severity: critical + run: True + url: /api/watchers/follow.json + method: POST + headers: + Content-Type: application/json; charset=utf-8; + cookies: ${cookies} + cookies: + request_type: params + payload: + target_type: project + id: ${project_id} + files: + assert_response: + status_code: 200 + assertStatus: + message: 断言接口返回status=2 + expect_value: 2 + assert_type: == + type_jsonpath: $.status + assertMessage: + message: 断言接口返回message + expect_value: 你已关注了 + assert_type: == + type_jsonpath: $.message + assert_sql: + extract: + case_dependence: + + +- + id: gitlink_projects_unfollow_project_03 + title: 取消关注项目 + severity: critical + run: True + url: /api/watchers/unfollow.json + method: DELETE + headers: + Content-Type: application/json; charset=utf-8; + cookies: ${cookies} + cookies: + request_type: params + payload: + target_type: project + id: ${project_id} + files: + assert_response: + status_code: 200 + assertStatus: + message: 断言接口返回status=0 + expect_value: 0 + assert_type: == + type_jsonpath: $.status + assertMessage: + message: 断言接口返回message + expect_value: success + assert_type: == + type_jsonpath: $.message + assertPraised: + message: 断言接口返回watched=false + expect_value: false + assert_type: == + type_jsonpath: $.watched + assert_sql: + extract: + case_dependence: \ No newline at end of file diff --git a/interface/gitlink/projects/test_fork_project.yaml b/interface/gitlink/projects/test_fork_project.yaml index 64a74fa..c40dc2c 100644 --- a/interface/gitlink/projects/test_fork_project.yaml +++ b/interface/gitlink/projects/test_fork_project.yaml @@ -8,7 +8,14 @@ case_common: - gitea - fork_project - usefixtures: gitlink_login - - skip: 需要fork一个非本人的项目，先暂时略过 + +common_dependence: + setup: + env_vars: + repo_owner: ${env_login} + teardown: + interface: + - gitlink_projects_delete_project_01 case_info: - @@ -16,7 +23,7 @@ case_info: title: fork项目 severity: critical run: True - url: /api/${repo_owner}/${repo_identifier}/forks.json + url: /api/${env_repo_owner}/${env_repo_identifier}/forks.json method: POST headers: Content-Type: application/json; charset=utf-8; @@ -43,8 +50,33 @@ case_info: repo_id: $.id repo_identifier: $.identifier case_dependence: - setup: - interface: - - gitlink_projects_new_project_01 - teardown: - interface: gitlink_projects_delete_project_01 \ No newline at end of file + +- + id: gitlink_projects_fork_project_02 + title: fork项目 - 已经fork过了继续fork + severity: critical + run: True + url: /api/${env_repo_owner}/${env_repo_identifier}/forks.json + method: POST + headers: + Content-Type: application/json; charset=utf-8; + cookies: ${cookies} + cookies: + request_type: json + payload: + files: + assert_response: + status_code: 200 + assertStatus: + message: 断言接口返回status=0 + expect_value: 0 + assert_type: == + type_jsonpath: $.status + assertMessage: + message: 断言接口返回message + expect_value: fork失败，你已拥有了这个项目 autotest + assert_type: == + type_jsonpath: $.message + assert_sql: + extract: + case_dependence: \ No newline at end of file diff --git a/interface/gitlink/projects/test_like_project.yaml b/interface/gitlink/projects/test_like_project.yaml index 36f511f..fd02ed4 100644 --- a/interface/gitlink/projects/test_like_project.yaml +++ b/interface/gitlink/projects/test_like_project.yaml @@ -9,22 +9,30 @@ case_common: - like_project - usefixtures: gitlink_login +# 放置公共依赖 +common_dependence: + setup: + interface: + - gitlink_projects_new_project_01 + teardown: + interface: + - gitlink_projects_delete_project_01 + case_info: -- - id: gitlink_projects_like_project_01 - title: 点赞项目 - severity: critical - run: True - url: /api/projects/${project_id}/praise_tread/like.json - method: POST - headers: - Content-Type: application/json; charset=utf-8; - cookies: ${cookies} - cookies: - request_type: json - payload: - files: - assert_response: + - id: gitlink_projects_like_project_01 + title: 点赞项目 + severity: critical + run: True + url: /api/projects/${project_id}/praise_tread/like.json + method: POST + headers: + Content-Type: application/json; charset=utf-8; + cookies: ${cookies} + cookies: + request_type: json + payload: + files: + assert_response: status_code: 200 assertStatus: message: 断言接口返回status=0 @@ -41,10 +49,69 @@ case_info: expect_value: true assert_type: == type_jsonpath: $.praised - assert_sql: - extract: - case_dependence: - setup: - interface: gitlink_projects_new_project_01 - teardown: - interface: gitlink_projects_delete_project_01 + assert_sql: + extract: + case_dependence: + + - id: gitlink_projects_like_project_02 + title: 点赞项目 - 已点赞后继续点赞 + severity: critical + run: True + url: /api/projects/${project_id}/praise_tread/like.json + method: POST + headers: + Content-Type: application/json; charset=utf-8; + cookies: ${cookies} + cookies: + request_type: json + payload: + files: + assert_response: + status_code: 200 + assertStatus: + message: 断言接口返回status=2 + expect_value: 2 + assert_type: == + type_jsonpath: $.status + assertMessage: + message: 断言接口返回message + expect_value: 你已点过赞了 + assert_type: == + type_jsonpath: $.message + assert_sql: + extract: + case_dependence: + + - id: gitlink_projects_like_project_03 + title: 取消点赞项目 + severity: critical + run: true + url: /api/projects/${project_id}/praise_tread/unlike.json + method: DELETE + headers: + Content-Type: application/json; charset=utf-8; + cookies: ${cookies} + cookies: + request_type: json + payload: + files: + assert_response: + status_code: 200 + assertStatus: + message: 断言接口返回status=0 + expect_value: 0 + assert_type: == + type_jsonpath: $.status + assertMessage: + message: 断言接口返回message + expect_value: success + assert_type: == + type_jsonpath: $.message + assertPraised: + message: 断言接口返回praised=false + expect_value: false + assert_type: == + type_jsonpath: $.praised + assert_sql: + extract: + case_dependence: \ No newline at end of file diff --git a/interface/gitlink/projects/test_new_project.yaml b/interface/gitlink/projects/test_new_project.yaml index 07d99b2..defec47 100644 --- a/interface/gitlink/projects/test_new_project.yaml +++ b/interface/gitlink/projects/test_new_project.yaml @@ -9,6 +9,12 @@ case_common: - new_project - usefixtures: gitlink_login +# 放置公共依赖 （仅yaml用例支持，excel用例不支持） +common_dependence: + teardown: + interface: + - gitlink_projects_delete_project_01 + case_info: - id: gitlink_projects_new_project_01 @@ -42,11 +48,6 @@ case_info: repo_owner: $.login repo_identifier: $.identifier case_dependence: - teardown: - interface: - - gitlink_projects_delete_project_01 - sql: - - id: gitlink_projects_new_project_02 title: 正确输入所有参数，新建私有项目成功 @@ -95,11 +96,6 @@ case_info: repo_owner: $.login repo_identifier: $.identifier case_dependence: - teardown: - interface: - - gitlink_projects_delete_project_01 - sql: - - id: gitlink_projects_new_project_03 title: 正确输入各项必填参数，新建项目成功（校验数据库） @@ -136,7 +132,3 @@ case_info: repo_owner: $.login repo_identifier: $.identifier case_dependence: - teardown: - interface: - - gitlink_projects_delete_project_01 - sql: diff --git a/interface/gitlink/projects/test_unfollow_project.yaml b/interface/gitlink/projects/test_unfollow_project.yaml deleted file mode 100644 index 66f0593..0000000 --- a/interface/gitlink/projects/test_unfollow_project.yaml +++ /dev/null @@ -1,54 +0,0 @@ -case_common: - allure_epic: GitLink接口 - allure_feature: 开源项目模块 - allure_story: 项目 - case_markers: - - gitlink - - projects - - gitea - - unfollow_project - - usefixtures: gitlink_login - -case_info: -- - id: gitlink_projects_unfollow_project_01 - title: 取消关注项目 - severity: critical - run: True - url: /api/watchers/unfollow.json - method: DELETE - headers: - Content-Type: application/json; charset=utf-8; - cookies: ${cookies} - cookies: - request_type: params - payload: - target_type: project - id: ${project_id} - files: - assert_response: - status_code: 200 - assertStatus: - message: 断言接口返回status=0 - expect_value: 0 - assert_type: == - type_jsonpath: $.status - assertMessage: - message: 断言接口返回message - expect_value: success - assert_type: == - type_jsonpath: $.message - assertPraised: - message: 断言接口返回watched=false - expect_value: false - assert_type: == - type_jsonpath: $.watched - assert_sql: - extract: - case_dependence: - setup: - interface: - - gitlink_projects_new_project_01 - - gitlink_projects_follow_project_01 - teardown: - interface: gitlink_projects_delete_project_01 \ No newline at end of file diff --git a/interface/gitlink/projects/test_unlike_project.yaml b/interface/gitlink/projects/test_unlike_project.yaml deleted file mode 100644 index 6111731..0000000 --- a/interface/gitlink/projects/test_unlike_project.yaml +++ /dev/null @@ -1,52 +0,0 @@ -case_common: - allure_epic: GitLink接口 - allure_feature: 开源项目模块 - allure_story: 项目 - case_markers: - - gitlink - - projects - - gitea - - unlike_project - - usefixtures: gitlink_login - -case_info: -- - id: gitlink_projects_like_project_02 - title: 取消点赞项目 - severity: critical - run: true - url: /api/projects/${project_id}/praise_tread/unlike.json - method: DELETE - headers: - Content-Type: application/json; charset=utf-8; - cookies: ${cookies} - cookies: - request_type: json - payload: - files: - assert_response: - status_code: 200 - assertStatus: - message: 断言接口返回status=0 - expect_value: 0 - assert_type: == - type_jsonpath: $.status - assertMessage: - message: 断言接口返回message - expect_value: success - assert_type: == - type_jsonpath: $.message - assertPraised: - message: 断言接口返回praised=false - expect_value: false - assert_type: == - type_jsonpath: $.praised - assert_sql: - extract: - case_dependence: - setup: - interface: - - gitlink_projects_new_project_01 - - gitlink_projects_like_project_01 - teardown: - interface: gitlink_projects_delete_project_01 \ No newline at end of file diff --git a/interface/gitlink/projects/wiki/test_new_wiki.yaml b/interface/gitlink/projects/wiki/test_new_wiki.yaml index 0cf26bb..f41f828 100644 --- a/interface/gitlink/projects/wiki/test_new_wiki.yaml +++ b/interface/gitlink/projects/wiki/test_new_wiki.yaml @@ -9,6 +9,13 @@ case_common: - new_wiki - usefixtures: gitlink_login + +common_dependence: + setup: + env_vars: + env_page_title: 新页面_${generate_words()} + env_page_content: ${generate_paragraph} + case_info: - id: gitlink_projects_new_wiki_01 @@ -19,17 +26,17 @@ case_info: method: POST headers: Content-Type: application/json; charset=utf-8; - cookies: ${cookie} + cookies: ${cookies} cookies: request_type: json payload: - owner: ${repo_owner} - repo: ${repo_identifier} + owner: ${env_repo_owner} + repo: ${env_repo_identifier} projectId: ${env_project_id} - pageName: 新页面_2023 # 当前页标题 - title: 新页面_2023 # 标题 + pageName: ${env_page_title} # 当前页标题 + title: ${env_page_title} # 标题 message: - content_base64: 5qyi6L+O5p2l5YiwV2lraQ== + content_base64: ${string_to_base64('${env_page_content}')} files: assert_response: status_code: 200 @@ -41,8 +48,3 @@ case_info: assert_sql: extract: case_dependence: - setup: - interface: - - gitlink_projects_new_project_01 - teardown: - interface: gitlink_projects_delete_project_01 \ No newline at end of file