调整gitlink一系列测试用例

README.md

@@ -351,6 +351,7 @@ case_info:  # 具体的用例数据，是以列表的形式进行管理
 
 参考示例：
 ```
+  assert_sql:
     contains_user:
       message: 断言数据库：查询tokens表，表中存在该登录用户记录；预期查询结果的长度为1
       sql: select * from tokens where user_id=${user_id};
@@ -589,6 +590,8 @@ excel表单2名称是：示例模块
 平常在做功能测试的时候，经常会遇到某个模块不稳定，偶然会出现一些bug，对于这种问题我们会针对此用例反复执行多次，最终复现出问题来。
 自动化运行用例时候，也会出现偶然的bug，可以针对单个用例重复执行多次。
 
+- [pytest-xdist(分布式执行)](https://www.gitlink.org.cn/zone/tester/newdetail/785)
+当测试用例非常多的时候，一条条按顺序执行测试用例，是很浪费测试时间的。这时候就可以用到 pytest-xdist，让自动化测试用例可以分布式执行，从而大大节省测试时间。
 
 ## 九、初始化项目可能遇到的问题
 - [测试机安装python版本与本框架要求不一致，怎么办？](https://www.gitlink.org.cn/zone/tester/newdetail/245)

interface/gitlink/organization/test_gitlink_delete_organization.yaml

@@ -19,7 +19,7 @@ case_info:
   method: DELETE
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: params
   payload:

interface/gitlink/organization/test_gitlink_get_organization_detail.yaml

@@ -19,7 +19,7 @@ case_info:
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:

interface/gitlink/organization/test_gitlink_new_organization.yaml

@@ -6,7 +6,6 @@ case_common:
     - gitlink
     - projects
     - gitea
-    - new_organization
     - usefixtures: gitlink_login
 
 case_info:
@@ -19,7 +18,7 @@ case_info:
   method: POST
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:

interface/gitlink/projects/about/test_gitlink_repo_edit_about.yaml

@@ -4,7 +4,7 @@ case_common:
   allure_story: 项目主页
   case_markers:
    - gitlink
-   - repo
+   - project
    - about
 
 # 仅仓库管理员才能编辑项目主页
@@ -15,11 +15,11 @@ case_info:
   title: 仓库管理员编辑项目主页内容
   run: true
   severity: normal
-  url: /api/${env_repo_owner}/${env_repo_identifier}/about.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/about.json
   method: POST
   headers:
     Content-Type: application/json; charset=utf-8;
-  cookies: ${cookies}
+  cookies: ${admin_cookies}
   request_type: json
   payload:
     content: ${generate_paragraph(nb=10)}
@@ -29,20 +29,18 @@ case_info:
       assertField:
         message: 断言接口响返回的项目标识
         assert_type: ==
-        expect_value: ${env_repo_identifier}
+        expect_value: ${init_repo_identifier}
         type_jsonpath: $.identifier
   assert_sql:
   extract:
   case_dependence:
-    setup:
-      interface: gitlink_super_login_04
 
 -
   id: gitlink_repo_get_about_detail_02
   title: 非仓库管理员编辑项目主页内容
   run: true
   severity: normal
-  url: /api/${env_repo_owner}/${env_repo_identifier}/about.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/about.json
   method: POST
   headers:
     Content-Type: application/json; charset=utf-8;
@@ -65,6 +63,4 @@ case_info:
         type_jsonpath: $.message
   assert_sql:
   extract:
-  case_dependence:
-    setup:
-      interface: gitlink_login_01
+  case_dependence:

interface/gitlink/projects/about/test_gitlink_repo_get_about_detail.yaml

@@ -4,7 +4,7 @@ case_common:
   allure_story: 项目主页
   case_markers:
    - gitlink
-   - repo
+   - project
    - about
    - usefixtures: gitlink_login
 
@@ -14,7 +14,7 @@ case_info:
   title: 查询项目主页详情
   run: true
   severity: normal
-  url: /api/${env_repo_owner}/${env_repo_identifier}/about.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/about.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
@@ -27,7 +27,7 @@ case_info:
       assertField:
         message: 断言接口响返回的项目标识
         assert_type: ==
-        expect_value: ${env_repo_identifier}
+        expect_value: ${init_repo_identifier}
         type_jsonpath: $.identifier
   assert_sql:
   extract:

interface/gitlink/projects/branch/test_gitlink_get_repo_branches_list.yaml

@@ -4,6 +4,7 @@ case_common:
   allure_story: 分支
   case_markers:
     - gitlink
+    - projects
     - branches
     - gitea
     - usefixtures: gitlink_login
@@ -14,11 +15,11 @@ case_info:
   title: 获取项目分支列表
   severity:
   run: True
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/branches.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/branches.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: params
   payload:
@@ -41,11 +42,11 @@ case_info:
   title: 获取项目分支列表（无分页）
   severity: normal
   run: True
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/branches/all.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/branches/all.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: params
   payload:
@@ -64,11 +65,11 @@ case_info:
   title: 获取项目分支列表- 根据搜索关键字
   severity:
   run: True
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/branches.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/branches.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: params
   payload:

interface/gitlink/projects/branch/test_gitlink_repo_delete_branch.yaml

@@ -4,25 +4,27 @@ case_common:
   allure_story: 分支
   case_markers:
     - gitlink
+    - projects
     - branches
     - gitea
+    - debug
     - usefixtures: gitlink_login
 
 # 需要仓库管理员才能删除分支
 
 case_info:
 -
-  id: gitlink_repo_delete_branch_001
-  title: 删除一个项目分支
+  id: gitlink_repo_delete_branch_01
+  title: 删除一个项目分支，删除成功
   severity: critical
   run: True
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/branches/${branch_name}.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/branches/${branch_name}.json
   method: DELETE
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${admin_cookies}
   cookies:
-  request_type: json
+  request_type: none
   payload:
   files:
   assert_response:
@@ -42,5 +44,5 @@ case_info:
   case_dependence:
     setup:
       interface:
-        - gitlink_repo_new_branch_001
-        - gitlink_super_login_04
+        # 前置条件：新建分支
+        - gitlink_repo_new_branch_01

interface/gitlink/projects/branch/test_gitlink_repo_new_branch.yaml

@@ -4,27 +4,32 @@ case_common:
   allure_story: 分支
   case_markers:
     - gitlink
+    - projects
     - branches
     - gitea
     - usefixtures: gitlink_login
 
+
+# 仓库管理员和开发者均可新建分支
+
 case_info:
 -
-  id: gitlink_repo_new_branch_001
+  id: gitlink_repo_new_branch_01
   title: 创建一个项目分支
   severity: critical
   run: True
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/branches.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/branches.json
   method: POST
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:
     new_branch_name: ${generate_words()}
     old_branch_name: master
   files:
+  wait_seconds: 2
   assert_response:
       status_code: 200
       assertAutor:
@@ -38,7 +43,7 @@ case_info:
   case_dependence:
     teardown:
       interface:
-        - gitlink_super_login_04
-        - gitlink_repo_delete_branch_001
+        # 后置处理：删除分支
+        - gitlink_repo_delete_branch_01
 
 

interface/gitlink/projects/branch/test_gitlink_repo_update_default_branch.yaml

@@ -4,20 +4,23 @@ case_common:
   allure_story: 分支
   case_markers:
     - gitlink
+    - projects
     - branches
     - gitea
 
+# 注意：仅项目管理员才有权限更新项目默认分支
+
 case_info:
 -
   id: gitlink_repo_update_default_branch_001
   title: 更新项目默认分支，更新成功
   severity: critical
   run: True
-  url: /api/v1//${env_repo_owner}/${env_repo_identifier}/branches/update_default_branch.json
+  url: /api/v1//${init_repo_owner}/${init_repo_identifier}/branches/update_default_branch.json
   method: PATCH
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${admin_cookies}
   cookies:
   request_type: json
   payload:
@@ -38,7 +41,4 @@ case_info:
   assert_sql:
   extract:
   case_dependence:
-    setup:
-      interface:
-        - gitlink_super_login_04
 

interface/gitlink/projects/branch_setting/test_gitlink_get_repo_protect_branch_list.yaml

@@ -4,32 +4,23 @@ case_common:
   allure_story: 分支设置
   case_markers:
     - gitlink
+    - projects
     - gitea
-    - branch
+    - branches
     - usefixtures: gitlink_login
 
 # 前提条件：仅仓库管理员及以上角色才有权限
-common_dependence:
-  setup:
-    interface:
-      # 新建私有仓库
-      - gitlink_projects_new_project_02
-  teardown:
-    interface:
-      # 删除仓库
-      - gitlink_projects_delete_project_01
-
 case_info:
 -
   id: gitlink_get_repo_protect_branch_list_01
   title: 仓库管理员获取仓库保护分支列表，获取成功
   severity: normal
   run: True
-  url: /api/${repo_owner}/${repo_identifier}/protected_branches.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/protected_branches.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${admin_cookies}
   cookies:
   request_type: params
   payload:

interface/gitlink/projects/branch_setting/test_gitlink_repo_delete_protect_branch.yaml

@@ -6,32 +6,22 @@ case_common:
     - gitlink
     - projects
     - gitea
-    - branch
+    - branches
     - usefixtures: gitlink_login
 
 
 # 前提条件：仅仓库管理员及以上角色才有权限
-common_dependence:
-  setup:
-    interface:
-      # 新建私有仓库
-      - gitlink_projects_new_project_02
-  teardown:
-    interface:
-      # 删除仓库
-      - gitlink_projects_delete_project_01
-
 case_info:
 -
   id: gitlink_repo_delete_protect_branch_01
-  title: 仓库管理员删除保护分支，设置成功
+  title: 仓库管理员删除保护分支，删除成功
   severity: critical
   run: True
-  url: /api/${repo_owner}/${repo_identifier}/protected_branches/master.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/protected_branches/master.json
   method: DELETE
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${admin_cookies}
   cookies:
   request_type: params
   payload:

interface/gitlink/projects/branch_setting/test_gitlink_repo_edit_protect_branch.yaml

@@ -6,20 +6,11 @@ case_common:
     - gitlink
     - projects
     - gitea
-    - branch
+    - branches
     - usefixtures: gitlink_login
 
 
 # 前提条件：仅仓库管理员及以上角色才有权限
-common_dependence:
-  setup:
-    interface:
-      # 新建私有仓库
-      - gitlink_projects_new_project_02
-  teardown:
-    interface:
-      # 删除仓库
-      - gitlink_projects_delete_project_01
 
 case_info:
 -
@@ -27,11 +18,11 @@ case_info:
   title: 仓库管理员更新保护分支，设置成功
   severity: critical
   run: True
-  url: /api/${repo_owner}/${repo_identifier}/protected_branches/master.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/protected_branches/master.json
   method: PATCH
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${admin_cookies}
   cookies:
   request_type: params
   payload:
@@ -63,4 +54,8 @@ case_info:
     setup:
       interface:
         # 设置保护分支 master
-        - gitlink_set_repo_protect_branch_01
+        - gitlink_set_repo_protect_branch_01
+    teardown:
+      interface:
+        # 清理数据：删除保护分支
+        - gitlink_repo_delete_protect_branch_01

interface/gitlink/projects/branch_setting/test_gitlink_repo_set_default_branch.yaml

@@ -6,32 +6,22 @@ case_common:
     - gitlink
     - projects
     - gitea
-    - branch
+    - branches
     - usefixtures: gitlink_login
 
 
 # 前提条件：仅仓库管理员及以上角色才有权限
-common_dependence:
-  setup:
-    interface:
-      # 新建私有仓库
-      - gitlink_projects_new_project_02
-  teardown:
-    interface:
-      # 删除仓库
-      - gitlink_projects_delete_project_01
-
 case_info:
 -
   id: gitlink_repo_set_default_branch_01
   title: 仓库管理员设置默认分支，设置成功
   severity: critical
   run: True
-  url: /api/${repo_owner}/${repo_identifier}.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}.json
   method: PUT
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${admin_cookies}
   cookies:
   request_type: json
   payload:
@@ -40,8 +30,8 @@ case_info:
   assert_response:
       status_code: 200
       assertField:
-        message: 断言接口返回的repo_identifier
-        expect_value: ${repo_identifier}
+        message: 断言接口返回的init_repo_identifier
+        expect_value: ${init_repo_identifier}
         assert_type: ==
         type_jsonpath: $.identifier
   assert_sql:

interface/gitlink/projects/branch_setting/test_gitlink_set_repo_protect_branch.yaml

@@ -6,18 +6,8 @@ case_common:
     - gitlink
     - gitea
     - branch
-    - usefixtures: gitlink_login
 
 # 前提条件：仅仓库管理员及以上角色才有权限
-common_dependence:
-  setup:
-    interface:
-      # 新建私有仓库
-      - gitlink_projects_new_project_02
-  teardown:
-    interface:
-      # 删除仓库
-      - gitlink_projects_delete_project_01
 
 case_info:
 -
@@ -25,11 +15,11 @@ case_info:
   title: 仓库管理员设置仓库保护分支，设置成功
   severity: normal
   run: True
-  url: /api/${repo_owner}/${repo_identifier}/protected_branches.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/protected_branches.json
   method: POST
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${admin_cookies}
   cookies:
   request_type: params
   payload:
@@ -57,4 +47,8 @@ case_info:
         type_jsonpath: $.branch_name
   assert_sql:
   extract:
-  case_dependence:
+  case_dependence:
+    teardown:
+      interface:
+        # 清理数据：删除保护分支
+        - gitlink_repo_delete_protect_branch_01

interface/gitlink/projects/collaborators/test_gitlink_add_repo_collaborator.yaml

@@ -4,28 +4,33 @@ case_common:
   allure_story: 成员管理
   case_markers:
     - gitlink
+    - projects
     - gitea
     - collaborator
     - usefixtures: gitlink_login
 
-
 # 仅仓库管理员及以上角色才有权限
 
+common_dependence:
+  setup:
+    env_vars:
+      added_user_id: ${t_user_id}
+
 case_info:
 -
   id: gitlink_add_repo_collaborator_01
   title: 仓库管理员添加一个项目成员，添加成功
   severity: critical
   run: True
-  url: /api/${repo_owner}/${repo_identifier}/collaborators.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/collaborators.json
   method: POST
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${admin_cookies}
   cookies:
   request_type: json
   payload:
-    user_id: ${t_user_id}
+    user_id: ${added_user_id}
   files:
   assert_response:
       status_code: 200
@@ -42,27 +47,25 @@ case_info:
   assert_sql:
   extract:
   case_dependence:
-    setup:
-      # 新建私有仓库
-      interface: gitlink_projects_new_project_02
     teardown:
-      # 删除仓库
-      interface: gitlink_projects_delete_project_01
+      interface:
+        # 后置处理: 删除刚刚添加的项目成员
+        - gitlink_delete_repo_collaborator_01
 
 -
   id: gitlink_add_repo_collaborator_02
   title: 非仓库管理员添加一个项目成员，添加失败
   severity: critical
   run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/collaborators.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/collaborators.json
   method: POST
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:
-    user_id: ${t_user_id}
+    user_id: ${added_user_id}
   files:
   assert_response:
       status_code: 200

interface/gitlink/projects/collaborators/test_gitlink_change_repo_collaborator_role.yaml

@@ -4,30 +4,36 @@ case_common:
   allure_story: 成员管理
   case_markers:
     - gitlink
+    - projects
     - gitea
     - collaborator
     - usefixtures: gitlink_login
 
 # 仅仓库管理员及以上角色才有权限
 
+
+common_dependence:
+  setup:
+    env_vars:
+      added_user_id: ${t_user_id}
+
 case_info:
--
-  id: gitlink_change_repo_collaborator_role_01
-  title: 仓库管理员更改项目成员权限 - 修改为报告者，修改成功
-  severity: critical
-  run: True
-  url: /api/${repo_owner}/${repo_identifier}/collaborators/change_role.json
-  method: PUT
-  headers:
-    Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
-  request_type: json
-  payload:
-    user_id: ${t_user_id}
-    role: Reporter    # 必填，枚举值：Manager Developer Reporter
-  files:
-  assert_response:
+  - id: gitlink_change_repo_collaborator_role_01
+    title: 仓库管理员更改项目成员权限 - 修改为报告者，修改成功
+    severity: critical
+    run: True
+    url: /api/${init_repo_owner}/${init_repo_identifier}/collaborators/change_role.json
+    method: PUT
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${admin_cookies}
+    cookies:
+    request_type: json
+    payload:
+      user_id: ${added_user_id}
+      role: Reporter    # 必填，枚举值：Manager Developer Reporter
+    files:
+    assert_response:
       status_code: 200
       assert_status:
         message: 断言接口status=0
@@ -39,36 +45,35 @@ case_info:
         expect_value: success
         assert_type: ==
         type_jsonpath: $.message
-  assert_sql:
-  extract:
-  case_dependence:
-    setup:
-      interface:
-        - gitlink_projects_new_project_02
-        - gitlink_add_repo_collaborator_01
-    teardown:
-      interface:
-      - gitlink_delete_repo_collaborator_01
-      - gitlink_projects_delete_project_01
+    assert_sql:
+    extract:
+    case_dependence:
+      setup:
+        interface:
+          # 添加仓库成员
+          - gitlink_add_repo_collaborator_01
+      teardown:
+        interface:
+          # 移除仓库成员
+          - gitlink_delete_repo_collaborator_01
 
 
--
-  id: gitlink_change_repo_collaborator_role_02
-  title: 仓库管理员更改项目成员权限 - 修改为管理员，修改成功
-  severity: critical
-  run: True
-  url: /api/${repo_owner}/${repo_identifier}/collaborators/change_role.json
-  method: PUT
-  headers:
-    Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
-  request_type: json
-  payload:
-    user_id: ${t_user_id}
-    role: Manager    # 必填，枚举值：Manager Developer Reporter
-  files:
-  assert_response:
+  - id: gitlink_change_repo_collaborator_role_02
+    title: 仓库管理员更改项目成员权限 - 修改为管理员，修改成功
+    severity: critical
+    run: True
+    url: /api/${init_repo_owner}/${init_repo_identifier}/collaborators/change_role.json
+    method: PUT
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${admin_cookies}
+    cookies:
+    request_type: json
+    payload:
+      user_id: ${t_user_id}
+      role: Manager    # 必填，枚举值：Manager Developer Reporter
+    files:
+    assert_response:
       status_code: 200
       assert_status:
         message: 断言接口status=0
@@ -80,36 +85,35 @@ case_info:
         expect_value: success
         assert_type: ==
         type_jsonpath: $.message
-  assert_sql:
-  extract:
-  case_dependence:
-    setup:
-      interface:
-        - gitlink_projects_new_project_02
-        - gitlink_add_repo_collaborator_01
-    teardown:
-      interface:
-      - gitlink_delete_repo_collaborator_01
-      - gitlink_projects_delete_project_01
+    assert_sql:
+    extract:
+    case_dependence:
+      setup:
+        interface:
+          # 添加仓库成员
+          - gitlink_add_repo_collaborator_01
+      teardown:
+        interface:
+          # 移除仓库成员
+          - gitlink_delete_repo_collaborator_01
 
 
--
-  id: gitlink_change_repo_collaborator_role_03
-  title: 非仓库管理员更改项目成员权限 - 修改为管理员，修改失败
-  severity: critical
-  run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/collaborators/change_role.json
-  method: PUT
-  headers:
-    Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
-  request_type: json
-  payload:
-    user_id: ${t_user_id}
-    role: Manager    # 必填，枚举值：Manager Developer Reporter
-  files:
-  assert_response:
+  - id: gitlink_change_repo_collaborator_role_03
+    title: 非仓库管理员更改项目成员权限 - 修改为管理员，修改失败
+    severity: critical
+    run: True
+    url: /api/${init_repo_owner}/${init_repo_identifier}/collaborators/change_role.json
+    method: PUT
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${cookies}
+    cookies:
+    request_type: json
+    payload:
+      user_id: ${t_user_id}
+      role: Manager    # 必填，枚举值：Manager Developer Reporter
+    files:
+    assert_response:
       status_code: 200
       assert_status:
         message: 断言接口status=403
@@ -121,6 +125,14 @@ case_info:
         expect_value: 你不是管理员，没有权限操作
         assert_type: ==
         type_jsonpath: $.message
-  assert_sql:
-  extract:
-  case_dependence:
+    assert_sql:
+    extract:
+    case_dependence:
+      setup:
+        interface:
+          # 添加仓库成员
+          - gitlink_add_repo_collaborator_01
+      teardown:
+        interface:
+          # 移除仓库成员
+          - gitlink_delete_repo_collaborator_01

interface/gitlink/projects/collaborators/test_gitlink_delete_repo_collaborator.yaml

@@ -4,10 +4,16 @@ case_common:
   allure_story: 成员管理
   case_markers:
     - gitlink
+    - projects
     - gitea
     - collaborator
     - usefixtures: gitlink_login
 
+common_dependence:
+  setup:
+    env_vars:
+      added_user_id: ${t_user_id}
+
 # 仅仓库管理员及以上角色才有权限
 
 case_info:
@@ -16,15 +22,15 @@ case_info:
   title: 仓库管理员删除一个项目成员，删除成功
   severity: critical
   run: True
-  url: /api/${repo_owner}/${repo_identifier}/collaborators/remove.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/collaborators/remove.json
   method: DELETE
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${admin_cookies}
   cookies:
   request_type: json
   payload:
-    user_id: ${t_user_id}
+    user_id: ${added_user_id}
   files:
   assert_response:
       status_code: 200
@@ -42,24 +48,20 @@ case_info:
   extract:
   case_dependence:
     setup:
-      # 新建私有仓库
       interface:
-       - gitlink_projects_new_project_02
-       - gitlink_add_repo_collaborator_01
-      teardown:
-        # 删除仓库
-        interface: gitlink_projects_delete_project_01
+        # 添加仓库成员
+        - gitlink_add_repo_collaborator_01
 
 -
   id: gitlink_delete_repo_collaborator_02
   title: 非仓库管理员删除一个项目成员，删除失败
   severity: critical
   run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/collaborators/remove.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/collaborators/remove.json
   method: DELETE
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:
@@ -79,4 +81,12 @@ case_info:
         type_jsonpath: $.message
   assert_sql:
   extract:
-  case_dependence:
+  case_dependence:
+      setup:
+        interface:
+          # 添加仓库成员
+          - gitlink_add_repo_collaborator_01
+      teardown:
+        interface:
+          # 移除仓库成员
+          - gitlink_delete_repo_collaborator_01

interface/gitlink/projects/collaborators/test_gitlink_get_repo_collaborator_list.yaml

@@ -4,58 +4,57 @@ case_common:
   allure_story: 成员管理
   case_markers:
     - gitlink
+    - projects
     - gitea
     - collaborator
     - usefixtures: gitlink_login
 
 
 case_info:
--
-  id: gitlink_get_repo_collaborator_list_01
-  title: 仓库管理员获取项目成员列表，获取成功
-  severity: critical
-  run: True
-  url: /api/${repo_owner}/${repo_identifier}/collaborators.json
-  method: GET
-  headers:
-    Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
-  request_type: json
-  payload:
-    page: 1
-    limit: 15
-  files:
-  assert_response:
+  - id: gitlink_get_repo_collaborator_list_01
+    title: 仓库管理员获取项目成员列表，获取成功
+    severity: critical
+    run: True
+    url: /api/${init_repo_owner}/${init_repo_identifier}/collaborators.json
+    method: GET
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${admin_cookies}
+    cookies:
+    request_type: params
+    payload:
+      page: 1
+      limit: 15
+    files:
+    assert_response:
       status_code: 200
       assertField:
         message: 断言接口存在参数total_count
         expect_value: total_count
         assert_type: contains
-  assert_sql:
-  extract:
-    type_jsonpath:
-      repo_user_ids: $.members[*].id
-  case_dependence:
+    assert_sql:
+    extract:
+      type_jsonpath:
+        repo_user_ids: $.members[*].id
+    case_dependence:
 
 
--
-  id: gitlink_get_repo_collaborator_list_02
-  title: 非仓库管理员获取项目成员列表，获取失败
-  severity: critical
-  run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/collaborators.json
-  method: GET
-  headers:
-    Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
-  request_type: json
-  payload:
-    page: 1
-    limit: 15
-  files:
-  assert_response:
+  - id: gitlink_get_repo_collaborator_list_02
+    title: 非仓库管理员获取项目成员列表，获取失败
+    severity: critical
+    run: True
+    url: /api/${init_repo_owner}/${init_repo_identifier}/collaborators.json
+    method: GET
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${cookies}
+    cookies:
+    request_type: json
+    payload:
+      page: 1
+      limit: 15
+    files:
+    assert_response:
       status_code: 200
       assert_status:
         message: 断言接口status=403
@@ -67,6 +66,6 @@ case_info:
         expect_value: 你不是管理员，没有权限操作
         assert_type: ==
         type_jsonpath: $.message
-  assert_sql:
-  extract:
-  case_dependence:
+    assert_sql:
+    extract:
+    case_dependence:

interface/gitlink/projects/collaborators/test_gitlink_get_user_list.yaml

@@ -19,7 +19,7 @@ case_info:
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:

interface/gitlink/projects/dataset/test_gitlink_repo_delete_dataset_file.yaml

@@ -0,0 +1,48 @@
+case_common:
+  allure_epic: GitLink接口
+  allure_feature: 开源项目模块
+  allure_story: 数据集
+  case_markers:
+    - gitlink
+    - projects
+    - dataset
+    - usefixtures: gitlink_login
+
+# 前提条件：当前存找一个仓库，仓库已经创建数据集， 数据集已经上传了文件
+
+
+case_info:
+  - id: gitlink_repo_delete_dataset_file_01
+    title: 删除数据集文件，删除成功
+    severity: critical
+    run: false
+    url: /api/attachments/${dataset_file_id}.json
+    method: DELETE
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${cookies}
+    cookies:
+    request_type: json
+    payload:
+    files:
+    assert_response:
+      status_code: 200
+      assert_status:
+        message: 断言接口status=0
+        expect_value: 0
+        assert_type: ==
+        type_jsonpath: $.status
+      assert_message:
+        message: 断言接口message=success
+        expect_value: 删除成功
+        assert_type: ==
+        type_jsonpath: $.message
+    assert_sql:
+    extract:
+    case_dependence:
+      setup:
+        interface:
+          # 获取数据集详情，获取dataset_container_id
+          - gitlink_repo_get_dataset_detail_01
+          # 上传数据集文件，获取dataset_file_id
+          - gitlink_repo_upload_dataset_file_01

interface/gitlink/projects/dataset/test_gitlink_repo_edit_dataset.yaml

@@ -4,43 +4,32 @@ case_common:
   allure_story: 数据集
   case_markers:
     - gitlink
-    - repo
+    - projects
     - dataset
     - usefixtures: gitlink_login
 
 # 前提条件：当前存找一个仓库，仓库已经创建数据集
 
-common_dependence:
-  setup:
-    interface:
-      - gitlink_get_repo_licenses_01
-      - gitlink_projects_new_project_01
-      - gitlink_repo_new_dataset_02
-  teardown:
-    interface:
-      - gitlink_projects_delete_project_01
-
 
 case_info:
--
-  id: gitlink_repo_edit_dataset_01
-  title: 编辑数据集，编辑成功
-  severity: critical
-  run: True
-  url: /api/v1/${repo_owner}/${repo_identifier}/dataset.json
-  method: PUT
-  headers:
-    Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
-  request_type: json
-  payload:
-    title: test_${generate_identifier()}_${generate_identifier()}
-    license_id: ${random.choice(${licenses_ids})}
-    description: ${generate_paragraph(nb=5)}
-    paper_content: ${generate_paragraph(nb=5)}
-  files:
-  assert_response:
+  - id: gitlink_repo_edit_dataset_01
+    title: 编辑数据集，编辑成功
+    severity: critical
+    run: True
+    url: /api/v1/${init_repo_owner}/${init_repo_identifier}/dataset.json
+    method: PUT
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${cookies}
+    cookies:
+    request_type: json
+    payload:
+      title: test_${generate_identifier()}_${generate_identifier()}
+      license_id: ${random.choice(${licenses_ids})}
+      description: ${generate_paragraph(nb=5)}
+      paper_content: ${generate_paragraph(nb=5)}
+    files:
+    assert_response:
       status_code: 200
       assertMessage:
         type_jsonpath: $.message
@@ -50,7 +39,7 @@ case_info:
         type_jsonpath: $.status
         expect_value: 0
         assert_type: ==
-  assert_sql:
-  extract:
-  case_dependence:
+    assert_sql:
+    extract:
+    case_dependence:
 

interface/gitlink/projects/dataset/test_gitlink_repo_get_dataset_detail.yaml

@@ -4,21 +4,12 @@ case_common:
   allure_story: 数据集
   case_markers:
     - gitlink
-    - repo
+    - projects
     - dataset
     - usefixtures: gitlink_login
 
 # 前提条件：当前存找一个仓库，仓库已经创建数据集
 
-common_dependence:
-  setup:
-    interface:
-      - gitlink_projects_new_project_01
-      - gitlink_repo_new_dataset_02
-      - gitlink_repo_get_dataset_detail_01
-  teardown:
-    interface:
-      - gitlink_projects_delete_project_01
 
 case_info:
 -
@@ -26,11 +17,11 @@ case_info:
   title: 获取数据集详情
   severity: critical
   run: True
-  url: /api/v1/${repo_owner}/${repo_identifier}/dataset.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/dataset.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:

interface/gitlink/projects/dataset/test_gitlink_repo_new_dataset.yaml

@@ -4,7 +4,7 @@ case_common:
   allure_story: 数据集
   case_markers:
     - gitlink
-    - repo
+    - projects
     - dataset
     - usefixtures: gitlink_login
 
@@ -14,7 +14,9 @@ case_common:
 
 common_dependence:
   setup:
-    interface: gitlink_get_repo_licenses_01
+    interface:
+      # 获取开源许可证
+      - gitlink_get_repo_licenses_01
 
 
 case_info:
@@ -27,7 +29,7 @@ case_info:
   method: POST
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:
@@ -51,9 +53,13 @@ case_info:
   case_dependence:
     setup:
       interface:
+        # 前置条件：新建项目
         - gitlink_projects_new_project_01
+        # 前置条件：项目更新导航栏-开启数据集
+        - gitlink_update_project_unit_01
     teardown:
       interface:
+        # 后置处理：删除项目
         - gitlink_projects_delete_project_01
 
 -
@@ -65,7 +71,7 @@ case_info:
   method: POST
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:
@@ -87,9 +93,13 @@ case_info:
   case_dependence:
     setup:
       interface:
+        # 前置条件：新建项目
         - gitlink_projects_new_project_01
+        # 前置条件：项目更新导航栏-开启数据集
+        - gitlink_update_project_unit_01
     teardown:
       interface:
+        # 后置处理：删除项目
         - gitlink_projects_delete_project_01
 
 -
@@ -101,7 +111,7 @@ case_info:
   method: POST
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:
@@ -125,9 +135,13 @@ case_info:
   case_dependence:
     setup:
       interface:
+        # 前置条件：新建项目
         - gitlink_projects_new_project_01
+        # 前置条件：项目更新导航栏-开启数据集
+        - gitlink_update_project_unit_01
     teardown:
       interface:
+        # 后置处理：删除项目
         - gitlink_projects_delete_project_01
 
 
@@ -140,7 +154,7 @@ case_info:
   method: POST
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:
@@ -164,9 +178,13 @@ case_info:
   case_dependence:
     setup:
       interface:
+        # 前置条件：新建项目
         - gitlink_projects_new_project_01
+        # 前置条件：项目更新导航栏-开启数据集
+        - gitlink_update_project_unit_01
     teardown:
       interface:
+        # 后置处理：删除项目
         - gitlink_projects_delete_project_01
 
 -
@@ -178,7 +196,7 @@ case_info:
   method: POST
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:
@@ -202,7 +220,11 @@ case_info:
   case_dependence:
     setup:
       interface:
+        # 前置条件：新建项目
         - gitlink_projects_new_project_01
+        # 前置条件：项目更新导航栏-开启数据集
+        - gitlink_update_project_unit_01
     teardown:
       interface:
+        # 后置处理：删除项目
         - gitlink_projects_delete_project_01

interface/gitlink/projects/dataset/test_gitlink_repo_upload_dataset_file.yaml

@@ -4,48 +4,43 @@ case_common:
   allure_story: 数据集
   case_markers:
     - gitlink
-    - repo
+    - projects
     - dataset
     - usefixtures: gitlink_login
 
 # 前提条件：当前存找一个仓库，仓库已经创建数据集
 
-common_dependence:
-  setup:
-    interface:
-      - gitlink_projects_new_project_01
-      - gitlink_repo_new_dataset_02
-      - gitlink_repo_get_dataset_detail_01
-  teardown:
-    interface:
-      - gitlink_projects_delete_project_01
+
 
 case_info:
--
-  id: gitlink_repo_upload_dataset_file_01
-  title: 上传数据集文件，上传成功
-  severity: critical
-  run: false
-  url: /api/attachments.json
-  method: POST
-  headers:
-    Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
-  request_type: json
-  payload:
-    container_type: ProjectDataset
-    description: ${generate_paragraph(nb=5)}
-    container_id: ${dataset_container_id}
-    file: ${get_file_content('gitlinklogo3.jpg')}
-  files:
-  assert_response:
+  - id: gitlink_repo_upload_dataset_file_01
+    title: 上传数据集文件，上传成功
+    severity: critical
+    run: false
+    url: /api/attachments.json
+    method: POST
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${cookies}
+    cookies:
+    request_type: json
+    payload:
+      container_type: ProjectDataset
+      description: ${generate_paragraph(nb=5)}
+      container_id: ${dataset_container_id}
+      file: ${get_file_content('gitlinklogo3.jpg')}
+    files:
+    assert_response:
       status_code: 200
       assertField:
         expect_value: content_type
         assert_type: contains
-  assert_sql:
-  extract:
-    type_jsonpath:
-      dataset_container_id: $.id
-  case_dependence:
+    assert_sql:
+    extract:
+      type_jsonpath:
+        dataset_file_id: $.id
+    case_dependence:
+      setup:
+        interface:
+          # 获取数据集详情，获取dataset_container_id
+          - gitlink_repo_get_dataset_detail_01

interface/gitlink/projects/issues/issue_journal/test_gitlink_repo_delete_issue_journals.yaml

@@ -1,10 +1,10 @@
 case_common:
   allure_epic: GitLink接口
   allure_feature: 开源项目模块
-  allure_story: 疑修（Issue）
+  allure_story: 疑修（Issue）评论
   case_markers:
    - gitlink
-   - project
+   - projects
    - issue
    - usefixtures: gitlink_login
 
@@ -14,7 +14,7 @@ case_info:
   title: 项目内删除疑修评论接口
   run: True
   severity: normal
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/issues/${issue_index}/journals/${journal_id}.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/issues/${issue_index}/journals/${journal_id}.json
   method: delete
   headers:
     Content-Type: application/json; charset=utf-8;
@@ -39,5 +39,7 @@ case_info:
   case_dependence:
     setup:
       interface:
+        # 前置条件：新建issue
         - gitlink_repo_new_issue_01
+        # 前置条件：issue下新建评论
         - gitlink_repo_new_issue_journals_01

interface/gitlink/projects/issues/issue_journal/test_gitlink_repo_edit_issue_journals.yaml

@@ -1,10 +1,10 @@
 case_common:
   allure_epic: GitLink接口
   allure_feature: 开源项目模块
-  allure_story: 疑修（Issue）
+  allure_story: 疑修（Issue）评论
   case_markers:
    - gitlink
-   - project
+   - projects
    - issue
    - usefixtures: gitlink_login
 
@@ -14,7 +14,7 @@ case_info:
   title: 项目内修改疑修评论接口
   run: True
   severity: normal
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/issues/${issue_index}/journals/${journal_id}.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/issues/${issue_index}/journals/${journal_id}.json
   method: patch
   headers:
     Content-Type: application/json; charset=utf-8;
@@ -36,5 +36,7 @@ case_info:
   case_dependence:
     setup:
       interface:
-       - gitlink_repo_new_issue_01
-       - gitlink_repo_new_issue_journals_01
+        # 前置条件：新建issue
+        - gitlink_repo_new_issue_01
+        # 前置条件：issue下新建评论
+        - gitlink_repo_new_issue_journals_01

interface/gitlink/projects/issues/issue_journal/test_gitlink_repo_get_issue_journal_children_list.yaml

@@ -1,10 +1,10 @@
 case_common:
   allure_epic: GitLink接口
   allure_feature: 开源项目模块
-  allure_story: 疑修（Issue）
+  allure_story: 疑修（Issue）评论
   case_markers:
    - gitlink
-   - repo
+   - projects
    - issue
    - usefixtures: gitlink_login
 
@@ -14,7 +14,7 @@ case_info:
   title: 获取疑修评论的子评论列表
   run: true
   severity: normal
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/issues/${issue_index}/journals/${journal_id}/children_journals.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/issues/${issue_index}/journals/${journal_id}/children_journals.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
@@ -36,5 +36,7 @@ case_info:
   case_dependence:
     setup:
       interface:
-       - gitlink_repo_new_issue_01
-       - gitlink_repo_new_issue_journals_01
+        # 前置条件：新建issue
+        - gitlink_repo_new_issue_01
+        # 前置条件：issue下新建评论
+        - gitlink_repo_new_issue_journals_01

interface/gitlink/projects/issues/issue_journal/test_gitlink_repo_get_issue_journal_list.yaml

@@ -1,10 +1,10 @@
 case_common:
   allure_epic: GitLink接口
   allure_feature: 开源项目模块
-  allure_story: 疑修（Issue）
+  allure_story: 疑修（Issue）评论
   case_markers:
    - gitlink
-   - repo
+   - projects
    - issue
    - usefixtures: gitlink_login
 
@@ -14,7 +14,7 @@ case_info:
   title: 获取疑修下评论或操作记录列表
   run: true
   severity: normal
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/issues/${issue_index}/journals.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/issues/${issue_index}/journals.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
@@ -39,4 +39,5 @@ case_info:
   case_dependence:
     setup:
       interface:
-       - gitlink_repo_new_issue_01
+        # 前置条件：新建issue
+        - gitlink_repo_new_issue_01

interface/gitlink/projects/issues/issue_journal/test_gitlink_repo_new_issue_journals.yaml

@@ -0,0 +1,110 @@
+case_common:
+  allure_epic: GitLink接口
+  allure_feature: 开源项目模块
+  allure_story: 疑修（Issue）评论
+  case_markers:
+    - gitlink
+    - projects
+    - issue
+    - usefixtures: gitlink_login
+
+common_dependence:
+  setup:
+    interface:
+      # 前置条件：项目内新建疑修接口 - 无附件
+      - gitlink_repo_new_issue_01
+
+
+case_info:
+  - id: gitlink_repo_new_issue_journals_01
+    title: 项目内新建疑修评论接口 - 一级评论， 无附件
+    run: True
+    severity: normal
+    url: /api/v1/${init_repo_owner}/${init_repo_identifier}/issues/${issue_index}/journals.json
+    method: POST
+    headers:
+      Content-Type: application/json; charset=utf-8;
+    cookies: ${cookies}
+    request_type: json
+    payload:
+      notes: ${generate_words(nb=10)}
+      attachment_ids: [ ]    # 评论附件ID 可选
+      receivers_login: [ ]
+    files:
+    assert_response:
+      status_code: 200
+      assertField:
+        message: 断言接口存在id
+        expect_value: id
+        assert_type: contains
+    assert_sql:
+    extract:
+      type_jsonpath:
+        journal_id: $.id
+    case_dependence:
+
+  - id: gitlink_repo_new_issue_journals_02
+    title: 项目内新建疑修评论接口 - 一级评论， 有附件
+    run: True
+    severity: normal
+    url: /api/v1/${init_repo_owner}/${init_repo_identifier}/issues/${issue_index}/journals.json
+    method: POST
+    headers:
+      Content-Type: application/json; charset=utf-8;
+    cookies: ${cookies}
+    request_type: json
+    payload:
+      notes: ${generate_words(nb=10)}
+      attachment_ids: # 评论附件ID 可选
+        - ${attachment_id}
+      receivers_login: [ ]
+    files:
+    assert_response:
+      status_code: 200
+      assertField:
+        message: 断言接口存在id
+        expect_value: id
+        assert_type: contains
+    assert_sql:
+    extract:
+    case_dependence:
+      setup:
+        # 前置条件：上传附件，获取attachment_id
+        interface: gitlink_upload_file_01
+
+
+  - id: gitlink_repo_new_issue_journals_03
+    title: 项目内新建疑修评论接口 - notes为空
+    run: True
+    severity: normal
+    url: /api/v1/${init_repo_owner}/${init_repo_identifier}/issues/${issue_index}/journals.json
+    method: POST
+    headers:
+      Content-Type: application/json; charset=utf-8;
+    cookies: ${cookies}
+    request_type: json
+    payload:
+      parent_id: 0    # 父评论ID 可选
+      reply_id:     # 回复评论ID 可选
+      attachment_ids: # 评论附件ID 可选
+        - ${attachment_id}
+      receivers_login: [ ]
+    files:
+    assert_response:
+      status_code: 200
+      assert_status:
+        message: 断言接口status=-1
+        expect_value: -1
+        assert_type: ==
+        type_jsonpath: $.status
+      assert_message:
+        message: 断言接口message
+        expect_value: Notes不能为空字符
+        assert_type: ==
+        type_jsonpath: $.message
+    assert_sql:
+    extract:
+    case_dependence:
+      setup:
+        # 前置条件：上传附件，获取attachment_id
+        interface: gitlink_upload_file_01

interface/gitlink/projects/issues/test_gitlink_repo_batch_delete_issue.yaml

@@ -4,7 +4,7 @@ case_common:
   allure_story: 疑修（Issue）
   case_markers:
    - gitlink
-   - repo
+   - projects
    - issue
    - usefixtures: gitlink_login
 
@@ -14,7 +14,7 @@ case_info:
   title: 项目内批量删除多个疑修
   run: True
   severity: normal
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/issues/batch_destroy.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/issues/batch_destroy.json
   method: delete
   headers:
     Content-Type: application/json; charset=utf-8;
@@ -40,6 +40,8 @@ case_info:
   case_dependence:
     setup:
       interface:
-       - gitlink_repo_new_issue_01
-       - gitlink_repo_new_issue_01
-       - gitlink_repo_get_issue_list_02
+        # 前置条件：连续新建多个issue
+        - gitlink_repo_new_issue_01
+        - gitlink_repo_new_issue_01
+        # 获取多个issue_ids
+        - gitlink_repo_get_issue_list_02

interface/gitlink/projects/issues/test_gitlink_repo_batch_edit_issue.yaml

@@ -4,17 +4,17 @@ case_common:
   allure_story: 疑修（Issue）
   case_markers:
    - gitlink
-   - repo
+   - projects
    - issue
    - usefixtures: gitlink_login
 
 case_info:
 -
   id: gitlink_repo_batch_edit_issue_01
-  title: 项目内批量更新一个疑修
+  title: 项目内批量更新多个疑修
   run: True
   severity: normal
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/issues/batch_update.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/issues/batch_update.json
   method: PATCH
   headers:
     Content-Type: application/json; charset=utf-8;
@@ -45,6 +45,8 @@ case_info:
   case_dependence:
     setup:
       interface:
+        # 前置条件：连续新建多个issue
         - gitlink_repo_new_issue_01
         - gitlink_repo_new_issue_01
-        - gitlink_repo_get_issue_list_01
+        # 获取多个issue_ids
+        - gitlink_repo_get_issue_list_02

interface/gitlink/projects/issues/test_gitlink_repo_delete_issue.yaml

@@ -4,7 +4,7 @@ case_common:
   allure_story: 疑修（Issue）
   case_markers:
    - gitlink
-   - repo
+   - projects
    - issue
    - usefixtures: gitlink_login
 
@@ -14,7 +14,7 @@ case_info:
   title: 项目内删除一个疑修
   run: True
   severity: normal
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/issues/${issue_index}.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/issues/${issue_index}.json
   method: delete
   headers:
     Content-Type: application/json; charset=utf-8;
@@ -38,4 +38,5 @@ case_info:
   extract:
   case_dependence:
     setup:
+      # 前置条件：新建issue
       interface: gitlink_repo_new_issue_01

interface/gitlink/projects/issues/test_gitlink_repo_edit_issue.yaml

@@ -4,7 +4,7 @@ case_common:
   allure_story: 疑修（Issue）
   case_markers:
    - gitlink
-   - repo
+   - projects
    - issue
    - usefixtures: gitlink_login
 
@@ -14,7 +14,7 @@ case_info:
   title: 项目内更新一个疑修
   run: True
   severity: normal
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/issues/${issue_index}.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/issues/${issue_index}.json
   method: patch
   headers:
     Content-Type: application/json; charset=utf-8;
@@ -44,5 +44,5 @@ case_info:
   extract:
   case_dependence:
     setup:
-      interface:
-       - gitlink_repo_new_issue_01
+      # 前置条件：新建issue
+      interface: gitlink_repo_new_issue_01

interface/gitlink/projects/issues/test_gitlink_repo_get_issue_assigner_list.yaml

@@ -4,7 +4,7 @@ case_common:
   allure_story: 疑修（Issue）
   case_markers:
    - gitlink
-   - repo
+   - projects
    - issue
    - usefixtures: gitlink_login
 
@@ -14,7 +14,7 @@ case_info:
   title: 疑修负责人列表
   run: true
   severity: normal
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/issue_assigners.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/issue_assigners.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;

interface/gitlink/projects/issues/test_gitlink_repo_get_issue_author_list.yaml

@@ -4,7 +4,7 @@ case_common:
   allure_story: 疑修（Issue）
   case_markers:
    - gitlink
-   - repo
+   - projects
    - issue
    - usefixtures: gitlink_login
 
@@ -14,7 +14,7 @@ case_info:
   title: 疑修发布人列表
   run: true
   severity: normal
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/issue_authors.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/issue_authors.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;

interface/gitlink/projects/issues/test_gitlink_repo_get_issue_detail.yaml

@@ -4,7 +4,7 @@ case_common:
   allure_story: 疑修（Issue）
   case_markers:
    - gitlink
-   - project
+   - projects
    - issue
    - usefixtures: gitlink_login
 
@@ -14,7 +14,7 @@ case_info:
   title: 项目内获取疑修详情接口
   run: True
   severity: normal
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/issues/${issue_index}.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/issues/${issue_index}.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
@@ -33,4 +33,5 @@ case_info:
   extract:
   case_dependence:
     setup:
+      # 前置条件：新建issue
       interface: gitlink_repo_new_issue_01

interface/gitlink/projects/issues/test_gitlink_repo_get_issue_list.yaml

@@ -4,7 +4,7 @@ case_common:
   allure_story: 疑修（Issue）
   case_markers:
    - gitlink
-   - project
+   - projects
    - issue
    - usefixtures: gitlink_login
 
@@ -14,7 +14,7 @@ case_info:
   title: 项目内获取疑修列表接口
   run: True
   severity: normal
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/issues
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/issues
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
@@ -51,7 +51,7 @@ case_info:
   title: 项目内获取疑修列表接口 - 根据关键字搜索
   run: True
   severity: normal
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/issues
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/issues
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;

interface/gitlink/projects/issues/test_gitlink_repo_get_issue_priority_list.yaml

@@ -4,7 +4,7 @@ case_common:
   allure_story: 疑修（Issue）
   case_markers:
    - gitlink
-   - repo
+   - projects
    - issue
    - usefixtures: gitlink_login
 
@@ -14,7 +14,7 @@ case_info:
   title: 疑修优先级列表
   run: true
   severity: normal
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/issue_priorities.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/issue_priorities.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;

interface/gitlink/projects/issues/test_gitlink_repo_get_issue_status_list.yaml

@@ -4,7 +4,7 @@ case_common:
   allure_story: 疑修（Issue）
   case_markers:
    - gitlink
-   - repo
+   - projects
    - issue
    - usefixtures: gitlink_login
 
@@ -14,7 +14,7 @@ case_info:
   title: 疑修状态列表
   run: true
   severity: normal
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/issue_statues.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/issue_statues.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;

interface/gitlink/projects/issues/test_gitlink_repo_new_issue.yaml

@@ -4,7 +4,7 @@ case_common:
   allure_story: 疑修（Issue）
   case_markers:
    - gitlink
-   - repo
+   - projects
    - issue
    - new_issue
    - usefixtures: gitlink_login
@@ -15,7 +15,7 @@ case_info:
   title: 项目内新建疑修接口 - 无附件
   run: True
   severity: normal
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/issues.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/issues.json
   method: POST
   headers:
     Content-Type: application/json; charset=utf-8;
@@ -56,7 +56,7 @@ case_info:
   title: 项目内新建疑修接口 - 带附件
   run: True
   severity: normal
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/issues.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/issues.json
   method: POST
   headers:
     Content-Type: application/json; charset=utf-8;
@@ -92,4 +92,5 @@ case_info:
       issue_files: $.attachments..title
   case_dependence:
     setup:
+      # 前置条件：上传issue附件，获取attachment_id
       interface: gitlink_upload_file_01

interface/gitlink/projects/issues/test_gitlink_repo_new_issue_journals.yaml

@@ -1,106 +0,0 @@
-case_common:
-  allure_epic: GitLink接口
-  allure_feature: 开源项目模块
-  allure_story: 疑修（Issue）
-  case_markers:
-   - gitlink
-   - project
-   - issue
-   - usefixtures: gitlink_login
-
-case_info:
--
-  id: gitlink_repo_new_issue_journals_01
-  title: 项目内新建疑修评论接口 - 一级评论， 无附件
-  run: True
-  severity: normal
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/issues/${issue_index}/journals.json
-  method: POST
-  headers:
-    Content-Type: application/json; charset=utf-8;
-  cookies: ${cookies}
-  request_type: json
-  payload:
-    notes:  ${generate_words(nb=10)}
-    attachment_ids: []    # 评论附件ID 可选
-    receivers_login: []
-  files:
-  assert_response:
-      status_code: 200
-      assertField:
-        message: 断言接口存在id
-        expect_value: id
-        assert_type: contains
-  assert_sql:
-  extract:
-    type_jsonpath:
-      journal_id: $.id
-  case_dependence:
-    setup:
-      interface: gitlink_repo_new_issue_01
-
--
-  id: gitlink_repo_new_issue_journals_02
-  title: 项目内新建疑修评论接口 - 一级评论， 有附件
-  run: True
-  severity: normal
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/issues/${issue_index}/journals.json
-  method: POST
-  headers:
-    Content-Type: application/json; charset=utf-8;
-  cookies: ${cookies}
-  request_type: json
-  payload:
-    notes:  ${generate_words(nb=10)}
-    attachment_ids:     # 评论附件ID 可选
-     - ${attachment_id}
-    receivers_login: []
-  files:
-  assert_response:
-      status_code: 200
-      assertField:
-        message: 断言接口存在id
-        expect_value: id
-        assert_type: contains
-  assert_sql:
-  extract:
-  case_dependence:
-    setup:
-      interface: gitlink_repo_new_issue_01
-
-
--
-  id: gitlink_repo_new_issue_journals_03
-  title: 项目内新建疑修评论接口 - notes为空
-  run: True
-  severity: normal
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/issues/${issue_index}/journals.json
-  method: POST
-  headers:
-    Content-Type: application/json; charset=utf-8;
-  cookies: ${cookies}
-  request_type: json
-  payload:
-    parent_id: 0    # 父评论ID 可选
-    reply_id:     # 回复评论ID 可选
-    attachment_ids:     # 评论附件ID 可选
-     - ${attachment_id}
-    receivers_login: []
-  files:
-  assert_response:
-      status_code: 200
-      assert_status:
-        message: 断言接口status=-1
-        expect_value: -1
-        assert_type: ==
-        type_jsonpath: $.status
-      assert_message:
-        message: 断言接口message
-        expect_value: Notes不能为空字符
-        assert_type: ==
-        type_jsonpath: $.message
-  assert_sql:
-  extract:
-  case_dependence:
-    setup:
-      interface: gitlink_repo_new_issue_01

interface/gitlink/projects/milestone/test_gitlink_repo_delete_milestone.yaml

@@ -4,7 +4,7 @@ case_common:
   allure_story: 里程碑
   case_markers:
    - gitlink
-   - repo
+   - projects
    - milestone
    - usefixtures: gitlink_login
 
@@ -14,7 +14,7 @@ case_info:
   title: 删除一个里程碑
   run: true
   severity: normal
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/milestones/${milestone_id}.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/milestones/${milestone_id}.json
   method: delete
   headers:
     Content-Type: application/json; charset=utf-8;
@@ -39,5 +39,7 @@ case_info:
   case_dependence:
     setup:
       interface:
-       - gitlink_repo_new_milestone_01
-       - gitlink_repo_get_milestone_list_02
+        # 前置条件：新建一个里程碑
+        - gitlink_repo_new_milestone_01
+        # 前置条件：获取刚刚新建里程碑的milestone_id
+        - gitlink_repo_get_milestone_list_02

interface/gitlink/projects/milestone/test_gitlink_repo_edit_milestone.yaml

@@ -4,7 +4,7 @@ case_common:
   allure_story: 里程碑
   case_markers:
    - gitlink
-   - repo
+   - projects
    - milestone
    - usefixtures: gitlink_login
 
@@ -14,7 +14,7 @@ case_info:
   title: 更新一个里程碑
   run: true
   severity: normal
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/milestones/${milestone_id}.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/milestones/${milestone_id}.json
   method: patch
   headers:
     Content-Type: application/json; charset=utf-8;
@@ -42,5 +42,7 @@ case_info:
   case_dependence:
     setup:
       interface:
-       - gitlink_repo_new_milestone_01
-       - gitlink_repo_get_milestone_list_02
+        # 前置条件：新建一个里程碑
+        - gitlink_repo_new_milestone_01
+        # 前置条件：获取刚刚新建里程碑的milestone_id
+        - gitlink_repo_get_milestone_list_02

interface/gitlink/projects/milestone/test_gitlink_repo_edit_milestone_status.yaml

@@ -4,7 +4,7 @@ case_common:
   allure_story: 里程碑
   case_markers:
    - gitlink
-   - repo
+   - projects
    - milestone
    - usefixtures: gitlink_login
 
@@ -14,7 +14,7 @@ case_info:
   title: 更新一个里程碑的状态 - 关闭里程碑
   run: true
   severity: normal
-  url: /api/${env_repo_owner}/${env_repo_identifier}/milestones/${milestone_id}/update_status.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/milestones/${milestone_id}/update_status.json
   method: POST
   headers:
     Content-Type: application/json; charset=utf-8;
@@ -22,7 +22,7 @@ case_info:
   request_type: json
   payload:
     id: ${milestone_id}
-    project_id: ${env_repo_identifier}
+    project_id: ${repo_identifier}
     status: closed
   files:
   assert_response:
@@ -42,8 +42,10 @@ case_info:
   case_dependence:
     setup:
       interface:
-       - gitlink_repo_new_milestone_01
-       - gitlink_repo_get_milestone_list_02
+        # 前置条件：新建一个里程碑
+        - gitlink_repo_new_milestone_01
+        # 前置条件：获取刚刚新建里程碑的milestone_id
+        - gitlink_repo_get_milestone_list_02
 
 
 -
@@ -51,7 +53,7 @@ case_info:
   title: 更新一个里程碑的状态 - 开启里程碑
   run: true
   severity: normal
-  url: /api/${env_repo_owner}/${env_repo_identifier}/milestones/${milestone_id}/update_status.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/milestones/${milestone_id}/update_status.json
   method: POST
   headers:
     Content-Type: application/json; charset=utf-8;
@@ -59,7 +61,7 @@ case_info:
   request_type: json
   payload:
     id: ${milestone_id}
-    project_id: ${env_repo_identifier}
+    project_id: ${repo_identifier}
     status: open
   files:
   assert_response:
@@ -79,5 +81,7 @@ case_info:
   case_dependence:
     setup:
       interface:
-       - gitlink_repo_new_milestone_01
-       - gitlink_repo_get_milestone_list_02
+        # 前置条件：新建一个里程碑
+        - gitlink_repo_new_milestone_01
+        # 前置条件：获取刚刚新建里程碑的milestone_id
+        - gitlink_repo_get_milestone_list_02

interface/gitlink/projects/milestone/test_gitlink_repo_get_milestone_list.yaml

@@ -4,7 +4,7 @@ case_common:
   allure_story: 里程碑
   case_markers:
    - gitlink
-   - repo
+   - projects
    - milestone
    - usefixtures: gitlink_login
 
@@ -14,7 +14,7 @@ case_info:
   title: 获取里程碑列表
   run: true
   severity: normal
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/milestones.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/milestones.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
@@ -45,7 +45,7 @@ case_info:
   title: 获取里程碑列表 - 开启状态的里程碑
   run: true
   severity: normal
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/milestones.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/milestones.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;

interface/gitlink/projects/milestone/test_gitlink_repo_new_milestone.yaml

@@ -4,7 +4,7 @@ case_common:
   allure_story: 里程碑
   case_markers:
    - gitlink
-   - repo
+   - projects
    - milestone
    - usefixtures: gitlink_login
 
@@ -14,7 +14,7 @@ case_info:
   title: 创建一个里程碑
   run: true
   severity: normal
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/milestones.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/milestones.json
   method: POST
   headers:
     Content-Type: application/json; charset=utf-8;

interface/gitlink/projects/pull_request/pull_request_journal/test_gitlink_repo_get_pull_request_journal_list.yaml

@@ -0,0 +1,62 @@
+case_common:
+  allure_epic: GitLink接口
+  allure_feature: 开源项目模块
+  allure_story: 合并请求-评论
+  case_markers:
+    - gitlink
+    - projects
+    - pr
+    - gitea
+    - usefixtures: gitlink_login
+
+# 前提是仓库存在2个不同的分支
+# 步骤说明
+# 1、项目开发者代码库新建文件，提交的分支新分支
+# 2、项目开发者从新分支向默认分支分支发起PR
+# 3、项目开发者访问PR详情， 获取合并请求评论列表
+# 后置数据清理：项目管理员登录，删除分支
+
+common_dependence:
+  setup:
+    interface:
+      # 前置条件：获取测试仓库的默认分支
+      - gitlink_get_repo_detail_full_01
+
+
+case_info:
+-
+  id: gitlink_repo_get_pull_request_journal_list_01
+  title: 获取合并请求评论列表
+  severity: normal
+  run: True
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/pulls/${pull_request_id}/journals.json
+  method: GET
+  headers:
+    Content-Type: application/json; charset=utf-8;
+    Cookie: ${cookies}
+  cookies:
+  request_type: params
+  payload:
+  files:
+  assert_response:
+      status_code: 200
+      assertFiled:
+        message: 断言接口返回存在total_count
+        expect_value: total_count
+        assert_type: contains
+  assert_sql:
+  extract:
+  case_dependence:
+    setup:
+      # 前置条件：创建的新文件名称
+      env_vars:
+        repo_file_path: test_${generate_words}.py
+      interface:
+        # 前置条件：代码库新建文件，提交的分支新分支
+        - gitlink_repo_create_files_05  # 创建新分支,同时获取branch name
+        # 前置条件：发起PR
+        - gitlink_repo_new_pull_request_01
+    teardown:
+      interface:
+        # 后置处理：删除分支
+        - gitlink_repo_delete_branch_01

interface/gitlink/projects/pull_request/pull_request_journal/test_gitlink_repo_new_pull_request_journal.yaml

@@ -0,0 +1,69 @@
+case_common:
+  allure_epic: GitLink接口
+  allure_feature: 开源项目模块
+  allure_story: 合并请求
+  case_markers:
+    - gitlink
+    - projects
+    - pr
+    - gitea
+    - usefixtures: gitlink_login
+    - skip: 参数不明确，后续再补充
+
+# 前提是仓库存在2个不同的分支
+# 步骤说明
+# 1、项目开发者代码库新建文件，提交的分支新分支
+# 2、项目开发者从新分支向默认分支分支发起PR
+# 3、项目开发者评论PR
+# 后置数据清理：项目管理员登录，删除分支
+
+case_info:
+  - id: gitlink_repo_new_pull_request_journal_01
+    title: 创建一个合并请求评论
+    severity:
+    run: false
+    url: /api/${init_repo_owner}/${init_repo_identifier}/pulls/${pull_request_id}/journals.json
+    method: POST
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${cookies}
+    cookies:
+    request_type: json
+    payload:
+      commit_id: str
+      diff: Diff
+      line_code: str
+      note: str
+      parent_id: int
+      path: str
+      review_id: str
+      type: str
+    files:
+    assert_response:
+      status_code: 200
+      assertStatus:
+        message: 断言接口返回status=0
+        expect_value: 0
+        assert_type: ==
+        type_jsonpath: $.status
+      assertMessage:
+        message: 断言接口返回message
+        expect_value: 响应成功
+        assert_type: ==
+        type_jsonpath: $.message
+    assert_sql:
+    extract:
+    case_dependence:
+      setup:
+        # 前置条件：创建的新文件名称
+        env_vars:
+          repo_file_path: test_${generate_words}.py
+        interface:
+          # 前置条件：代码库新建文件，提交的分支新分支
+          - gitlink_repo_create_files_05  # 创建新分支,同时获取branch name
+          # 前置条件：发起PR
+          - gitlink_repo_new_pull_request_01
+      teardown:
+        interface:
+          # 后置处理：删除分支
+          - gitlink_repo_delete_branch_01

interface/gitlink/projects/pull_request/test_gitlink_repo_edit_pull_request.yaml

@@ -4,44 +4,46 @@ case_common:
   allure_story: 合并请求
   case_markers:
     - gitlink
+    - projects
     - pr
     - gitea
     - usefixtures: gitlink_login
 
 # 前提是仓库存在2个不同的分支
 # 步骤说明
-# 1、从master分支创建一个新的分支
-# 2、修改新分支的README.md文件，确保新分支与master分支存在差异
-# 3、从新分支向master分支发起PR
-# 4、编辑合并请求
+# 1、项目开发者代码库新建文件，提交的分支新分支
+# 2、项目开发者从新分支向默认分支分支发起PR
+# 3、项目开发者编辑PR
+# 后置数据清理：项目管理员登录，删除分支
 
 common_dependence:
   setup:
-    env_vars:
-      repo_file_path: README.md
+    interface:
+      # 前置条件：获取测试仓库的默认分支
+      - gitlink_get_repo_detail_full_01
+
 
 case_info:
--
-  id: gitlink_repo_edit_pull_request_001
-  title: 更新一个合并请求
-  severity:
-  run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/pulls/${pull_request_id}.json
-  method: PUT
-  headers:
-    Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
-  request_type: json
-  payload:
-    title: update PR ${generate_words()}    # 合并请求标题
-    body: ${generate_paragraph()}   # 合并请求内容
-    head:  # 源分支
-    base: master     # 目标分支
-    receivers_login: []   # @人员的login
-    issue_tag_ids: []   # 标记ID数组
-  files:
-  assert_response:
+  - id: gitlink_repo_edit_pull_request_001
+    title: 更新一个合并请求, 更新成功
+    severity:
+    run: True
+    url: /api/${init_repo_owner}/${init_repo_identifier}/pulls/${pull_request_id}.json
+    method: PUT
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${cookies}
+    cookies:
+    request_type: json
+    payload:
+      title: update PR ${generate_words()}    # 合并请求标题
+      body: ${generate_paragraph()}   # 合并请求内容
+      head: ${head_branch} # 源分支
+      base: ${base_branch}     # 目标分支
+      receivers_login: [ ]   # @人员的login
+      issue_tag_ids: [ ]   # 标记ID数组
+    files:
+    assert_response:
       status_code: 200
       assertStatus:
         message: 断言接口返回status=0
@@ -53,16 +55,21 @@ case_info:
         expect_value: PullRequest更新成功
         assert_type: ==
         type_jsonpath: $.message
-  assert_sql:
-  extract:
-  case_dependence:
-    setup:
-      interface:
-        - gitlink_repo_new_branch_001  # 创建新分支,同时获取branch name
-        - gitlink_get_repo_readme_file_02   # 获取新分支readme文件的sha
-        - gitlink_repo_edit_files_02  # 修改新分支的readme文件的内容
-        - gitlink_repo_new_pull_request_001 # 新建合并请求
-    teardown:
-      interface:
-        - gitlink_super_login_04
-        - gitlink_repo_delete_branch_001
+    assert_sql:
+    extract:
+    case_dependence:
+      setup:
+        # 前置条件：创建的新文件名称
+        env_vars:
+          repo_file_path: test_${generate_words}.py
+        interface:
+          # 前置条件：代码库新建文件，提交的分支新分支
+          - gitlink_repo_create_files_05  # 创建新分支,同时获取branch name
+          # 前置条件：发起PR
+          - gitlink_repo_new_pull_request_01
+          # 前置条件：获取PR详情，如源分支，目标分支
+          - gitlink_repo_get_pull_request_detail_01
+      teardown:
+        interface:
+          # 后置处理：删除分支
+          - gitlink_repo_delete_branch_01

interface/gitlink/projects/pull_request/test_gitlink_repo_get_pull_request_commits_list.yaml

@@ -1,25 +1,32 @@
 case_common:
   allure_epic: GitLink接口
   allure_feature: 开源项目模块
-  allure_story: 合并请求
+  allure_story: 合并请求-提交
   case_markers:
     - gitlink
+    - projects
     - pr
     - gitea
     - usefixtures: gitlink_login
 
 
+common_dependence:
+  setup:
+    interface:
+      # 前置条件：获取测试仓库的默认分支
+      - gitlink_get_repo_detail_full_01
+
 case_info:
 -
   id: gitlink_repo_get_pull_request_commits_list_01
   title: 获取一个合并请求提交列表
   severity: normal
   run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/pulls/${pull_request_id}/commits.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/pulls/${pull_request_id}/commits.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: params
   payload:
@@ -34,4 +41,15 @@ case_info:
   extract:
   case_dependence:
     setup:
-      interface: gitlink_repo_get_pull_request_list_03
+      # 前置条件：创建的新文件名称
+      env_vars:
+        repo_file_path: test_${generate_words}.py
+      interface:
+        # 前置条件：代码库新建文件，提交的分支新分支
+        - gitlink_repo_create_files_05  # 创建新分支,同时获取branch name
+        # 前置条件：发起PR
+        - gitlink_repo_new_pull_request_01
+    teardown:
+      interface:
+        # 后置处理：删除分支
+        - gitlink_repo_delete_branch_01

interface/gitlink/projects/pull_request/test_gitlink_repo_get_pull_request_detail.yaml

@@ -4,10 +4,16 @@ case_common:
   allure_story: 合并请求
   case_markers:
     - gitlink
+    - projects
     - pr
     - gitea
     - usefixtures: gitlink_login
 
+common_dependence:
+  setup:
+    interface:
+      # 前置条件：获取测试仓库的默认分支
+      - gitlink_get_repo_detail_full_01
 
 case_info:
 -
@@ -15,29 +21,44 @@ case_info:
   title: 获取合并请求详情
   severity: normal
   run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/pulls/${pull_request_id}.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/pulls/${pull_request_id}.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: params
   payload:
   files:
   assert_response:
-      status_code: 200
-      assertStatus:
-        message: 断言接口返回status=0
-        expect_value: 0
-        assert_type: ==
-        type_jsonpath: $.status
-      assertMessage:
-        message: 断言接口返回message
-        expect_value: 响应成功
-        assert_type: ==
-        type_jsonpath: $.message
+    status_code: 200
+    assertStatus:
+      message: 断言接口返回status=0
+      expect_value: 0
+      assert_type: ==
+      type_jsonpath: $.status
+    assertMessage:
+      message: 断言接口返回message
+      expect_value: 响应成功
+      assert_type: ==
+      type_jsonpath: $.message
   assert_sql:
   extract:
+    response:
+      type_jsonpath:
+        head_branch: $.pull_request.head  # 源分支
+        base_branch: $.pull_request.base  # 目标分支
   case_dependence:
     setup:
-      interface: gitlink_repo_get_pull_request_list_03
+      # 前置条件：创建的新文件名称
+      env_vars:
+        repo_file_path: test_${generate_words}.py
+      interface:
+        # 前置条件：代码库新建文件（无父级目录），提交的分支新分支
+        - gitlink_repo_create_files_05  # 创建新分支,同时获取branch name
+        # 前置条件：发起PR
+        - gitlink_repo_new_pull_request_01
+    teardown:
+      interface:
+        # 后置处理：删除分支
+        - gitlink_repo_delete_branch_01

interface/gitlink/projects/pull_request/test_gitlink_repo_get_pull_request_files_list.yaml

@@ -1,13 +1,20 @@
 case_common:
   allure_epic: GitLink接口
   allure_feature: 开源项目模块
-  allure_story: 合并请求
+  allure_story: 合并请求-文件
   case_markers:
     - gitlink
+    - projects
     - pr
     - gitea
     - usefixtures: gitlink_login
 
+common_dependence:
+  setup:
+    interface:
+      # 前置条件：获取测试仓库的默认分支
+      - gitlink_get_repo_detail_full_01
+
 
 case_info:
 -
@@ -15,11 +22,11 @@ case_info:
   title: 获取一个合并请求变更文件列表
   severity: normal
   run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/pulls/${pull_request_id}/files.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/pulls/${pull_request_id}/files.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: params
   payload:
@@ -34,4 +41,15 @@ case_info:
   extract:
   case_dependence:
     setup:
-      interface: gitlink_repo_get_pull_request_list_03
+      # 前置条件：创建的新文件名称
+      env_vars:
+        repo_file_path: test_${generate_words}.py
+      interface:
+        # 前置条件：代码库新建文件，提交的分支新分支
+        - gitlink_repo_create_files_05  # 创建新分支,同时获取branch name
+        # 前置条件：发起PR
+        - gitlink_repo_new_pull_request_01
+    teardown:
+      interface:
+        # 后置处理：删除分支
+        - gitlink_repo_delete_branch_01

interface/gitlink/projects/pull_request/test_gitlink_repo_get_pull_request_journal_list.yaml

@@ -1,37 +0,0 @@
-case_common:
-  allure_epic: GitLink接口
-  allure_feature: 开源项目模块
-  allure_story: 合并请求
-  case_markers:
-    - gitlink
-    - pr
-    - gitea
-    - usefixtures: gitlink_login
-
-
-case_info:
--
-  id: gitlink_repo_get_pull_request_journal_list_01
-  title: 获取合并请求评论列表
-  severity: normal
-  run: True
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/pulls/${pull_request_id}/journals.json
-  method: GET
-  headers:
-    Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
-  request_type: params
-  payload:
-  files:
-  assert_response:
-      status_code: 200
-      assertFiled:
-        message: 断言接口返回存在total_count
-        expect_value: total_count
-        assert_type: contains
-  assert_sql:
-  extract:
-  case_dependence:
-    setup:
-      interface: gitlink_repo_get_pull_request_list_03

interface/gitlink/projects/pull_request/test_gitlink_repo_get_pull_request_list.yaml

@@ -4,6 +4,7 @@ case_common:
   allure_story: 合并请求
   case_markers:
     - gitlink
+    - projects
     - pr
     - gitea
     - usefixtures: gitlink_login
@@ -14,11 +15,11 @@ case_info:
   title: 获取合并请求列表 (全部状态)
   severity: normal
   run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/pulls.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/pulls.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: params
   payload:
@@ -46,11 +47,11 @@ case_info:
   title: 获取合并请求列表 (开启中状态)
   severity: normal
   run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/pulls.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/pulls.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: params
   payload:
@@ -81,11 +82,11 @@ case_info:
   title: 获取合并请求列表 (根据关键字搜索)
   severity: normal
   run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/pulls.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/pulls.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: params
   payload:

interface/gitlink/projects/pull_request/test_gitlink_repo_get_pull_request_reviews_list.yaml

@@ -1,13 +1,20 @@
 case_common:
   allure_epic: GitLink接口
   allure_feature: 开源项目模块
-  allure_story: 合并请求
+  allure_story: 合并请求-代码评审
   case_markers:
     - gitlink
+    - projects
     - pr
     - gitea
     - usefixtures: gitlink_login
 
+common_dependence:
+  setup:
+    interface:
+      # 前置条件：获取测试仓库的默认分支
+      - gitlink_get_repo_detail_full_01
+
 
 case_info:
 -
@@ -15,11 +22,11 @@ case_info:
   title: 获取合并请求审查列表
   severity: normal
   run: True
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/pulls/${pull_request_id}/reviews.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/pulls/${pull_request_id}/reviews.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: params
   payload:
@@ -34,4 +41,15 @@ case_info:
   extract:
   case_dependence:
     setup:
-      interface: gitlink_repo_get_pull_request_list_03
+      # 前置条件：创建的新文件名称
+      env_vars:
+        repo_file_path: test_${generate_words}.py
+      interface:
+        # 前置条件：代码库新建文件，提交的分支新分支
+        - gitlink_repo_create_files_05  # 创建新分支,同时获取branch name
+        # 前置条件：发起PR
+        - gitlink_repo_new_pull_request_01
+    teardown:
+      interface:
+        # 后置处理：删除分支
+        - gitlink_repo_delete_branch_01

interface/gitlink/projects/pull_request/test_gitlink_repo_get_pull_request_version_diff.yaml

@@ -1,13 +1,20 @@
 case_common:
   allure_epic: GitLink接口
   allure_feature: 开源项目模块
-  allure_story: 合并请求
+  allure_story: 合并请求-代码评审
   case_markers:
     - gitlink
+    - projects
     - pr
     - gitea
     - usefixtures: gitlink_login
 
+common_dependence:
+  setup:
+    interface:
+      # 前置条件：获取测试仓库的默认分支
+      - gitlink_get_repo_detail_full_01
+
 
 case_info:
 -
@@ -15,11 +22,11 @@ case_info:
   title: 获取合并请求版本之间的Diff
   severity: normal
   run: True
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/pulls/${pull_request_id}/versions/${version_id}/diff.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/pulls/${pull_request_id}/versions/${version_id}/diff.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: params
   payload:
@@ -34,6 +41,17 @@ case_info:
   extract:
   case_dependence:
     setup:
+      # 前置条件：创建的新文件名称
+      env_vars:
+        repo_file_path: test_${generate_words}.py
       interface:
-        - gitlink_repo_get_pull_request_list_03
-        - gitlink_repo_get_pull_request_versions_list_01
+        # 前置条件：代码库新建文件，提交的分支新分支
+        - gitlink_repo_create_files_05  # 创建新分支,同时获取branch name
+        # 前置条件：发起PR
+        - gitlink_repo_new_pull_request_01
+        # 前置条件：获取version_id
+        - gitlink_repo_get_pull_request_versions_list_01
+    teardown:
+      interface:
+        # 后置处理：删除分支
+        - gitlink_repo_delete_branch_01

interface/gitlink/projects/pull_request/test_gitlink_repo_get_pull_request_version_list.yaml

@@ -1,13 +1,20 @@
 case_common:
   allure_epic: GitLink接口
   allure_feature: 开源项目模块
-  allure_story: 合并请求
+  allure_story: 合并请求-代码评审
   case_markers:
     - gitlink
+    - projects
     - pr
     - gitea
     - usefixtures: gitlink_login
 
+common_dependence:
+  setup:
+    interface:
+      # 前置条件：获取测试仓库的默认分支
+      - gitlink_get_repo_detail_full_01
+
 
 case_info:
 -
@@ -15,11 +22,11 @@ case_info:
   title: 获取合并请求版本列表
   severity: normal
   run: True
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/pulls/${pull_request_id}/versions.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/pulls/${pull_request_id}/versions.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: params
   payload:
@@ -36,4 +43,15 @@ case_info:
       version_id: $.versions[0].id
   case_dependence:
     setup:
-      interface: gitlink_repo_get_pull_request_list_03
+      # 前置条件：创建的新文件名称
+      env_vars:
+        repo_file_path: test_${generate_words}.py
+      interface:
+        # 前置条件：代码库新建文件，提交的分支新分支
+        - gitlink_repo_create_files_05  # 创建新分支,同时获取branch name
+        # 前置条件：发起PR
+        - gitlink_repo_new_pull_request_01
+    teardown:
+      interface:
+        # 后置处理：删除分支
+        - gitlink_repo_delete_branch_01

interface/gitlink/projects/pull_request/test_gitlink_repo_new_pull_request.yaml

@@ -4,51 +4,53 @@ case_common:
   allure_story: 合并请求
   case_markers:
     - gitlink
+    - projects
     - pr
     - gitea
     - usefixtures: gitlink_login
 
 # 前提是仓库存在2个不同的分支
 # 步骤说明
-# 1、从master分支创建一个新的分支
-# 2、修改新分支的README.md文件，确保新分支与master分支存在差异
-# 3、从新分支向master分支发起PR
+# 1、项目开发者代码库新建文件，提交的分支新分支
+# 2、项目开发者从新分支向默认分支分支发起PR
+# 后置数据清理：项目管理员登录，删除分支
+
 
 common_dependence:
   setup:
-    env_vars:
-      repo_file_path: README.md
+    interface:
+      # 前置条件：获取测试仓库的默认分支
+      - gitlink_get_repo_detail_full_01
 
 case_info:
--
-  id: gitlink_repo_new_pull_request_001
-  title: 创建一个合并请求， 从新分支向master分支发起PR
-  severity:
-  run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/pulls.json
-  method: POST
-  headers:
-    Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
-  request_type: json
-  payload:
-    title: New Merge - ${generate_words()}    # 合并请求标题
-    body: ${generate_paragraph()}   # 合并请求内容
-    head:  ${branch_name}  # 源分支
-    base: master     # 目标分支
-    is_original: false   # 是否为fork仓库发来的合并请求
-    fork_project_id:   # fork仓库ID
-    merge_project_identifier:
-    files_count: 1
-    commits_count: 1
-    receivers_login: []   # @人员的login
-    issue_tag_ids: []   # 标记ID数组
-    assigned_to_id: # 指派人员ID
-    fixed_version_id: # 里程碑ID
-    priority_id: # 优先级ID
-  files:
-  assert_response:
+  - id: gitlink_repo_new_pull_request_01
+    title: 创建一个合并请求， 从新分支向默认分支发起PR
+    severity:
+    run: True
+    url: /api/${init_repo_owner}/${init_repo_identifier}/pulls.json
+    method: POST
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${cookies}
+    cookies:
+    request_type: json
+    payload:
+      title: New Merge - ${generate_words()}    # 合并请求标题
+      body: ${generate_paragraph()}   # 合并请求内容
+      head: ${branch_name}  # 源分支
+      base: ${default_branch}     # 目标分支
+      is_original: false   # 是否为fork仓库发来的合并请求
+      fork_project_id:   # fork仓库ID
+      merge_project_identifier:
+      files_count: 1
+      commits_count: 1
+      receivers_login: [ ]   # @人员的login
+      issue_tag_ids: [ ]   # 标记ID数组
+      assigned_to_id: # 指派人员ID
+      fixed_version_id: # 里程碑ID
+      priority_id: # 优先级ID
+    files:
+    assert_response:
       status_code: 200
       assertStatus:
         message: 断言接口返回status=0
@@ -60,13 +62,19 @@ case_info:
         expect_value: 响应成功
         assert_type: ==
         type_jsonpath: $.message
-  assert_sql:
-  extract:
-    type_jsonpath:
-      pull_request_id: $.pull_request_id
-  case_dependence:
-    setup:
-      interface:
-        - gitlink_repo_new_branch_001  # 创建新分支,同时获取branch name
-        - gitlink_get_repo_readme_file_02   # 获取新分支readme文件的sha
-        - gitlink_repo_edit_files_02  # 修改新分支的readme文件的内容
+    assert_sql:
+    extract:
+      type_jsonpath:
+        pull_request_id: $.pull_request_id
+    case_dependence:
+      setup:
+        # 前置条件：创建的新文件名称
+        env_vars:
+          repo_file_path: test_${generate_words}.py
+        interface:
+          # 代码库新建文件，提交的分支新分支
+          - gitlink_repo_create_files_05  # 创建新分支,同时获取branch name
+      teardown:
+        interface:
+          # 后置处理：删除分支
+          - gitlink_repo_delete_branch_01

interface/gitlink/projects/pull_request/test_gitlink_repo_new_pull_request_journal.yaml

@@ -1,55 +0,0 @@
-case_common:
-  allure_epic: GitLink接口
-  allure_feature: 开源项目模块
-  allure_story: 合并请求
-  case_markers:
-    - gitlink
-    - pr
-    - gitea
-    - usefixtures: gitlink_login
-    - skip: 参数不明确，后续再补充
-
-
-case_info:
--
-  id: gitlink_repo_new_pull_request_journal_01
-  title: 创建一个合并请求评论
-  severity:
-  run: false
-  url: /api/${env_repo_owner}/${env_repo_identifier}/pulls/${pull_request_id}/journals.json
-  method: POST
-  headers:
-    Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
-  request_type: json
-  payload:
-    commit_id: str
-    diff: Diff
-    line_code: str
-    note: str
-    parent_id: int
-    path: str
-    review_id: str
-    type: str
-  files:
-  assert_response:
-      status_code: 200
-      assertStatus:
-        message: 断言接口返回status=0
-        expect_value: 0
-        assert_type: ==
-        type_jsonpath: $.status
-      assertMessage:
-        message: 断言接口返回message
-        expect_value: 响应成功
-        assert_type: ==
-        type_jsonpath: $.message
-  assert_sql:
-  extract:
-    type_jsonpath:
-      pull_request_id: $.pull_request_id
-  case_dependence:
-    setup:
-      interface:
-        - gitlink_repo_get_pull_request_list_03  #

interface/gitlink/projects/pull_request/test_gitlink_repo_pr_merge.yaml

@@ -1,24 +1,20 @@
 case_common:
   allure_epic: GitLink接口
   allure_feature: 开源项目模块
-  allure_story: 合并请求
+  allure_story: 合并请求-合并
   case_markers:
     - gitlink
+    - projects
     - pr
     - gitea
     - usefixtures: gitlink_login
 
 # 前提是仓库存在2个不同的分支
 # 步骤说明
-# 1、从master分支创建一个新的分支
-# 2、修改新分支的README.md文件，确保新分支与master分支存在差异
-# 3、从新分支向master分支发起PR
-# 4、合并合并请求
-
-common_dependence:
-  setup:
-    env_vars:
-      repo_file_path: README.md
+# 1、项目开发者代码库新建文件，提交的分支新分支
+# 2、项目开发者从新分支向默认分支分支发起PR
+# 3、项目管理员合并PR
+# 后置数据清理：项目管理员登录，删除分支
 
 
 case_info:
@@ -27,15 +23,15 @@ case_info:
   title: 合并一个合并请求
   severity:
   run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/pulls/${pull_request_id}/pr_merge.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/pulls/${pull_request_id}/pr_merge.json
   method: POST
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${admin_cookies}
   cookies:
   request_type: json
   payload:
-    project_id: ${env_repo_identifier}   # 项目标识
+    project_id: ${init_repo_identifier}   # 项目标识
     id: ${pull_request_id}    # 合并请求id
     do: merge
     title: ${generate_words()}
@@ -57,12 +53,16 @@ case_info:
   extract:
   case_dependence:
     setup:
+      # 前置条件：创建的新文件名称
+      env_vars:
+        repo_file_path: test_${generate_words}.py
       interface:
-        - gitlink_repo_new_branch_001  # 创建新分支,同时获取branch name
-        - gitlink_get_repo_readme_file_02   # 获取新分支readme文件的sha
-        - gitlink_repo_edit_files_02  # 修改新分支的readme文件的内容
-        - gitlink_repo_new_pull_request_001 # 新建合并请求
+        # 前置条件：代码库新建文件，提交的分支新分支
+        - gitlink_repo_create_files_05  # 创建新分支,同时获取branch name
+        # 前置条件：发起PR
+        - gitlink_repo_new_pull_request_01
     teardown:
       interface:
-        - gitlink_super_login_04
-        - gitlink_repo_delete_branch_001
+        # 后置处理：删除分支
+        - gitlink_repo_delete_branch_01
+

interface/gitlink/projects/pull_request/test_gitlink_repo_refuse_merge.yaml

@@ -1,41 +1,37 @@
 case_common:
   allure_epic: GitLink接口
   allure_feature: 开源项目模块
-  allure_story: 合并请求
+  allure_story: 合并请求-拒绝
   case_markers:
     - gitlink
+    - projects
     - pr
     - gitea
     - usefixtures: gitlink_login
 
 # 前提是仓库存在2个不同的分支
 # 步骤说明
-# 1、从master分支创建一个新的分支
-# 2、修改新分支的README.md文件，确保新分支与master分支存在差异
-# 3、从新分支向master分支发起PR
-# 4、拒绝合并请求
+# 1、项目开发者代码库新建文件，提交的分支新分支
+# 2、项目开发者从新分支向默认分支分支发起PR
+# 3、项目管理员拒绝PR
+# 后置数据清理：项目管理员登录，删除分支
 
-common_dependence:
-  setup:
-    env_vars:
-      repo_file_path: README.md
 
 case_info:
--
-  id: gitlink_repo_refuse_merge_001
-  title: 拒绝一个合并请求
-  severity:
-  run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/pulls/${pull_request_id}/refuse_merge.json
-  method: POST
-  headers:
-    Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
-  request_type: json
-  payload:
-  files:
-  assert_response:
+  - id: gitlink_repo_refuse_merge_001
+    title: 项目管理员拒绝一个合并请求， 拒绝成功
+    severity:
+    run: True
+    url: /api/${init_repo_owner}/${init_repo_identifier}/pulls/${pull_request_id}/refuse_merge.json
+    method: POST
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${admin_cookies}
+    cookies:
+    request_type: json
+    payload:
+    files:
+    assert_response:
       status_code: 200
       assertStatus:
         message: 断言接口返回status=1
@@ -47,16 +43,19 @@ case_info:
         expect_value: 已拒绝
         assert_type: ==
         type_jsonpath: $.message
-  assert_sql:
-  extract:
-  case_dependence:
-    setup:
-      interface:
-        - gitlink_repo_new_branch_001  # 创建新分支,同时获取branch name
-        - gitlink_get_repo_readme_file_02   # 获取新分支readme文件的sha
-        - gitlink_repo_edit_files_02  # 修改新分支的readme文件的内容
-        - gitlink_repo_new_pull_request_001 # 新建合并请求
-    teardown:
-      interface:
-        - gitlink_super_login_04
-        - gitlink_repo_delete_branch_001
+    assert_sql:
+    extract:
+    case_dependence:
+      setup:
+        # 前置条件：创建的新文件名称
+        env_vars:
+          repo_file_path: test_${generate_words}.py
+        interface:
+          # 前置条件：代码库新建文件，提交的分支新分支
+          - gitlink_repo_create_files_05  # 创建新分支,同时获取branch name
+          # 前置条件：发起PR
+          - gitlink_repo_new_pull_request_01
+      teardown:
+        interface:
+          # 后置处理：删除分支
+          - gitlink_repo_delete_branch_01

interface/gitlink/projects/releases/test_gitlink_repo_delete_releases.yaml

@@ -4,21 +4,22 @@ case_common:
   allure_story: 发行版
   case_markers:
     - gitlink
+    - projects
     - release
     - gitea
     - usefixtures: gitlink_login
 
 case_info:
 -
-  id: gitlink_repo_delete_release_001
+  id: gitlink_repo_delete_release_01
   title: 删除发行版
   severity: critical
   run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/releases/${release_id}.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/releases/${release_id}.json
   method: DELETE
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:
@@ -40,5 +41,11 @@ case_info:
   case_dependence:
     setup:
       interface:
-        - gitlink_repo_new_release_001
-        - gitlink_repo_get_release_list_001
+        # 前置条件：创建发行版
+        - gitlink_repo_new_release_01
+        # 前置条件：获取发行版的相关信息, 如：release_id
+        - gitlink_repo_get_release_list_01
+    teardown:
+      interface:
+        # 后置处理：删除标记
+        - gitlink_repo_delete_tag_01

interface/gitlink/projects/releases/test_gitlink_repo_edit_releases.yaml

@@ -4,31 +4,31 @@ case_common:
   allure_story: 发行版
   case_markers:
     - gitlink
+    - projects
     - release
     - gitea
     - usefixtures: gitlink_login
 
 case_info:
 -
-  id: gitlink_repo_edit_release_001
-  title: 编辑发行版
+  id: gitlink_repo_edit_release_01
+  title: 编辑发行版， 编辑成功
   severity: critical
   run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/releases/${release_id}.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/releases/${release_id}.json
   method: PUT
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:
-    tag_name: ${generate_identifier()}   # 标签
+    tag_name: ${release_tag_name}   # 标签
     name: ${generate_words()}  # 发行版标题
     body: ${generate_words()}  # 发行版描述
-    target_commitish: master   # 分支
+    target_commitish: ${release_target_commitish}   # 分支
     prerelease: false  # 是否为预发布版
     attachment_ids:    # 附件ID数组
-      - ${attachment_id}
   files:
   assert_response:
       status_code: 200
@@ -47,9 +47,13 @@ case_info:
   case_dependence:
     setup:
       interface:
-        - gitlink_repo_new_release_001
-        - gitlink_repo_get_release_list_001
-        - gitlink_upload_file_01
+        # 前置条件：创建发行版
+        - gitlink_repo_new_release_01
+        # 前置条件：获取发行版的相关信息, 如：release_id
+        - gitlink_repo_get_release_list_01
     teardown:
       interface:
-        - gitlink_repo_delete_release_001
+        # 后置处理：删除发行版
+        - gitlink_repo_delete_release_01
+        # 后置处理：删除标记
+        - gitlink_repo_delete_tag_01

interface/gitlink/projects/releases/test_gitlink_repo_get_releases_detail.yaml

@@ -10,15 +10,15 @@ case_common:
 
 case_info:
 -
-  id: gitlink_repo_get_release_detail_001
+  id: gitlink_repo_get_release_detail_01
   title: 获取发行版详情
   severity: normal
   run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/releases/${release_id}.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/releases/${release_id}.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:
@@ -35,8 +35,13 @@ case_info:
   case_dependence:
     setup:
       interface:
-        - gitlink_repo_new_release_001
-        - gitlink_repo_get_release_list_001
+        # 前置条件：创建发行版
+        - gitlink_repo_new_release_01
+        # 前置条件：获取发行版的相关信息, 如：release_id
+        - gitlink_repo_get_release_list_01
     teardown:
       interface:
-        - gitlink_repo_delete_release_001
+        # 后置处理：删除发行版
+        - gitlink_repo_delete_release_01
+        # 后置处理：删除标记
+        - gitlink_repo_delete_tag_01

interface/gitlink/projects/releases/test_gitlink_repo_get_releases_list.yaml

@@ -4,21 +4,22 @@ case_common:
   allure_story: 发行版
   case_markers:
     - gitlink
+    - projects
     - release
     - gitea
     - usefixtures: gitlink_login
 
 case_info:
 -
-  id: gitlink_repo_get_release_list_001
+  id: gitlink_repo_get_release_list_01
   title: 获取发行版列表
   severity: normal
   run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/releases.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/releases.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:
@@ -38,4 +39,6 @@ case_info:
   assert_sql:
   extract:
     type_jsonpath:
-      release_id: $.releases[0].version_id
+      release_id: $.releases[?(@.name =='${release_name}')].version_id
+      release_target_commitish: $.releases[?(@.name =='${release_name}')].target_commitish
+      release_tag_name: $.releases[?(@.name =='${release_name}')].tag_name

interface/gitlink/projects/releases/test_gitlink_repo_new_releases.yaml

@@ -4,28 +4,35 @@ case_common:
   allure_story: 发行版
   case_markers:
     - gitlink
+    - projects
     - release
     - gitea
     - usefixtures: gitlink_login
 
+common_dependence:
+  setup:
+    interface:
+      # 前置条件：获取测试仓库的默认分支
+      - gitlink_get_repo_detail_full_01
+
 case_info:
 -
-  id: gitlink_repo_new_release_001
-  title: 创建发行版
-  severity: critial
+  id: gitlink_repo_new_release_01
+  title: 在默认分支创建发行版（无附件），创建成功
+  severity: critical
   run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/releases.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/releases.json
   method: POST
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:
     tag_name: ${generate_identifier()}   # 标签
     name: ${generate_words()}  # 发行版标题
     body: ${generate_words()}  # 发行版描述
-    target_commitish: master   # 分支
+    target_commitish: ${default_branch}   # 分支，可选，默认为master
     draft: false  # 是否为草稿
     prerelease: false  # 是否为预发布版
     attachment_ids:    # 附件ID数组
@@ -44,8 +51,68 @@ case_info:
         type_jsonpath: $.message
   assert_sql:
   extract:
+    case:
+      type_jsonpath:
+        release_name: $.payload.name
+        tag_name: $.payload.tag_name
   case_dependence:
     teardown:
       interface:
-        - gitlink_repo_get_release_list_001
-        - gitlink_repo_delete_release_001
+        # 后置处理：获取刚刚创建的发行版id
+        - gitlink_repo_get_release_list_01
+        # 后置处理：删除发行版
+        - gitlink_repo_delete_release_01
+
+-
+  id: gitlink_repo_new_release_01
+  title: 在默认分支创建发行版（有附件），创建成功
+  severity: critical
+  run: True
+  url: /api/${init_repo_owner}/${init_repo_identifier}/releases.json
+  method: POST
+  headers:
+    Content-Type: application/json; charset=utf-8;
+    Cookie: ${cookies}
+  cookies:
+  request_type: json
+  payload:
+    tag_name: ${generate_identifier()}   # 标签
+    name: ${generate_words()}  # 发行版标题
+    body: ${generate_words()}  # 发行版描述
+    target_commitish: ${default_branch}   # 分支，可选，默认为master
+    draft: false  # 是否为草稿
+    prerelease: false  # 是否为预发布版
+    attachment_ids:    # 附件ID数组
+      - ${attachment_id}
+  files:
+  assert_response:
+      status_code: 200
+      assertStatus:
+        message: 断言接口返回status=0
+        expect_value: 0
+        assert_type: ==
+        type_jsonpath: $.status
+      assertMessage:
+        message: 断言接口返回message
+        expect_value: 发布成功
+        assert_type: ==
+        type_jsonpath: $.message
+  assert_sql:
+  extract:
+    case:
+      type_jsonpath:
+        release_name: $.payload.name
+        tag_name: $.payload.tag_name
+  case_dependence:
+    setup:
+      interface:
+        # 前置条件：上传附件，获取attachment_id
+        - gitlink_upload_file_01
+    teardown:
+      interface:
+        # 后置处理：获取刚刚创建的发行版id
+        - gitlink_repo_get_release_list_01
+        # 后置处理：删除发行版
+        - gitlink_repo_delete_release_01
+        # 后置处理：删除标记
+        - gitlink_repo_delete_tag_01

interface/gitlink/projects/repository/test_gitlink_get_repo_detail_full.yaml

@@ -4,7 +4,8 @@ case_common:
   allure_story: 代码库
   case_markers:
     - gitlink
-    - project_detail
+    - projects
+    - repo
     - gitea
     - usefixtures: gitlink_login
 
@@ -12,13 +13,13 @@ case_info:
 -
   id: gitlink_get_repo_detail_full_01
   title: 项目详情
-  severity:
+  severity: critical
   run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/detail.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/detail.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: params
   payload:
@@ -34,4 +35,5 @@ case_info:
     type_jsonpath:
       repo_project_name: $.name
       repo_private: $.private
+      default_branch: $.default_branch
 

interface/gitlink/projects/repository/test_gitlink_get_repo_entries.yaml

@@ -4,35 +4,41 @@ case_common:
   allure_story: 代码库
   case_markers:
     - gitlink
-    - repo_entries
+    - projects
+    - repo
     - gitea
     - usefixtures: gitlink_login
 
+common_dependence:
+  setup:
+    interface:
+      # 前置条件：获取测试仓库的默认分支
+      - gitlink_get_repo_detail_full_01
+
 case_info:
--
-  id: gitlink_get_repo_entries_01
-  title: 获取master项目代码目录
-  severity:
-  run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/entries.json
-  method: GET
-  headers:
-    Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
-  request_type: params
-  payload:
-    ref: master
-  files:
-  assert_response:
+  - id: gitlink_get_repo_entries_01
+    title: 获取项目默认分支的代码目录
+    severity: critical
+    run: True
+    url: /api/${init_repo_owner}/${init_repo_identifier}/entries.json
+    method: GET
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${cookies}
+    cookies:
+    request_type: params
+    payload:
+      ref: ${default_branch}
+    files:
+    assert_response:
       status_code: 200
       assertAutor:
         message: 断言接口返回存在entries字段
         assert_type: contains
         expect_value: entries
-  assert_sql:
-  extract:
-    type_jsonpath:
-      get_repo_file_path: $.entries[?(@.type =='file')].path
-      get_repo_file_sha: $.entries[?(@.type =='file')].sha
-      get_repo_dir_name: $.entries[?(@.type =='dir')].name
+    assert_sql:
+    extract:
+      type_jsonpath:
+        get_repo_file_path: $.entries[?(@.type =='file')].path
+        get_repo_file_sha: $.entries[?(@.type =='file')].sha
+        get_repo_dir_name: $.entries[?(@.type =='dir')].name

interface/gitlink/projects/repository/test_gitlink_get_repo_readme_file.yaml

@@ -4,65 +4,77 @@ case_common:
   allure_story: 代码库
   case_markers:
     - gitlink
-    - project_detail
+    - projects
+    - repo
     - gitea
     - usefixtures: gitlink_login
 
+
+common_dependence:
+  setup:
+    interface:
+      # 前置条件：获取测试仓库的默认分支
+      - gitlink_get_repo_detail_full_01
+
+
 case_info:
--
-  id: gitlink_get_repo_readme_file_01
-  title: 获取项目README文件 - master分支
-  severity: normal
-  run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/readme.json
-  method: GET
-  headers:
-    Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
-  request_type: params
-  payload:
-  files:
-  assert_response:
+  - id: gitlink_get_repo_default_branch_readme_file_01
+    title: 获取项目README文件 - 默认分支
+    severity: normal
+    run: True
+    url: /api/${init_repo_owner}/${init_repo_identifier}/readme.json
+    method: GET
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${cookies}
+    cookies:
+    request_type: params
+    payload:
+    files:
+    assert_response:
       status_code: 200
       assertName:
         message: 断言接口name
         assert_type: ==
         expect_value: README.md
         type_jsonpath: $.name
-  assert_sql:
-  extract:
-    type_jsonpath:
-      repo_file_sha: $.sha
+    assert_sql:
+    extract:
+      type_jsonpath:
+        repo_readme_sha: $.sha
 
 
--
-  id: gitlink_get_repo_readme_file_02
-  title: 获取项目README文件 - 指定分支
-  severity: normal
-  run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/readme.json
-  method: GET
-  headers:
-    Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
-  request_type: params
-  payload:
-    ref: ${branch_name}
-  files:
-  assert_response:
+  - id: gitlink_get_repo_other_branch_readme_file_02
+    title: 获取项目README文件 - 指定分支
+    severity: normal
+    run: True
+    url: /api/${init_repo_owner}/${init_repo_identifier}/readme.json
+    method: GET
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${cookies}
+    cookies:
+    request_type: params
+    payload:
+      ref: ${branch_name}
+    files:
+    assert_response:
       status_code: 200
       assertName:
         message: 断言接口name
         assert_type: ==
         expect_value: README.md
         type_jsonpath: $.name
-  assert_sql:
-  extract:
-    type_jsonpath:
-      repo_file_sha: $.sha
-  case_dependence:
-    setup:
-      interface:
-        - gitlink_get_repo_branches_by_keyword_01
+    assert_sql:
+    extract:
+      type_jsonpath:
+        repo_readme_sha: $.sha
+    case_dependence:
+      setup:
+        interface:
+          # 前置条件：新建分支
+          - gitlink_repo_new_branch_01
+      teardown:
+        interface:
+          # 后置处理：删除分支
+          - gitlink_repo_delete_branch_01

interface/gitlink/projects/repository/test_gitlink_get_repo_simple.yaml

@@ -4,7 +4,8 @@ case_common:
   allure_story: 代码库
   case_markers:
     - gitlink
-    - project_simple
+    - projects
+    - repo
     - gitea
     - usefixtures: gitlink_login
 
@@ -12,13 +13,13 @@ case_info:
 -
   id: gitlink_get_repo_simple_01
   title: 项目详情（简版）
-  severity:
+  severity: critical
   run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/simple.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/simple.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: params
   payload:

interface/gitlink/projects/repository/test_gitlink_get_repo_sub_entries.yaml

@@ -4,26 +4,34 @@ case_common:
   allure_story: 代码库
   case_markers:
     - gitlink
-    - repo_sub_entries
+    - projects
+    - repo
     - gitea
     - usefixtures: gitlink_login
 
+common_dependence:
+  setup:
+    interface:
+      # 前置条件：获取测试仓库的默认分支
+      - gitlink_get_repo_detail_full_01
+
 case_info:
 -
-  id: gitlink_get_repo_sub_entries_001
-  title: 获取项目代码子目录或者文件
-  severity:
+  id: gitlink_get_repo_sub_entries_01
+  title: 获取项目默认分支的代码子目录或者文件
+  severity: critical
   run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/sub_entries.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/sub_entries.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: params
   payload:
-    ref: master
-    filepath: ${${get_repo_dir_name}[0]}   # 必填参数
+    ref: ${default_branch}
+    filepath: ${repo_file_path}  # 必填参数
+    type: dir # dir表示目录
   files:
   assert_response:
       status_code: 200
@@ -35,72 +43,49 @@ case_info:
   extract:
   case_dependence:
     setup:
+      # 前置条件：初始化文件目录
       env_vars:
-        repo_file_path: ${generate_words}_${generate_identifier}/login_demo.yaml
-        local_file_path: login_demo.yaml
+        repo_file_dir: ${generate_words}_${generate_identifier}
       interface:
-        - gitlink_repo_create_files_02
-        - gitlink_get_repo_entries_01
+        # 前置条件：代码库上传文件(有父级目录)，提交的分支是默认分支
+        - gitlink_repo_upload_files_02
     teardown:
+      # 后置处理：删除默认分支分支文件（无父级目录）
+      interface: gitlink_repo_delete_files_02
+
+
+-
+  id: gitlink_get_repo_sub_entries_02
+  title: 获取项目默认分支的某个文件信息
+  severity: critical
+  run: True
+  url: /api/${init_repo_owner}/${init_repo_identifier}/sub_entries.json
+  method: GET
+  headers:
+    Content-Type: application/json; charset=utf-8;
+    Cookie: ${cookies}
+  cookies:
+  request_type: params
+  payload:
+    ref: ${default_branch}
+    filepath: ${repo_file_name}   # 必填参数
+    type: file  # file表示文件
+  files:
+  assert_response:
+      status_code: 200
+      assertAutor:
+        message: 断言接口返回存在entries字段
+        assert_type: contains
+        expect_value: entries
+  assert_sql:
+  extract:
+    type_jsonpath:
+      repo_file_sha: $.entries.sha
+  case_dependence:
+    setup:
+      interface:
+        # 前置条件：代码库上传文件(无父级目录)，提交的分支是默认分支
+        - gitlink_repo_upload_files_01
+    teardown:
+      # 后置处理：删除默认分支分支文件（无父级目录）
       interface: gitlink_repo_delete_files_01
-
-
--
-  id: gitlink_get_repo_sub_entries_002
-  title: 获取某个文件信息
-  severity:
-  run: False
-  url: /api/${env_repo_owner}/${env_repo_identifier}/sub_entries.json
-  method: GET
-  headers:
-    Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
-  request_type: params
-  payload:
-    ref: master
-    filepath: ${repo_file_path}   # 必填参数
-    type: file
-  files:
-  assert_response:
-      status_code: 200
-      assertAutor:
-        message: 断言接口返回存在entries字段
-        assert_type: contains
-        expect_value: entries
-  assert_sql:
-  extract:
-    type_jsonpath:
-      repo_file_sha: $.entries.sha
-  case_dependence:
-
-
--
-  id: gitlink_get_repo_sub_entries_003
-  title: 获取替换后的文件信息
-  severity:
-  run: False
-  url: /api/${env_repo_owner}/${env_repo_identifier}/sub_entries.json
-  method: GET
-  headers:
-    Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
-  request_type: params
-  payload:
-    ref: master
-    filepath: ${replace_file_path}   # 必填参数
-    type: file
-  files:
-  assert_response:
-      status_code: 200
-      assertAutor:
-        message: 断言接口返回存在entries字段
-        assert_type: contains
-        expect_value: entries
-  assert_sql:
-  extract:
-    type_jsonpath:
-      repo_file_sha: $.entries.sha
-      repo_file_path: $.entries.path
-  case_dependence:

interface/gitlink/projects/repository/test_gitlink_repo_contributors.yaml

@@ -4,21 +4,22 @@ case_common:
   allure_story: 代码库
   case_markers:
     - gitlink
-    - repo_contributors
+    - projects
+    - repo
     - gitea
     - usefixtures: gitlink_login
 
 case_info:
 -
-  id: gitlink_repo_contributors_001
+  id: gitlink_repo_contributors_01
   title: 获取项目贡献者列表
-  severity:
+  severity: critical
   run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/contributors.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/contributors.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: params
   payload:

interface/gitlink/projects/repository/test_gitlink_repo_create_files.yaml

@@ -1,33 +1,78 @@
 case_common:
   allure_epic: GitLink接口
   allure_feature: 开源项目模块
-  allure_story: 代码库
+  allure_story: 代码库新建文件/上传文件
   case_markers:
     - gitlink
-    - create_files
+    - projects
+    - repo
     - gitea
     - usefixtures: gitlink_login
 
+common_dependence:
+  setup:
+    interface:
+      # 前置条件：获取测试仓库的默认分支
+      - gitlink_get_repo_detail_full_01
+
 
 case_info:
 -
-  id: gitlink_repo_create_files_01
-  title: 代码库上传文件(无父级目录)，提交的分支是默认分支master
-  severity:
+  id: gitlink_repo_upload_files_01
+  title: 代码库上传文件(无父级目录)，提交的分支是默认分支
+  severity: Critical
   run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/create_file.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/create_file.json
   method: POST
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:
-    filepath: ${repo_file_path}
-    base64_filepath: ${get_base64_content('${repo_file_path}')}   # 文件路径（base64加密后）
-    branch: master    # 提交的分支, 输入不存在的分支会自动新建一个
-    content: ${get_file_base64('${local_file_path}')}      # 文件内容（Base64加密后）
-    message: 上传文件 - ${repo_file_path}       # commit信息
+    filepath: 第1章 软件测试基础.pdf
+    base64_filepath: ${get_base64_content('第1章 软件测试基础.pdf')}   # 文件路径（base64加密后）
+    branch: ${default_branch}
+    content: ${get_file_base64('第1章 软件测试基础.pdf')}      # 文件内容（Base64加密后）
+    message: 代码库上传文件(无父级目录)，提交的分支是默认分支 - 第1章 软件测试基础.pdf    # commit信息
+  files:
+  wait_seconds: 12
+  assert_response:
+      status_code: 200
+      assertAutor:
+        message: 断言提交者是当前登录用户
+        assert_type: ==
+        expect_value: ${login}
+        type_jsonpath: $.commit.author.name
+  assert_sql:
+  extract:
+    type_jsonpath:
+      repo_file_sha: $.sha
+      repo_file_name: $.name
+  case_dependence:
+    teardown:
+      # 后置处理：删除默认分支分支文件（无父级目录）
+      interface: gitlink_repo_delete_files_01
+
+
+-
+  id: gitlink_repo_upload_files_02
+  title: 代码库上传文件(有父级目录)，提交的分支是默认分支
+  severity: Critical
+  run: True
+  url: /api/${init_repo_owner}/${init_repo_identifier}/create_file.json
+  method: POST
+  headers:
+    Content-Type: application/json; charset=utf-8;
+    Cookie: ${cookies}
+  cookies:
+  request_type: json
+  payload:
+    filepath: ${repo_file_dir}/login_demo.yaml
+    base64_filepath: ${get_base64_content('${repo_file_dir}/login_demo.yaml')}   # 文件路径（base64加密后）
+    branch: ${default_branch}
+    content: ${get_file_base64('login_demo.yaml')}      # 文件内容（Base64加密后）
+    message: 代码库上传文件(有父级目录)，提交的分支是默认分支 - login_demo.yaml      # commit信息
   files:
   assert_response:
       status_code: 200
@@ -40,73 +85,38 @@ case_info:
   extract:
     type_jsonpath:
       repo_file_sha: $.sha
+      repo_file_name: $.name
+    case:
+      type_jsonpath:
+        repo_file_path: $.payload.filepath
   case_dependence:
     setup:
+      # 前置条件：初始化文件目录
       env_vars:
-        repo_file_path: demo_get_apply_information.yml
-        local_file_path: demo_get_apply_information.yml
+        repo_file_dir: ${generate_words}_${generate_identifier}
     teardown:
-      interface: gitlink_repo_delete_files_01
+      # 后置处理：删除默认分支分支文件（有父级目录）
+      interface: gitlink_repo_delete_files_02
 
 
 -
-  id: gitlink_repo_create_files_02
-  title: 代码库上传文件(有父级目录)，提交的分支是默认分支master
-  severity:
+  id: gitlink_repo_upload_files_03
+  title: 代码库上传文件（无父级目录），提交的分支是新的分支
+  severity: Critical
   run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/create_file.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/create_file.json
   method: POST
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:
-    filepath: ${repo_file_path}
-    base64_filepath: ${get_base64_content('${repo_file_path}')}   # 文件路径（base64加密后）
-    branch: master    # 提交的分支, 输入不存在的分支会自动新建一个
-    content: ${get_file_base64('${local_file_path}')}      # 文件内容（Base64加密后）
-    message: 上传文件 - ${repo_file_path}       # commit信息
-  files:
-  assert_response:
-      status_code: 200
-      assertAutor:
-        message: 断言提交者是当前登录用户
-        assert_type: ==
-        expect_value: ${login}
-        type_jsonpath: $.commit.author.name
-  assert_sql:
-  extract:
-    type_jsonpath:
-      repo_file_sha: $.sha
-  case_dependence:
-    setup:
-      env_vars:
-        repo_file_path: ${generate_words}_${generate_identifier}/login_demo.yaml
-        local_file_path: login_demo.yaml
-    teardown:
-      interface: gitlink_repo_delete_files_01
-
-
-
--
-  id: gitlink_repo_create_files_03
-  title: 代码库上传文件，提交的分支是新的分支
-  severity:
-  run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/create_file.json
-  method: POST
-  headers:
-    Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
-  request_type: json
-  payload:
-    filepath: ${repo_file_path}
-    base64_filepath: ${get_base64_content('${repo_file_path}')}   # 文件路径（base64加密后）
-    content: ${get_file_base64('${local_file_path}')}      # 文件内容（Base64加密后）
-    message: 上传文件 - ${repo_file_path}      # commit信息
-    branch: master
+    filepath: demo_test_upload.yaml
+    base64_filepath: ${get_base64_content('demo_test_upload.yaml')}   # 文件路径（base64加密后）
+    content: ${get_file_base64('demo_test_upload.yaml')}      # 文件内容（Base64加密后）
+    message: 代码库上传文件（无父级目录），提交的分支是新的分支 - demo_test_upload.yaml     # commit信息
+    branch: ${default_branch}
     new_branch: ${generate_words}  # 新的分支名称
   files:
   assert_response:
@@ -120,31 +130,37 @@ case_info:
   extract:
     type_jsonpath:
       repo_file_sha: $.sha
+      repo_file_name: $.name
+    case:
+      type_jsonpath:
+        branch_name: $.payload.new_branch
   case_dependence:
-    setup:
-      env_vars:
-        repo_file_path: demo_test_upload.yaml
-        local_file_path: demo_test_upload.yaml
+    teardown:
+      interface:
+        # 后置处理：删除指定分支文件（无父级目录），删除成功
+        - gitlink_repo_delete_files_03
+        # 后置处理：删除分支
+        - gitlink_repo_delete_branch_01
 
 
 -
   id: gitlink_repo_create_files_04
-  title: 代码库新建文件，提交的分支默认分支master
-  severity:
+  title: 代码库新建文件（无父级目录），提交的分支默认分支
+  severity: Critical
   run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/create_file.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/create_file.json
   method: POST
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:
     filepath: ${repo_file_path}
     base64_filepath: ${get_base64_content('${repo_file_path}')}   # 文件路径（base64加密后）
-    content: print("ok")    # 文件内容（Base64加密后）
-    message: 新建文件 - ${repo_file_path}      # commit信息
-    branch: master
+    content: print('ok')    # 文件内容（Base64加密后）
+    message: 代码库新建文件（无父级目录），提交的分支默认分支 - ${repo_file_path}      # commit信息
+    branch: ${default_branch}
   files:
   assert_response:
       status_code: 200
@@ -157,9 +173,59 @@ case_info:
   extract:
     type_jsonpath:
       repo_file_sha: $.sha
+      repo_file_name: $.name
   case_dependence:
     setup:
       env_vars:
         repo_file_path: test_${generate_words}.py
     teardown:
-      interface: gitlink_repo_delete_files_01
+      # 后置处理：删除默认分支分支文件（无父级目录）
+      interface: gitlink_repo_delete_files_01
+
+
+-
+  id: gitlink_repo_create_files_05
+  title: 代码库新建文件（无父级目录），提交的分支新分支
+  severity: Critical
+  run: True
+  url: /api/${init_repo_owner}/${init_repo_identifier}/create_file.json
+  method: POST
+  headers:
+    Content-Type: application/json; charset=utf-8;
+    Cookie: ${cookies}
+  cookies:
+  request_type: json
+  payload:
+    filepath: ${repo_file_path}
+    base64_filepath: ${get_base64_content('${repo_file_path}')}   # 文件路径（base64加密后）
+    content: print("ok")    # 文件内容（Base64加密后）
+    message: 代码库新建文件（无父级目录），提交的分支新分支 - ${repo_file_path}      # commit信息
+    branch: ${default_branch}
+    new_branch: ${generate_words}  # 新的分支名称
+  files:
+  assert_response:
+      status_code: 200
+      assertAutor:
+        message: 断言提交者是当前登录用户
+        assert_type: ==
+        expect_value: ${login}
+        type_jsonpath: $.commit.author.name
+  assert_sql:
+  extract:
+    type_jsonpath:
+      repo_file_sha: $.sha
+      repo_file_name: $.name
+    case:
+      type_jsonpath:
+        branch_name: $.payload.new_branch
+  case_dependence:
+    setup:
+      # 前置条件：创建的新文件名称
+      env_vars:
+        repo_file_path: test_${generate_words}.py
+    teardown:
+      interface:
+        # 后置处理：删除指定分支分支文件（无父级目录）
+        - gitlink_repo_delete_files_03
+        # 后置处理：删除分支
+        - gitlink_repo_delete_branch_01

interface/gitlink/projects/repository/test_gitlink_repo_delete_files.yaml

@@ -1,47 +1,117 @@
 case_common:
   allure_epic: GitLink接口
   allure_feature: 开源项目模块
-  allure_story: 代码库
+  allure_story: 代码库删除文件
   case_markers:
     - gitlink
-    - create_files
+    - projects
+    - repo
     - gitea
     - usefixtures: gitlink_login
 
 common_dependence:
   setup:
-    env_vars:
-      repo_file_path: demo_test_upload.yaml
-      local_file_path: demo_test_upload.yaml
+    interface:
+      # 前置条件：获取测试仓库的默认分支
+      - gitlink_get_repo_detail_full_01
 
 case_info:
--
-  id: gitlink_repo_delete_files_01
-  title: 删除master分支文件
-  severity:
-  run: true
-  url: /api/${env_repo_owner}/${env_repo_identifier}/delete_file.json
-  method: delete
-  headers:
-    Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
-  request_type: params
-  payload:
-    filepath: ${repo_file_path}
-    branch: master    # 分支名称
-    sha:  ${repo_file_sha}     # 文件提交标识
-  files:
-  assert_response:
+  - id: gitlink_repo_delete_files_01
+    title: 删除默认分支文件（无父级目录）
+    severity:
+    run: true
+    url: /api/${init_repo_owner}/${init_repo_identifier}/delete_file.json
+    method: delete
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${cookies}
+    cookies:
+    request_type: params
+    payload:
+      filepath: ${repo_file_name}
+      branch: ${default_branch}    # 分支名称
+      sha: ${repo_file_sha}     # 文件提交标识
+    files:
+    assert_response:
       status_code: 200
       assertAutor:
         message: 断言message
         assert_type: ==
         expect_value: 文件删除成功
         type_jsonpath: $.message
-  assert_sql:
-  extract:
-  case_dependence:
-    setup:
-      interface:
-        - gitlink_repo_create_files_01
+    assert_sql:
+    extract:
+    case_dependence:
+      setup:
+        env_vars:
+          # 环境变量， 创建文件的名称
+          repo_file_path: test_${generate_words}.py
+        interface:
+          # 前置条件：代码库新建文件（无父级目录），提交的分支默认分支
+          - gitlink_repo_create_files_04
+
+
+  - id: gitlink_repo_delete_files_02
+    title: 删除默认分支分支文件（有父级目录）
+    severity:
+    run: true
+    url: /api/${init_repo_owner}/${init_repo_identifier}/delete_file.json
+    method: delete
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${cookies}
+    cookies:
+    request_type: params
+    payload:
+      filepath: ${repo_file_path}
+      branch: ${default_branch}    # 分支名称
+      sha: ${repo_file_sha}     # 文件提交标识
+    files:
+    assert_response:
+      status_code: 200
+      assertAutor:
+        message: 断言message
+        assert_type: ==
+        expect_value: 文件删除成功
+        type_jsonpath: $.message
+    assert_sql:
+    extract:
+    case_dependence:
+      setup:
+        interface:
+          # 前置条件：代码库上传文件(有父级目录)，提交的分支是默认分支
+          - gitlink_repo_upload_files_02
+
+  - id: gitlink_repo_delete_files_03
+    title: 删除指定分支文件（无父级目录），删除成功
+    severity:
+    run: true
+    url: /api/${init_repo_owner}/${init_repo_identifier}/delete_file.json
+    method: delete
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${cookies}
+    cookies:
+    request_type: params
+    payload:
+      filepath: ${repo_file_name}
+      branch: ${branch_name}    # 分支名称
+      sha: ${repo_file_sha}     # 文件提交标识
+    files:
+    assert_response:
+      status_code: 200
+      assertAutor:
+        message: 断言message
+        assert_type: ==
+        expect_value: 文件删除成功
+        type_jsonpath: $.message
+    assert_sql:
+    extract:
+    case_dependence:
+      setup:
+        # 前置条件：创建的新文件名称
+        env_vars:
+          repo_file_path: test_${generate_words}.py
+        interface:
+          # 前置条件：代码库新建文件（无父级目录），提交的分支新分支
+          - gitlink_repo_create_files_05

interface/gitlink/projects/repository/test_gitlink_repo_edit_files.yaml

@@ -1,94 +0,0 @@
-case_common:
-  allure_epic: GitLink接口
-  allure_feature: 开源项目模块
-  allure_story: 代码库
-  case_markers:
-    - gitlink
-    - create_files
-    - gitea
-    - usefixtures: gitlink_login
-
-common_dependence:
-  setup:
-    env_vars:
-      repo_file_path: README.md
-
-case_info:
--
-  id: gitlink_repo_edit_files_01
-  title: 修改master分支文件 - README.md
-  severity: critical
-  run: true
-  url: /api/${env_repo_owner}/${env_repo_identifier}/update_file.json
-  method: PUT
-  headers:
-    Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
-  request_type: json
-  payload:
-    filepath: ${repo_file_path}
-    base64_filepath: ${get_base64_content('${repo_file_path}')}   # 文件路径（base64加密后）
-    content:  ${generate_paragraph(nb=10)} # 文件内容（Base64加密后）
-    message: auto update - ${repo_file_path}      # commit信息
-    branch: master
-    sha: ${repo_file_sha}
-  files:
-  assert_response:
-      status_code: 200
-      assertMessage:
-        message: 断言message
-        assert_type: ==
-        expect_value: 更新成功
-        type_jsonpath: $.message
-      assertStatus:
-        message: 断言status
-        assert_type: ==
-        expect_value: 1
-        type_jsonpath: $.status
-  assert_sql:
-  extract:
-  case_dependence:
-    setup:
-      interface:
-        - gitlink_get_repo_readme_file_01
-
--
-  id: gitlink_repo_edit_files_02
-  title: 修改指定分支文件 - README.md
-  severity: critical
-  run: true
-  url: /api/${env_repo_owner}/${env_repo_identifier}/update_file.json
-  method: PUT
-  headers:
-    Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
-  request_type: json
-  payload:
-    filepath: ${repo_file_path}
-    base64_filepath: ${get_base64_content('${repo_file_path}')}   # 文件路径（base64加密后）
-    content:  ${generate_paragraph(nb=10)} # 文件内容（Base64加密后）
-    message: auto update - ${repo_file_path}      # commit信息
-    branch: ${branch_name}
-    sha: ${repo_file_sha}
-  files:
-  assert_response:
-      status_code: 200
-      assertMessage:
-        message: 断言message
-        assert_type: ==
-        expect_value: 更新成功
-        type_jsonpath: $.message
-      assertStatus:
-        message: 断言status
-        assert_type: ==
-        expect_value: 1
-        type_jsonpath: $.status
-  assert_sql:
-  extract:
-  case_dependence:
-    setup:
-      interface:
-        - gitlink_get_repo_branches_by_keyword_01
-        - gitlink_get_repo_readme_file_02

interface/gitlink/projects/repository/test_gitlink_repo_replace_files.yaml

@@ -1,10 +1,11 @@
 case_common:
   allure_epic: GitLink接口
   allure_feature: 开源项目模块
-  allure_story: 代码库
+  allure_story: 代码库替换文件
   case_markers:
     - gitlink
-    - create_files
+    - projects
+    - repo
     - gitea
     - usefixtures: gitlink_login
 
@@ -14,52 +15,54 @@ case_common:
 
 common_dependence:
   setup:
-    env_vars:
-      repo_file_path: 第1章 软件测试基础.pdf
-      local_file_path: 第1章 软件测试基础.pdf
     interface:
-      - gitlink_repo_create_files_01    # 上传一个不支持预览的 可替换文件
+      # 前置条件：获取测试仓库的默认分支
+      - gitlink_get_repo_detail_full_01
+      # 前置条件：# 上传一个不支持预览的 可替换文件
+      - gitlink_repo_upload_files_01
+  teardown:
+    interface:
+      # 后置处理：删除刚刚替换后的文件
+      - gitlink_repo_delete_files_01
 
 case_info:
--
-  id: gitlink_repo_replace_files_01
-  title: 替换文件
-  severity:
-  run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/replace_file.json
-  method: POST
-  headers:
-    Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
-  request_type: json
-  payload:
-    filepath:  ${replace_file_path}
-    base64_filepath:  ${get_base64_content('${replace_file_path}')}
-    branch: master    # 提交的分支, 输入不存在的分支会自动新建一个
-    content: ${get_file_base64('${local_file_path}')}      # 文件内容（Base64加密后）
-    message: 替换文件 - ${replace_file_path}       # commit信息
-    delete_file:
-      filepath: ${repo_file_path}
-      base64_filepath: ${get_base64_content('${repo_file_path}')}   # 文件路径（base64加密后）
-      branch: master
-      sha: ${repo_file_sha}
-  files:
-  assert_response:
+  - id: gitlink_repo_replace_files_01
+    title: 在默认分支替换文件，替换成功
+    severity:
+    run: True
+    url: /api/${init_repo_owner}/${init_repo_identifier}/replace_file.json
+    method: POST
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${cookies}
+    cookies:
+    request_type: json
+    payload:
+      filepath: demo_get_apply_information.yml
+      base64_filepath: ${get_base64_content('demo_get_apply_information.yml')}
+      branch: ${default_branch}    # 提交的分支, 输入不存在的分支会自动新建一个
+      content: ${get_file_base64('demo_get_apply_information.yml')}      # 文件内容（Base64加密后）
+      message: 替换文件 - demo_get_apply_information.yml     # commit信息
+      delete_file:
+        filepath: ${repo_file_name}
+        base64_filepath: ${get_base64_content('${repo_file_name}')}   # 文件路径（base64加密后）
+        branch: ${default_branch}
+        sha: ${repo_file_sha}
+    files:
+    assert_response:
       status_code: 200
       assertAutor:
         message: 断言message
         assert_type: ==
         expect_value: 替换成功
         type_jsonpath: $.message
-  assert_sql:
-  extract:
-  case_dependence:
-    setup:
-      env_vars:
-        replace_file_path: demo_get_apply_information.yml
-        local_file_path: demo_get_apply_information.yml
-    teardown:
-      interface:
-        - gitlink_get_repo_sub_entries_003
-        - gitlink_repo_delete_files_01
+    assert_sql:
+    extract:
+      case:
+        type_jsonpath:
+          repo_file_name: $.payload.filepath
+    case_dependence:
+      teardown:
+        interface:
+          # 获取项目默认分支的某个文件信息
+          - gitlink_get_repo_sub_entries_02

interface/gitlink/projects/repository/test_gitlink_repo_update_files.yaml

@@ -1,53 +1,103 @@
 case_common:
   allure_epic: GitLink接口
   allure_feature: 开源项目模块
-  allure_story: 代码库
+  allure_story: 代码库更新文件
   case_markers:
     - gitlink
-    - update_files
+    - projects
+    - repo
     - gitea
     - usefixtures: gitlink_login
 
 common_dependence:
   setup:
-    env_vars:
-      repo_file_path: demo_get_apply_information.yml
-      local_file_path: demo_get_apply_information.yml
     interface:
-      - gitlink_repo_create_files_01
+      # 前置条件：获取测试仓库的默认分支
+      - gitlink_get_repo_detail_full_01
+
+
 
 case_info:
--
-  id: gitlink_repo_update_files_01
-  title: 代码库更新文件
-  severity:
-  run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/update_file.json
-  method: PUT
-  headers:
-    Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
-  request_type: json
-  payload:
-    sha: ${repo_file_sha}            # 要更新的文件的sha值
-    filepath: ${repo_file_path}
-    base64_filepath: ${get_base64_content('${repo_file_path}')}   # 选填，文件路径（base64加密后）
-    branch: master    # 提交的分支, 输入不存在的分支会自动新建一个
-    content: ${generate_paragraph(nb=10)}      # 文件内容（Base64加密后）
-    message: 更新文件 - ${repo_file_path}       # commit信息
-  files:
-  assert_response:
+  - id: gitlink_repo_update_files_01
+    title: 修改默认分支文件 - README.md
+    severity: critical
+    run: true
+    url: /api/${init_repo_owner}/${init_repo_identifier}/update_file.json
+    method: PUT
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${cookies}
+    cookies:
+    request_type: json
+    payload:
+      filepath: README.md
+      base64_filepath: ${get_base64_content('README.md')}   # 文件路径（base64加密后）
+      content: ${generate_paragraph(nb=10)} # 文件内容（Base64加密后）
+      message: auto update - ${repo_file_path}      # commit信息
+      branch: ${default_branch}
+      sha: ${repo_readme_sha}
+    files:
+    assert_response:
       status_code: 200
-      assertAutor:
+      assertMessage:
         message: 断言message
         assert_type: ==
         expect_value: 更新成功
         type_jsonpath: $.message
-  assert_sql:
-  extract:
-  case_dependence:
-    teardown:
-      interface:
-        - gitlink_get_repo_sub_entries_002
-        - gitlink_repo_delete_files_01
+      assertStatus:
+        message: 断言status
+        assert_type: ==
+        expect_value: 1
+        type_jsonpath: $.status
+    assert_sql:
+    extract:
+    case_dependence:
+      setup:
+        interface:
+          # 前置条件：获取默认分支的readme文件的sha
+          - gitlink_get_repo_default_branch_readme_file_01
+
+  - id: gitlink_repo_edit_files_02
+    title: 修改指定分支文件 - README.md
+    severity: critical
+    run: true
+    url: /api/${init_repo_owner}/${init_repo_identifier}/update_file.json
+    method: PUT
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${cookies}
+    cookies:
+    request_type: json
+    payload:
+      filepath: README.md
+      base64_filepath: ${get_base64_content('README.md')}   # 文件路径（base64加密后）
+      content: ${generate_paragraph(nb=10)} # 文件内容（Base64加密后）
+      message: auto update - README.md     # commit信息
+      branch: ${branch_name}
+      sha: ${repo_readme_sha}
+    files:
+    assert_response:
+      status_code: 200
+      assertMessage:
+        message: 断言message
+        assert_type: ==
+        expect_value: 更新成功
+        type_jsonpath: $.message
+      assertStatus:
+        message: 断言status
+        assert_type: ==
+        expect_value: 1
+        type_jsonpath: $.status
+    assert_sql:
+    extract:
+    case_dependence:
+      setup:
+        interface:
+          # 前置条件：新建分支
+          - gitlink_repo_new_branch_01
+          # 前置条件：获取新分支readme的sha
+          - gitlink_get_repo_other_branch_readme_file_02
+      teardown:
+        interface:
+          # 后置处理：删除分支
+          - gitlink_repo_delete_branch_01

interface/gitlink/projects/settings/test_gitlink_cancel_transfer_repo.yaml

@@ -4,8 +4,8 @@ case_common:
   allure_story: 仓库设置
   case_markers:
     - gitlink
+    - projects
     - gitea
-    - debug
     - usefixtures: gitlink_login
 
 # 仅仓库管理员及以上角色才有权限
@@ -26,7 +26,7 @@ case_info:
     method: POST
     headers:
       Content-Type: application/json; charset=utf-8;
-      cookies: ${cookies}
+      Cookie: ${cookies}
     cookies:
     request_type: json
     payload:
@@ -42,5 +42,5 @@ case_info:
     case_dependence:
       setup:
         interface:
-          # 仓库申请转移
+          # 前置条件：仓库申请转移
           - gitlink_transfer_repo_01

interface/gitlink/projects/settings/test_gitlink_get_repo_setting.yaml

@@ -4,27 +4,22 @@ case_common:
   allure_story: 仓库设置
   case_markers:
     - gitlink
+    - projects
     - gitea
     - usefixtures: gitlink_login
 
 # 仅仓库管理员及以上角色才有权限
-common_dependence:
-  setup:
-    # 新建私有仓库
-    interface: gitlink_projects_new_project_02
-  teardown:
-    interface: gitlink_projects_delete_project_01
 
 case_info:
   - id: gitlink_get_repo_setting_01
     title: 获取仓库基本设置
     severity: critical
     run: True
-    url: /api/${repo_owner}/${repo_identifier}/edit.json
+    url: /api/${init_repo_owner}/${init_repo_identifier}/edit.json
     method: GET
     headers:
       Content-Type: application/json; charset=utf-8;
-      cookies: ${cookies}
+      Cookie: ${admin_cookies}
     cookies:
     request_type: json
     payload:

interface/gitlink/projects/settings/test_gitlink_transfer_repo.yaml

@@ -4,8 +4,8 @@ case_common:
   allure_story: 仓库设置
   case_markers:
     - gitlink
+    - projects
     - gitea
-    - debug
     - usefixtures: gitlink_login
 
 # 仅仓库管理员及以上角色才有权限
@@ -26,7 +26,7 @@ case_info:
     method: POST
     headers:
       Content-Type: application/json; charset=utf-8;
-      cookies: ${cookies}
+      Cookie: ${cookies}
     cookies:
     request_type: json
     payload:

interface/gitlink/projects/settings/test_gitlink_update_private_repo_setting.yaml

@@ -4,15 +4,17 @@ case_common:
   allure_story: 仓库设置
   case_markers:
     - gitlink
+    - projects
     - gitea
     - usefixtures: gitlink_login
 
 # 仅仓库管理员及以上角色才有权限
 common_dependence:
   setup:
-    # 新建私有仓库
+    # 前置条件：新建私有项目
     interface: gitlink_projects_new_project_02
   teardown:
+    # 后置处理：删除项目
     interface: gitlink_projects_delete_project_01
 
 
@@ -26,12 +28,12 @@ case_info:
   method: PATCH
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:
     name:  update-name-${generate_words}  # 项目名称
-    identifier:  ${repo_identifier}    # 项目标识
+    identifier: ${repo_identifier}
   files:
   assert_response:
       status_code: 200
@@ -47,10 +49,11 @@ case_info:
         type_jsonpath: $.is_public
   assert_sql:
   extract:
+    response:
+      type_jsonpath:
+        repo_identifier: $.identifier
+        repo_name: $.name
   case_dependence:
-    setup:
-      interface:
-       - gitlink_get_repo_setting_01
 
 -
   id: gitlink_update_repo_setting_02
@@ -61,11 +64,11 @@ case_info:
   method: PATCH
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:
-    name:  ${repo_name}  # 项目名称
+    name: ${repo_name}
     identifier:  update_${generate_identifier()}_${generate_identifier()}    # 项目标识
   files:
   assert_response:
@@ -82,12 +85,11 @@ case_info:
         type_jsonpath: $.is_public
   assert_sql:
   extract:
-    type_jsonpath:
-      repo_identifier: $.identifier
+    response:
+      type_jsonpath:
+        repo_identifier: $.identifier
+        repo_name: $.name
   case_dependence:
-    setup:
-      interface:
-       - gitlink_get_repo_setting_01
 
 -
   id: gitlink_update_repo_setting_03
@@ -98,13 +100,13 @@ case_info:
   method: PATCH
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:
-    name:  ${repo_name}  # 项目名称
+    name: ${repo_name}
+    identifier: ${repo_identifier}
     project_category_id: ${random.choice(${repo_category_ids})}    # 项目类别ID
-    identifier:  ${repo_identifier}    # 项目标识
   files:
   assert_response:
       status_code: 200
@@ -120,11 +122,15 @@ case_info:
         type_jsonpath: $.is_public
   assert_sql:
   extract:
+    response:
+      type_jsonpath:
+        repo_identifier: $.identifier
+        repo_name: $.name
   case_dependence:
     setup:
       interface:
-       - gitlink_get_repo_category_01
-       - gitlink_get_repo_setting_01
+        # 前置条件：获取项目类别列表
+        - gitlink_get_repo_category_01
 
 -
   id: gitlink_update_repo_setting_04
@@ -135,13 +141,13 @@ case_info:
   method: PATCH
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:
-    name:  ${repo_name}  # 项目名称
+    name: ${repo_name}
+    identifier: ${repo_identifier}
     project_language_id: ${random.choice(${repo_language_ids})}    # 项目语言ID
-    identifier:  ${repo_identifier}    # 项目标识
   files:
   assert_response:
       status_code: 200
@@ -157,11 +163,15 @@ case_info:
         type_jsonpath: $.is_public
   assert_sql:
   extract:
+    response:
+      type_jsonpath:
+        repo_identifier: $.identifier
+        repo_name: $.name
   case_dependence:
     setup:
       interface:
-       - gitlink_get_repo_language_01
-       - gitlink_get_repo_setting_01
+        # 前置条件：获取项目语言列表
+        - gitlink_get_repo_language_01
 
 
 -
@@ -173,13 +183,13 @@ case_info:
   method: PATCH
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:
-    name:  ${repo_project_name}  # 项目名称
+    name: ${repo_name}
+    identifier: ${repo_identifier}
     private: False  # 项目是否为私有项目
-    identifier:  ${repo_identifier}    # 项目标识
   files:
   assert_response:
       status_code: 200
@@ -195,8 +205,9 @@ case_info:
         type_jsonpath: $.is_public
   assert_sql:
   extract:
+    response:
+      type_jsonpath:
+        repo_identifier: $.identifier
+        repo_name: $.name
   case_dependence:
-    setup:
-      interface:
-        - gitlink_get_repo_setting_01
 

interface/gitlink/projects/settings/test_gitlink_update_project_unit.yaml

@@ -0,0 +1,57 @@
+case_common:
+  allure_epic: GitLink接口
+  allure_feature: 开源项目模块
+  allure_story: 仓库设置
+  case_markers:
+    - gitlink
+    - projects
+    - gitea
+    - usefixtures: gitlink_login
+
+# 仅仓库管理员及以上角色才有权限
+common_dependence:
+  setup:
+    # 新建公开仓库
+    interface: gitlink_projects_new_project_01
+  teardown:
+    interface: gitlink_projects_delete_project_01
+
+
+case_info:
+-
+  id: gitlink_update_project_unit_01
+  title: 更新仓库基本设置 - 更新项目导航栏
+  severity: critical
+  run: true
+  url: /api/${repo_owner}/${repo_identifier}/project_units.json
+  method: POST
+  headers:
+    Content-Type: application/json; charset=utf-8;
+    Cookie: ${cookies}
+  cookies:
+  request_type: json
+  payload:
+    unit_types:
+      - issues
+      - pulls
+      - wiki
+      - devops
+      - versions
+      - services
+      - dataset
+  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
+  assert_sql:
+  extract:
+  case_dependence:

interface/gitlink/projects/settings/test_gitlink_update_public_repo_setting.yaml

@@ -4,15 +4,17 @@ case_common:
   allure_story: 仓库设置
   case_markers:
     - gitlink
+    - projects
     - gitea
     - usefixtures: gitlink_login
 
 # 仅仓库管理员及以上角色才有权限
 common_dependence:
   setup:
-    # 新建公开仓库
+    # 前置条件：新建公开仓库
     interface: gitlink_projects_new_project_01
   teardown:
+    # 后置处理：删除项目
     interface: gitlink_projects_delete_project_01
 
 
@@ -26,12 +28,12 @@ case_info:
   method: PATCH
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:
     name:  update-name-${generate_words}  # 项目名称
-    identifier:  ${repo_identifier}    # 项目标识
+    identifier: ${repo_identifier}
   files:
   assert_response:
       status_code: 200
@@ -47,10 +49,11 @@ case_info:
         type_jsonpath: $.is_public
   assert_sql:
   extract:
+    response:
+      type_jsonpath:
+        repo_identifier: $.identifier
+        repo_name: $.name
   case_dependence:
-    setup:
-      interface:
-       - gitlink_get_repo_setting_01
 
 -
   id: gitlink_update_repo_setting_02
@@ -61,12 +64,12 @@ case_info:
   method: PATCH
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:
-    name:  ${repo_name}  # 项目名称
     identifier:  update_${generate_identifier()}_${generate_identifier()}    # 项目标识
+    name: ${repo_name}
   files:
   assert_response:
       status_code: 200
@@ -82,12 +85,11 @@ case_info:
         type_jsonpath: $.is_public
   assert_sql:
   extract:
-    type_jsonpath:
-      repo_identifier: $.identifier
+    response:
+      type_jsonpath:
+        repo_identifier: $.identifier
+        repo_name: $.name
   case_dependence:
-    setup:
-      interface:
-       - gitlink_get_repo_setting_01
 
 -
   id: gitlink_update_repo_setting_03
@@ -98,7 +100,7 @@ case_info:
   method: PATCH
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:
@@ -120,11 +122,15 @@ case_info:
         type_jsonpath: $.is_public
   assert_sql:
   extract:
+    response:
+      type_jsonpath:
+        repo_identifier: $.identifier
+        repo_name: $.name
   case_dependence:
     setup:
       interface:
-       - gitlink_get_repo_category_01
-       - gitlink_get_repo_setting_01
+        # 前置条件：获取项目类别列表
+        - gitlink_get_repo_category_01
 
 -
   id: gitlink_update_repo_setting_04
@@ -135,7 +141,7 @@ case_info:
   method: PATCH
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:
@@ -157,11 +163,15 @@ case_info:
         type_jsonpath: $.is_public
   assert_sql:
   extract:
+    response:
+      type_jsonpath:
+        repo_identifier: $.identifier
+        repo_name: $.name
   case_dependence:
     setup:
       interface:
-       - gitlink_get_repo_language_01
-       - gitlink_get_repo_setting_01
+        # 前置条件：获取项目语言列表
+        - gitlink_get_repo_language_01
 
 -
   id: gitlink_update_repo_setting_05
@@ -172,7 +182,7 @@ case_info:
   method: PATCH
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:
@@ -194,7 +204,8 @@ case_info:
         type_jsonpath: $.is_public
   assert_sql:
   extract:
-  case_dependence:
-    setup:
-      interface:
-       - gitlink_get_repo_setting_01
+    response:
+      type_jsonpath:
+        repo_identifier: $.identifier
+        repo_name: $.name
+  case_dependence:

interface/gitlink/projects/tags/test_gitlink_repo_delete_tag.yaml

@@ -12,21 +12,20 @@ case_common:
 # 通过发行版新建标签，删除标签之前需要先删除发行版
 
 case_info:
--
-  id: gitlink_repo_delete_tag_001
-  title: 删除标签 - 当前标签无关联发行版，删除成功
-  severity: normal
-  run: True
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/tags/${tag_name}.json
-  method: DELETE
-  headers:
-    Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
-  request_type: json
-  payload:
-  files:
-  assert_response:
+  - id: gitlink_repo_delete_tag_01
+    title: 删除标签 - 当前标签无关联发行版，删除成功
+    severity: normal
+    run: True
+    url: /api/v1/${init_repo_owner}/${init_repo_identifier}/tags/${tag_name}.json
+    method: DELETE
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${cookies}
+    cookies:
+    request_type: json
+    payload:
+    files:
+    assert_response:
       status_code: 200
       assertStatus:
         message: 断言接口返回status=0
@@ -38,31 +37,33 @@ case_info:
         expect_value: success
         assert_type: ==
         type_jsonpath: $.message
-  assert_sql:
-  extract:
-  case_dependence:
-    setup:
-      interface:
-        - gitlink_repo_new_release_001
-        - gitlink_repo_get_tags_list_001
-        - gitlink_repo_get_release_list_001
-        - gitlink_repo_delete_release_001
+    assert_sql:
+    extract:
+    case_dependence:
+      setup:
+        interface:
+          # 前置条件：创建发行版
+          - gitlink_repo_new_release_01
+          # 前置条件：获取发行版的相关信息, 如：release_id
+          - gitlink_repo_get_release_list_01
+          # 前置处理：删除发行版
+          - gitlink_repo_delete_release_01
 
--
-  id: gitlink_repo_delete_tag_002
-  title: 删除标签 - 当前标签关联了发行版，将发行失败
-  severity: normal
-  run: True
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/tags/${tag_name}.json
-  method: DELETE
-  headers:
-    Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
-  request_type: json
-  payload:
-  files:
-  assert_response:
+
+  - id: gitlink_repo_delete_tag_002
+    title: 删除标签 - 当前标签关联了发行版，将发行失败
+    severity: normal
+    run: True
+    url: /api/v1/${init_repo_owner}/${init_repo_identifier}/tags/${tag_name}.json
+    method: DELETE
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${cookies}
+    cookies:
+    request_type: json
+    payload:
+    files:
+    assert_response:
       status_code: 200
       assertStatus:
         message: 断言接口返回status=-1
@@ -74,15 +75,18 @@ case_info:
         expect_value: 请先删除发行版！
         assert_type: ==
         type_jsonpath: $.message
-  assert_sql:
-  extract:
-  case_dependence:
-    setup:
-      interface:
-        - gitlink_repo_new_release_001
-        - gitlink_repo_get_tags_list_001
-    teardown:
-      interface:
-        - gitlink_repo_get_release_list_001
-        - gitlink_repo_delete_release_001
-
+    assert_sql:
+    extract:
+    case_dependence:
+      setup:
+        interface:
+          # 前置条件：创建发行版
+          - gitlink_repo_new_release_01
+          # 前置条件：获取发行版的相关信息, 如：release_id
+          - gitlink_repo_get_release_list_01
+      teardown:
+        interface:
+          # 数据清理：删除发行版
+          - gitlink_repo_delete_release_01
+          # 数据清理：删除标签
+          - gitlink_repo_delete_tag_01

interface/gitlink/projects/tags/test_gitlink_repo_get_tags_detail.yaml

@@ -4,21 +4,22 @@ case_common:
   allure_story: 标签
   case_markers:
     - gitlink
+    - projects
     - tags
     - gitea
     - usefixtures: gitlink_login
 
 case_info:
 -
-  id: gitlink_repo_get_tags_detail_001
+  id: gitlink_repo_get_tags_detail_01
   title: 获取项目标签详情
   severity: normal
   run: True
-  url: /api/v1/${env_repo_owner}/${env_repo_identifier}/tags/${tag_name}.json
+  url: /api/v1/${init_repo_owner}/${init_repo_identifier}/tags/${tag_name}.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: params
   payload:
@@ -35,10 +36,14 @@ case_info:
   case_dependence:
     setup:
       interface:
-        - gitlink_repo_new_release_001
-        - gitlink_repo_get_tags_list_001
+        # 前置条件：创建发行版
+        - gitlink_repo_new_release_01
+        # 前置条件：获取发行版的相关信息, 如：release_id
+        - gitlink_repo_get_release_list_01
     teardown:
       interface:
-        - gitlink_repo_get_release_list_001
-        - gitlink_repo_delete_release_001
+        # 后置处理：删除发行版
+        - gitlink_repo_delete_release_01
+        # 后置处理：删除标记
+        - gitlink_repo_delete_tag_01
 

interface/gitlink/projects/tags/test_gitlink_repo_get_tags_list.yaml

@@ -4,21 +4,22 @@ case_common:
   allure_story: 标签
   case_markers:
     - gitlink
+    - projects
     - tags
     - gitea
     - usefixtures: gitlink_login
 
 case_info:
 -
-  id: gitlink_repo_get_tags_list_001
+  id: gitlink_repo_get_tags_list_01
   title: 获取项目标签列表
   severity: normal
   run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/tags.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/tags.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: params
   payload:
@@ -37,15 +38,15 @@ case_info:
       tag_name: $.tags[0].name
 
 -
-  id: gitlink_repo_get_tags_list_all_002
+  id: gitlink_repo_get_tags_list_all_02
   title: 获取项目标签列表(无分页)
   severity: normal
   run: True
-  url: /api/${env_repo_owner}/${env_repo_identifier}/tags.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/tags.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: params
   payload:

interface/gitlink/projects/test_gitlink_delete_project.yaml

@@ -1,7 +1,7 @@
 case_common:
   allure_epic: GitLink接口
   allure_feature: 开源项目模块
-  allure_story: 项目
+  allure_story: 删除项目
   case_markers:
     - gitlink
     - projects
@@ -19,8 +19,7 @@ case_info:
   method: DELETE
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
+  cookies: ${cookies}
   request_type: json
   payload:
   files:
@@ -41,4 +40,5 @@ case_info:
   case_dependence:
     setup:
       interface:
+        # 前置条件：新建项目（仅输入必填参数）
         - gitlink_projects_new_project_01

interface/gitlink/projects/test_gitlink_follow_project.yaml

@@ -1,7 +1,7 @@
 case_common:
   allure_epic: GitLink接口
   allure_feature: 开源项目模块
-  allure_story: 项目
+  allure_story: 关注项目
   case_markers:
     - gitlink
     - projects
@@ -12,9 +12,11 @@ case_common:
 common_dependence:
   setup:
     interface:
+      # 前置条件：新建项目（仅输入必填参数）
       - gitlink_projects_new_project_01
   teardown:
     interface:
+      # 后置处理：删除项目
       - gitlink_projects_delete_project_01
 
 case_info:
@@ -27,7 +29,7 @@ case_info:
   method: POST
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: params
   payload:
@@ -65,7 +67,7 @@ case_info:
   method: POST
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: params
   payload:
@@ -98,7 +100,7 @@ case_info:
   method: DELETE
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: params
   payload:

interface/gitlink/projects/test_gitlink_fork_project.yaml

@@ -1,7 +1,7 @@
 case_common:
   allure_epic: GitLink接口
   allure_feature: 开源项目模块
-  allure_story: 项目
+  allure_story: 复刻(Fork)项目
   case_markers:
     - gitlink
     - projects
@@ -9,30 +9,27 @@ case_common:
     - fork_project
     - usefixtures: gitlink_login
 
+
 common_dependence:
-  setup:
-    env_vars:
-      repo_owner: ${env_login}
-  teardown:
-    interface:
-      - gitlink_projects_delete_project_01
+  interface:
+    # 删除刚刚fork成功的项目
+    - projects_delete_project_01
 
 case_info:
--
-  id: gitlink_projects_fork_project_01
-  title: 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:
+  - id: gitlink_projects_fork_project_01
+    title: fork项目
+    severity: critical
+    run: True
+    url: /api/${init_repo_owner}/${init_repo_identifier}/forks.json
+    method: POST
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${cookies}
+    cookies:
+    request_type: json
+    payload:
+    files:
+    assert_response:
       status_code: 200
       assertStatus:
         message: 断言接口返回status=0
@@ -44,28 +41,31 @@ case_info:
         expect_value: fork项目成功
         assert_type: ==
         type_jsonpath: $.message
-  assert_sql:
-  extract:
-    type_jsonpath:
-      repo_id: $.id
-      repo_identifier: $.identifier
-  case_dependence:
+    assert_sql:
+    extract:
+      response:
+        type_jsonpath:
+          fork_identifier: $.identifier
+    case_dependence:
+      teardown:
+        env_vars:
+          repo_owner: ${env_login}
+          repo_identifier: ${fork_identifier}
 
--
-  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:
+  - id: gitlink_projects_fork_project_02
+    title: fork项目 - 已经fork过了继续fork
+    severity: critical
+    run: True
+    url: /api/${init_repo_owner}/${init_repo_identifier}/forks.json
+    method: POST
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${cookies}
+    cookies:
+    request_type: json
+    payload:
+    files:
+    assert_response:
       status_code: 200
       assertStatus:
         message: 断言接口返回status=0
@@ -74,9 +74,9 @@ case_info:
         type_jsonpath: $.status
       assertMessage:
         message: 断言接口返回message
-        expect_value: fork失败，你已拥有了这个项目 autotest
+        expect_value: fork失败，你已拥有了这个项目 ${repo_identifier}
         assert_type: ==
         type_jsonpath: $.message
-  assert_sql:
-  extract:
-  case_dependence:
+    assert_sql:
+    extract:
+    case_dependence:

interface/gitlink/projects/test_gitlink_get_repo_category.yaml

@@ -1,10 +1,10 @@
 case_common:
   allure_epic: GitLink接口
   allure_feature: 开源项目模块
-  allure_story: 仓库设置
+  allure_story: 获取项目基础数据
   case_markers:
     - gitlink
-    - gitea
+    - projects
     - usefixtures: gitlink_login
 
 
@@ -19,7 +19,7 @@ case_info:
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:

interface/gitlink/projects/test_gitlink_get_repo_ignores.yaml

@@ -1,9 +1,10 @@
 case_common:
   allure_epic: GitLink接口
   allure_feature: 开源项目模块
-  allure_story: 项目
+  allure_story: 获取项目基础数据
   case_markers:
     - gitlink
+    - projects
     - usefixtures: gitlink_login
 
 # 用例数据
@@ -17,7 +18,7 @@ case_info:
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: params
   payload:

interface/gitlink/projects/test_gitlink_get_repo_language.yaml

@@ -1,10 +1,10 @@
 case_common:
   allure_epic: GitLink接口
   allure_feature: 开源项目模块
-  allure_story: 仓库设置
+  allure_story: 获取项目基础数据
   case_markers:
     - gitlink
-    - gitea
+    - projects
     - usefixtures: gitlink_login
 
 
@@ -19,7 +19,7 @@ case_info:
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: json
   payload:

interface/gitlink/projects/test_gitlink_get_repo_licenses.yaml

@@ -1,9 +1,11 @@
 case_common:
   allure_epic: GitLink接口
   allure_feature: 开源项目模块
-  allure_story: 项目
+  allure_story: 获取项目基础数据
   case_markers:
     - gitlink
+    - gitea
+    - projects
     - usefixtures: gitlink_login
 
 # 用例数据
@@ -17,7 +19,7 @@ case_info:
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${cookies}
   cookies:
   request_type: params
   payload:

interface/gitlink/projects/test_gitlink_like_project.yaml

@@ -9,13 +9,14 @@ 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:
@@ -27,7 +28,7 @@ case_info:
     method: POST
     headers:
       Content-Type: application/json; charset=utf-8;
-      cookies: ${cookies}
+      Cookie: ${cookies}
     cookies:
     request_type: json
     payload:
@@ -61,7 +62,7 @@ case_info:
     method: POST
     headers:
       Content-Type: application/json; charset=utf-8;
-      cookies: ${cookies}
+      Cookie: ${cookies}
     cookies:
     request_type: json
     payload:
@@ -90,7 +91,7 @@ case_info:
     method: DELETE
     headers:
       Content-Type: application/json; charset=utf-8;
-      cookies: ${cookies}
+      Cookie: ${cookies}
     cookies:
     request_type: json
     payload:

interface/gitlink/projects/test_gitlink_new_project.yaml

@@ -1,7 +1,7 @@
 case_common:
   allure_epic: GitLink接口
   allure_feature: 开源项目模块
-  allure_story: 项目
+  allure_story: 新建项目
   case_markers:
     - gitlink
     - projects
@@ -13,170 +13,174 @@ case_common:
 common_dependence:
   setup:
     interface:
+      # 获取开源许可证
       - gitlink_get_repo_licenses_01
+      # 获取gitignore
       - gitlink_get_repo_ignores_01
+      # 获取项目类别
       - gitlink_get_repo_category_01
+      # 获取项目语言
       - gitlink_get_repo_language_01
 
 
 case_info:
--
-  id: gitlink_projects_new_project_01
-  title: 正确输入各项必填参数，新建公开项目成功
-  severity: critical
-  run: True
-  url: /api/projects.json
-  method: POST
-  headers:
-    Content-Type: application/json; charset=utf-8;
+  - id: gitlink_projects_new_project_01
+    title: 正确输入各项必填参数，新建公开项目成功
+    severity: critical
+    run: True
+    url: /api/projects.json
+    method: POST
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${cookies}
+    cookies:
+    request_type: json
+    payload:
+      user_id: ${user_id}
+      name: test_${generate_words()}_${generate_identifier()}
+      repository_name: ${generate_identifier()}_test
+    files:
+    assert_response:
+      status_code: 200
+      assertId:
+        message: 断言接口返回的存在id
+        expect_value: id
+        assert_type: contains
+    assert_sql:
+    extract:
+      type_jsonpath:
+        project_id: $.id      # 项目id
+        repo_name: $.name
+        repo_owner: $.login
+        repo_identifier: $.identifier
+    case_dependence:
+      teardown:
+        interface:
+          # 清理数据：删除项目
+          - gitlink_projects_delete_project_01
+
+  - id: gitlink_projects_new_project_02
+    title: 正确输入各项必填参数，新建私有项目成功
+    run: true
+    url: /api/projects.json
+    method: POST
+    headers:
+      Content-Type: application/json; charset=utf-8;
     cookies: ${cookies}
-  cookies:
-  request_type: json
-  payload:
-    user_id: ${user_id}
-    name: test_${generate_catch_phrase()}
-    repository_name: ${generate_identifier()}_test
-  files:
-  assert_response:
+    request_type: json
+    payload:
+      user_id: ${user_id}
+      name: test_${generate_words()}_${generate_identifier()}
+      repository_name: ${generate_identifier()}_test
+      private: true
+    files:
+    assert_response:
       status_code: 200
       login:
         message: 断言接口返回的login
         expect_value: ${login}
         assert_type: ==
         type_jsonpath: $.login
-  assert_sql:
-  extract:
-    type_jsonpath:
-      project_id: $.id      # 项目id
-      repo_name: $.name
-      repo_owner: $.login
-      repo_identifier: $.identifier
-  case_dependence:
-    teardown:
-      interface:
-        - gitlink_projects_delete_project_01
+    assert_sql:
+    extract:
+      type_jsonpath:
+        repo_id: $.id
+        repo_name: $.name
+        repo_owner: $.login
+        repo_identifier: $.identifier
+    case_dependence:
+      teardown:
+        interface:
+          # 清理数据：删除项目
+          - gitlink_projects_delete_project_01
 
--
-  id: gitlink_projects_new_project_02
-  title: 正确输入各项必填参数，新建私有项目成功
-  run: true
-  url: /api/projects.json
-  method: POST
-  headers:
-    Content-Type: application/json; charset=utf-8;
-  cookies: ${cookies}
-  request_type: json
-  payload:
-    user_id: ${user_id}
-    name: 测试_${generate_catch_phrase()}
-    repository_name: ${generate_identifier()}_test
-    private: true
-  files:
-  assert_response:
+  - id: gitlink_projects_new_project_03
+    title: 输入所有参数，新建项目成功
+    run: true
+    url: /api/projects.json
+    method: POST
+    headers:
+      Content-Type: application/json; charset=utf-8;
+    cookies: ${cookies}
+    request_type: json
+    payload:
+      user_id: ${user_id}
+      name: test_${generate_words()}_${generate_identifier()}
+      repository_name: ${generate_identifier()}_test
+      description: ${generate_paragraph()}
+      private: true
+      ignoreFlag: true
+      ignore_id: ${ignores_id}
+      ignore: ${ignores_name}
+      licenseFlag: true
+      license_id: ${licenses_id}
+      license: ${licenses_name}
+      categoreFlag: true
+      project_category_id: ${repo_category_id}
+      project_category: ${repo_category_name}
+      languageFlag: true
+      project_language_id: ${repo_language_id}
+      project_language: ${repo_language_name}
+    #    blockchain: false
+    #    blockchain_token_all: 10000
+    #    blockchain_init_token:
+    files:
+    assert_response:
       status_code: 200
       login:
         message: 断言接口返回的login
         expect_value: ${login}
         assert_type: ==
         type_jsonpath: $.login
-  assert_sql:
-  extract:
-    type_jsonpath:
-      repo_id: $.id
-      repo_name: $.name
-      repo_owner: $.login
-      repo_identifier: $.identifier
-  case_dependence:
-    teardown:
-      interface:
-        - gitlink_projects_delete_project_01
+    assert_sql:
+    extract:
+      type_jsonpath:
+        repo_id: $.id
+        repo_name: $.name
+        repo_owner: $.login
+        repo_identifier: $.identifier
+    case_dependence:
+      teardown:
+        interface:
+          # 清理数据：删除项目
+          - gitlink_projects_delete_project_01
 
--
-  id: gitlink_projects_new_project_03
-  title: 输入所有参数，新建项目成功
-  run: true
-  url: /api/projects.json
-  method: POST
-  headers:
-    Content-Type: application/json; charset=utf-8;
-  cookies: ${cookies}
-  request_type: json
-  payload:
-    user_id: ${user_id}
-    name: test_${generate_catch_phrase()}
-    repository_name: ${generate_identifier()}_test
-    description: ${generate_paragraph()}
-    private: true
-    ignoreFlag: true
-    ignore_id: ${ignores_id}
-    ignore: ${ignores_name}
-    licenseFlag: true
-    license_id: ${licenses_id}
-    license: ${licenses_name}
-    categoreFlag: true
-    project_category_id: ${repo_category_id}
-    project_category: ${repo_category_name}
-    languageFlag: true
-    project_language_id: ${repo_language_id}
-    project_language: ${repo_language_name}
-#    blockchain: false
-#    blockchain_token_all: 10000
-#    blockchain_init_token:
-  files:
-  assert_response:
+  - id: gitlink_projects_new_project_04
+    title: 正确输入各项必填参数，新建项目成功（校验数据库）
+    severity: normal
+    run: false
+    url: /api/projects.json
+    method: POST
+    headers:
+      Content-Type: application/json; charset=utf-8;
+    cookies: ${cookies}
+    request_type: json
+    payload:
+      user_id: ${user_id}
+      name: test_${generate_words()}_${generate_identifier()}
+      repository_name: ${generate_identifier()}_test
+    files:
+    assert_response:
       status_code: 200
       login:
         message: 断言接口返回的login
         expect_value: ${login}
         assert_type: ==
         type_jsonpath: $.login
-  assert_sql:
-  extract:
-    type_jsonpath:
-      repo_id: $.id
-      repo_name: $.name
-      repo_owner: $.login
-      repo_identifier: $.identifier
-  case_dependence:
-    teardown:
-      interface:
-        - gitlink_projects_delete_project_01
--
-  id: gitlink_projects_new_project_04
-  title: 正确输入各项必填参数，新建项目成功（校验数据库）
-  severity: normal
-  run: false
-  url: /api/projects.json
-  method: POST
-  headers:
-    Content-Type: application/json; charset=utf-8;
-  cookies: ${cookies}
-  request_type: json
-  payload:
-    user_id: ${user_id}
-    name: test_${generate_catch_phrase()}
-    repository_name: ${generate_identifier()}_test
-  files:
-  assert_response:
-      status_code: 200
-      login:
-        message: 断言接口返回的login
-        expect_value: ${login}
-        assert_type: ==
-        type_jsonpath: $.login
-  assert_sql:
-    eq:
-      sql: select id,`name`, identifier from projects where user_id=${user_id} ORDER BY created_on DESC;
-      $.id: ${pms_project_id}
-      $.name: ${project_name}
-      $.identifier: ${project_identifier}
-  extract:
-    type_jsonpath:
-      repo_id: $.id
-      repo_name: $.name
-      repo_owner: $.login
-      repo_identifier: $.identifier
-  case_dependence:
-    teardown:
-      interface:
-        - gitlink_projects_delete_project_01
+    assert_sql:
+      eq:
+        sql: select id,`name`, identifier from projects where user_id=${user_id} ORDER BY created_on DESC;
+        $.id: ${pms_project_id}
+        $.name: ${project_name}
+        $.identifier: ${project_identifier}
+    extract:
+      type_jsonpath:
+        repo_id: $.id
+        repo_name: $.name
+        repo_owner: $.login
+        repo_identifier: $.identifier
+    case_dependence:
+      teardown:
+        interface:
+          # 清理数据：删除项目
+          - gitlink_projects_delete_project_01

interface/gitlink/projects/test_gitlink_upload_files.yaml

@@ -10,76 +10,46 @@ case_common:
 
 # 用例数据
 case_info:
--
-  id: gitlink_upload_file_01
-  title: 正常上传文件
-  severity:
-  run: true
-  url: /api/attachments.json
-  method: POST
-  headers:
-    cookies: ${cookie}
-    Content-Type: application/json; charset=utf-8;
-  cookies:
-  request_type: file
-  payload:
-  files: TOC出库订单导入模板(2).xlsx
-  assert_response:
+  - id: gitlink_upload_file_01
+    title: 正常上传文件
+    severity:
+    run: true
+    url: /api/attachments.json
+    method: POST
+    headers:
+      Cookie: ${cookies}
+      Content-Type: application/json; charset=utf-8;
+    cookies:
+    request_type: file
+    payload:
+    files: TOC出库订单导入模板(2).xlsx
+    assert_response:
       status_code: 200
       asserFileName:
         message: 断言接口返回的filename
         expect_value: TOC出库订单导入模板(2).xlsx
         assert_type: ==
         type_jsonpath: $.title
-  assert_sql:
-  extract:
-    type_jsonpath:
-      attachment_id: $.id
+    assert_sql:
+    extract:
+      type_jsonpath:
+        attachment_id: $.id
 
--
-  id: gitlink_upload_file_02
-  title: file为空，文件上传失败
-  severity:
-  run: true
-  url: /api/attachments.json
-  method: POST
-  headers:
-    cookies: ${cookie}
-    Content-Type: application/json; charset=utf-8;
-  cookies:
-  request_type: file
-  payload:
-  files:
-  assert_response:
-      status_code: 200
-      assertStatus:
-        message: 断言接口返回的status
-        expect_value: -1
-        assert_type: ==
-        type_jsonpath: $.status
-      assertMessage:
-        message: 断言接口返回的message
-        expect_value: 未上传文件
-        assert_type: ==
-        type_jsonpath: $.message
-  assert_sql:
-  extract:
 
-# 由于requests采用的是session方式，fixture执行了login后会产生cookies， session会记录cookies。因此下述用例虽然没用传登录cookies,但是实际有，会上传成功。暂时还没想好如何解决这一问题
--
-  id: gitlink_upload_file_03
-  title: 无用户登录信息上传文件，提示用户先登录
-  severity:
-  run: False
-  url: /api/attachments.json
-  method: POST
-  headers:
-    Content-Type: application/json; charset=utf-8;
-  cookies:
-  request_type: file
-  payload:
-  files: TOC出库订单导入模板(2).xlsx
-  assert_response:
+  # 由于requests采用的是session方式，fixture执行了login后会产生cookies， session会记录cookies。因此下述用例虽然没用传登录cookies,但是实际有，会上传成功。暂时还没想好如何解决这一问题
+  - id: gitlink_upload_file_02
+    title: 无用户登录信息上传文件，提示用户先登录
+    severity:
+    run: True
+    url: /api/attachments.json
+    method: POST
+    headers:
+      Content-Type: application/json; charset=utf-8;
+    cookies:
+    request_type: file
+    payload:
+    files: TOC出库订单导入模板(2).xlsx
+    assert_response:
       status_code: 200
       assertStatus:
         message: 断言接口返回的status
@@ -91,5 +61,5 @@ case_info:
         expect_value: 请登录后再操作
         assert_type: ==
         type_jsonpath: $.message
-  assert_sql:
-  extract:
+    assert_sql:
+    extract:

interface/gitlink/projects/webhook/test_gitlink_get_repo_webhook_detail.yaml

@@ -4,20 +4,12 @@ case_common:
   allure_story: Webhook
   case_markers:
     - gitlink
+    - projects
     - gitea
     - webhook
     - usefixtures: gitlink_login
 
 # 前提条件：仅仓库管理员及以上角色才有权限，当前仓库存在webhook
-common_dependence:
-  setup:
-    interface:
-      # 新建私有仓库
-      - gitlink_projects_new_project_02
-  teardown:
-    interface:
-      # 删除仓库
-      - gitlink_projects_delete_project_01
 
 case_info:
 -
@@ -25,11 +17,11 @@ case_info:
   title: 仓库管理员获取Webhook详情，获取成功
   severity: normal
   run: True
-  url: /api/${repo_owner}/${repo_identifier}/webhooks/${repo_webhook_id}/edit.json
+  url: /api/${init_repo_owner}/${init_repo_identifier}/webhooks/${repo_webhook_id}/edit.json
   method: GET
   headers:
     Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
+    Cookie: ${admin_cookies}
   cookies:
   request_type: params
   payload:
@@ -46,8 +38,8 @@ case_info:
     setup:
       interface:
         # 新建webhook
-        - gitlink_get_repo_add_webhook_03
+        - gitlink_repo_add_webhook_03
     teardown:
       interface:
         # 删除webhook
-        - gitlink_get_repo_delete_webhook_01
+        - gitlink_repo_delete_webhook_01

interface/gitlink/projects/webhook/test_gitlink_get_repo_webhook_history_list.yaml

@@ -4,54 +4,45 @@ case_common:
   allure_story: Webhook
   case_markers:
     - gitlink
+    - projects
     - gitea
     - webhook
     - usefixtures: gitlink_login
 
 # 前提条件：仅仓库管理员及以上角色才有权限，当前仓库存在webhook
-common_dependence:
-  setup:
-    interface:
-      # 新建私有仓库
-      - gitlink_projects_new_project_02
-  teardown:
-    interface:
-      # 删除仓库
-      - gitlink_projects_delete_project_01
 
 case_info:
--
-  id: gitlink_get_repo_webhook_history_list_01
-  title: 仓库管理员获取Webhook历史推送列表，获取成功
-  severity: normal
-  run: True
-  url: /api/${repo_owner}/${repo_identifier}/webhooks/${repo_webhook_id}/tasks.json
-  method: GET
-  headers:
-    Content-Type: application/json; charset=utf-8;
-    cookies: ${cookies}
-  cookies:
-  request_type: params
-  payload:
-    page: 1
-    limit: 10
-  files:
-  assert_response:
+  - id: gitlink_get_repo_webhook_history_list_01
+    title: 仓库管理员获取Webhook历史推送列表，获取成功
+    severity: normal
+    run: True
+    url: /api/${init_repo_owner}/${init_repo_identifier}/webhooks/${repo_webhook_id}/tasks.json
+    method: GET
+    headers:
+      Content-Type: application/json; charset=utf-8;
+      Cookie: ${admin_cookies}
+    cookies:
+    request_type: params
+    payload:
+      page: 1
+      limit: 10
+    files:
+    assert_response:
       status_code: 200
       assertMessage:
         message: 断言接口返回包括字段total_count
         expect_value: total_count
         assert_type: contains
-  assert_sql:
-  extract:
-  case_dependence:
-    setup:
-      interface:
-        # 新建webhook
-        - gitlink_get_repo_add_webhook_03
-        # 测试推送
-        - gitlink_get_repo_webhook_test_01
-    teardown:
-      interface:
-        # 删除webhook
-        - gitlink_get_repo_delete_webhook_01
+    assert_sql:
+    extract:
+    case_dependence:
+      setup:
+        interface:
+          # 新建webhook
+          - gitlink_repo_add_webhook_03
+          # 测试推送
+          - gitlink_repo_webhook_test_01
+      teardown:
+        interface:
+          # 删除webhook
+          - gitlink_repo_delete_webhook_01