diff --git a/interface/gitlink/projects/branch/test_new_branch.yaml b/interface/gitlink/projects/branch/test_new_branch.yaml index ceedcfd..8ac035f 100644 --- a/interface/gitlink/projects/branch/test_new_branch.yaml +++ b/interface/gitlink/projects/branch/test_new_branch.yaml @@ -7,6 +7,7 @@ case_common: - branches - gitea - usefixtures: get_oauth_token + - skip: 需要项目成员才能操作，暂时略过 case_info: - diff --git a/interface/gitlink/projects/releases/test_new_releases.yaml b/interface/gitlink/projects/releases/test_new_releases.yaml index f9eb297..482e3a6 100644 --- a/interface/gitlink/projects/releases/test_new_releases.yaml +++ b/interface/gitlink/projects/releases/test_new_releases.yaml @@ -7,6 +7,7 @@ case_common: - release - gitea - usefixtures: get_oauth_token + - skip: 需要项目成员才能操作，暂时略过 case_info: - diff --git a/interface/gitlink/projects/repository/test_project_detail_full.yaml b/interface/gitlink/projects/repository/test_project_detail_full.yaml index 11aedfe..849abb5 100644 --- a/interface/gitlink/projects/repository/test_project_detail_full.yaml +++ b/interface/gitlink/projects/repository/test_project_detail_full.yaml @@ -25,10 +25,9 @@ case_info: files: assert_response: status_code: 200 - assertProjectId: - message: 断言projectid - assert_type: == - expect_value: ${project_id} - type_jsonpath: $.project_id + assertDefaultBranch: + message: 断言接口响应存在default_branch字段 + assert_type: contains + expect_value: default_branch assert_sql: extract: diff --git a/interface/gitlink/projects/repository/test_project_detail_simple.yaml b/interface/gitlink/projects/repository/test_project_detail_simple.yaml index b0ef5a4..a766f1d 100644 --- a/interface/gitlink/projects/repository/test_project_detail_simple.yaml +++ b/interface/gitlink/projects/repository/test_project_detail_simple.yaml @@ -25,10 +25,9 @@ case_info: files: assert_response: status_code: 200 - assertProjectId: - message: 断言projectid - assert_type: == - expect_value: ${project_id} - type_jsonpath: $.id + assertIdentifier: + message: 断言接口响应存在identifier字段 + assert_type: contains + expect_value: identifier assert_sql: extract: diff --git a/interface/gitlink/projects/test_delete_project.yaml b/interface/gitlink/projects/test_delete_project.yaml index 5773200..47e2914 100644 --- a/interface/gitlink/projects/test_delete_project.yaml +++ b/interface/gitlink/projects/test_delete_project.yaml @@ -7,7 +7,6 @@ case_common: - projects - gitea - delete_project - - usefixtures: new_project case_info: - @@ -24,7 +23,6 @@ case_info: request_type: json payload: files: - extract: assert_response: status_code: 200 assert_status: @@ -37,4 +35,9 @@ case_info: expect_value: success assert_type: == type_jsonpath: $.message - assert_sql: \ No newline at end of file + assert_sql: + extract: + case_dependence: + setup: + interface: + - gitlink_projects_new_project_01 \ No newline at end of file diff --git a/interface/gitlink/projects/test_follow_project.yaml b/interface/gitlink/projects/test_follow_project.yaml index 5e8d29a..2fc240a 100644 --- a/interface/gitlink/projects/test_follow_project.yaml +++ b/interface/gitlink/projects/test_follow_project.yaml @@ -8,7 +8,6 @@ case_common: - gitea - follow_project - usefixtures: get_oauth_token - - skip: 前提是有一个未关注的项目，暂时略过 case_info: - @@ -45,4 +44,9 @@ case_info: assert_type: == type_jsonpath: $.watched assert_sql: - extract: \ No newline at end of file + extract: + case_dependence: + setup: + interface: gitlink_projects_new_project_01 + teardown: + interface: gitlink_projects_delete_project_01 \ No newline at end of file diff --git a/interface/gitlink/projects/test_fork_project.yaml b/interface/gitlink/projects/test_fork_project.yaml index 3b32f09..19d61aa 100644 --- a/interface/gitlink/projects/test_fork_project.yaml +++ b/interface/gitlink/projects/test_fork_project.yaml @@ -8,7 +8,7 @@ case_common: - gitea - fork_project - usefixtures: get_oauth_token - - skip: 前提是有一个未fork的项目，暂时略过 + - skip: 需要fork一个非本人的项目，先暂时略过 case_info: - @@ -16,7 +16,7 @@ case_info: title: fork项目 severity: critical run: True - url: /api/${project_url}/forks.json + url: /api/${repo_owner}/${repo_identifier}/forks.json method: POST headers: Content-Type: application/json; charset=utf-8; @@ -41,4 +41,10 @@ case_info: extract: type_jsonpath: repo_id: $.id - repo_identifier: $.identifier \ No newline at end of file + repo_identifier: $.identifier + case_dependence: + setup: + interface: + - gitlink_projects_new_project_01 + teardown: + interface: gitlink_projects_delete_project_01 \ No newline at end of file diff --git a/interface/gitlink/projects/test_like_project.yaml b/interface/gitlink/projects/test_like_project.yaml index 12da7ba..9bebad9 100644 --- a/interface/gitlink/projects/test_like_project.yaml +++ b/interface/gitlink/projects/test_like_project.yaml @@ -8,7 +8,6 @@ case_common: - gitea - like_project - usefixtures: get_oauth_token - - skip: 前提是有一个未点赞的项目，暂时略过 case_info: - @@ -44,3 +43,8 @@ case_info: type_jsonpath: $.praised assert_sql: extract: + case_dependence: + setup: + interface: gitlink_projects_new_project_01 + teardown: + interface: gitlink_projects_delete_project_01 diff --git a/interface/gitlink/projects/test_new_project.yaml b/interface/gitlink/projects/test_new_project.yaml index 098f6b4..39612f8 100644 --- a/interface/gitlink/projects/test_new_project.yaml +++ b/interface/gitlink/projects/test_new_project.yaml @@ -36,7 +36,7 @@ case_info: assert_sql: extract: type_jsonpath: - repo_id: $.id + project_id: $.id # 项目id repo_name: $.name repo_owner: $.login repo_identifier: $.identifier diff --git a/interface/gitlink/projects/test_unfollow_project.yaml b/interface/gitlink/projects/test_unfollow_project.yaml index 3cbb7a6..a5168c3 100644 --- a/interface/gitlink/projects/test_unfollow_project.yaml +++ b/interface/gitlink/projects/test_unfollow_project.yaml @@ -8,7 +8,6 @@ case_common: - gitea - unfollow_project - usefixtures: get_oauth_token - - skip: 需要有一个已关注项目，暂时掠过，后续完善 case_info: - @@ -17,7 +16,7 @@ case_info: severity: critical run: True url: /api/watchers/unfollow.json - method: POST + method: DELETE headers: Content-Type: application/json; charset=utf-8; Authorization: ${token_type} ${access_token} @@ -45,4 +44,9 @@ case_info: assert_type: == type_jsonpath: $.watched assert_sql: - extract: \ No newline at end of file + extract: + case_dependence: + setup: + interface: + - gitlink_projects_new_project_01 + - gitlink_projects_follow_project_01 \ No newline at end of file diff --git a/interface/gitlink/projects/test_unlike_project.yaml b/interface/gitlink/projects/test_unlike_project.yaml index abe90e1..a33c00f 100644 --- a/interface/gitlink/projects/test_unlike_project.yaml +++ b/interface/gitlink/projects/test_unlike_project.yaml @@ -8,7 +8,6 @@ case_common: - gitea - unlike_project - usefixtures: get_oauth_token - - skip: 需要有一个已点赞项目，暂时掠过，后续完善 case_info: - @@ -17,7 +16,7 @@ case_info: severity: critical run: true url: /api/projects/${project_id}/praise_tread/unlike.json - method: POST + method: DELETE headers: Content-Type: application/json; charset=utf-8; Authorization: ${token_type} ${access_token} @@ -43,4 +42,9 @@ case_info: assert_type: == type_jsonpath: $.praised assert_sql: - extract: \ No newline at end of file + extract: + case_dependence: + setup: + interface: + - gitlink_projects_new_project_01 + - gitlink_projects_like_project_01 \ No newline at end of file diff --git a/interface/gitlink/users/test_user_change_email.yaml b/interface/gitlink/users/test_user_change_email.yaml index d3e5d85..9970bb5 100644 --- a/interface/gitlink/users/test_user_change_email.yaml +++ b/interface/gitlink/users/test_user_change_email.yaml @@ -7,7 +7,6 @@ case_common: - gitlink - gitea - change_email - - login: 登录接口 - usefixtures: get_oauth_token # 用例数据 diff --git a/interface/gitlink/users/test_user_change_password.yaml b/interface/gitlink/users/test_user_change_password.yaml index 93d39b9..0682b4d 100644 --- a/interface/gitlink/users/test_user_change_password.yaml +++ b/interface/gitlink/users/test_user_change_password.yaml @@ -7,9 +7,7 @@ case_common: - gitlink - gitea - change_pwd - - login: 登录接口 - usefixtures: get_oauth_token - - skip: 跳过执行该用例 # 用例数据 case_info: @@ -67,13 +65,13 @@ case_info: assert_response: status_code: 200 assert_status: - message: 断言接口status=-2 - expect_value: -2 + message: 断言接口status=-1 + expect_value: -1 assert_type: == type_jsonpath: $.status assert_message: message: 断言接口message=success - expect_value: 新密码与确认密码不一致 + expect_value: 两次输入的密码不一致 assert_type: == type_jsonpath: $.message assert_sql: diff --git a/interface/gitlink/users/test_user_change_phone.yaml b/interface/gitlink/users/test_user_change_phone.yaml index ba4356b..a066e1d 100644 --- a/interface/gitlink/users/test_user_change_phone.yaml +++ b/interface/gitlink/users/test_user_change_phone.yaml @@ -6,7 +6,6 @@ case_common: case_markers: - gitlink - change_phone - - login: 登录接口 - usefixtures: get_oauth_token # 用例数据 diff --git a/test_case/conftest.py b/test_case/conftest.py index 59914bc..d56b6e2 100644 --- a/test_case/conftest.py +++ b/test_case/conftest.py @@ -100,27 +100,4 @@ def get_oauth_token(): login_oauth_token_api = get_api_data(os.path.join(GITLINK_DIR, "login_oauth_token.yaml"), "gitlink_login_oauth_token_01") - api_work_flow(login_oauth_token_api, GLOBAL_VARS) - - -@pytest.fixture(scope="session") -def delete_project(): - """ - 删除测试项目，清理测试数据 - """ - yield - delete_project_api = get_api_data(os.path.join(GITLINK_DIR, "projects", "test_delete_project.yaml"), - "gitlink_projects_delete_project_01") - - api_work_flow(delete_project_api, GLOBAL_VARS) - - -@pytest.fixture(scope="session") -def new_project(get_oauth_token): - """ - 新建测试项目，用于测试 - """ - new_project_api = get_api_data(os.path.join(GITLINK_DIR, "projects", "test_new_project.yaml"), - "gitlink_projects_new_project_01") - - api_work_flow(new_project_api, GLOBAL_VARS) + api_work_flow(login_oauth_token_api, GLOBAL_VARS) \ No newline at end of file