diff options
| author | Nanguan Lin <70063547+lng2020@users.noreply.github.com> | 2023-09-14 10:59:53 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-14 02:59:53 +0000 |
| commit | da50be73604589be9381e8811af5465fa47558f1 (patch) | |
| tree | e33d0b20157a84abb8714ab6d2f2bc901630371d /tests/integration/api_user_info_test.go | |
| parent | d0318c4ae004e754a6e0e10a44df7552ad9a2712 (diff) | |
| download | gitea-da50be73604589be9381e8811af5465fa47558f1.tar.gz gitea-da50be73604589be9381e8811af5465fa47558f1.zip | |
Replace 'userxx' with 'orgxx' in all test files when the user type is org (#27052)
Currently 'userxx' and 'orgxx' are both used as username in test files
when the user type is org, which is confusing. This PR replaces all
'userxx' with 'orgxx' when the user type is org(`user.type==1`).
Some non-trivial changes
1. Rename `user3` dir to `org3` in `tests/git-repositories-meta`
2. Change `end` in `issue reference` because 'org3' is one char shorter
than 'user3'
3. Change the search result number of `user/repo2` because
`user3/repo21` can't be searched now
4. Change the first org name getting from API because the result is
ordered by alphabet asc and now `org 17` is before `org25`
Other modifications are just find all and replace all.
Unit tests with SQLite are all passed.
---------
Co-authored-by: caicandong <1290147055@qq.com>
Diffstat (limited to 'tests/integration/api_user_info_test.go')
| -rw-r--r-- | tests/integration/api_user_info_test.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/integration/api_user_info_test.go b/tests/integration/api_user_info_test.go index f4edfd8941..cf42b50a4d 100644 --- a/tests/integration/api_user_info_test.go +++ b/tests/integration/api_user_info_test.go @@ -23,7 +23,7 @@ func TestAPIUserInfo(t *testing.T) { user := "user1" user2 := "user31" - user3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "user3"}) + org3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "org3"}) session := loginUser(t, user) token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadUser) @@ -42,16 +42,16 @@ func TestAPIUserInfo(t *testing.T) { MakeRequest(t, req, http.StatusNotFound) // test if the placaholder Mail is returned if a User is not logged in - req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s", user3.Name)) + req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s", org3.Name)) resp = MakeRequest(t, req, http.StatusOK) DecodeJSON(t, resp, &u) - assert.Equal(t, user3.GetPlaceholderEmail(), u.Email) + assert.Equal(t, org3.GetPlaceholderEmail(), u.Email) // Test if the correct Mail is returned if a User is logged in - req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s?token=%s", user3.Name, token)) + req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s?token=%s", org3.Name, token)) resp = MakeRequest(t, req, http.StatusOK) DecodeJSON(t, resp, &u) - assert.Equal(t, user3.GetEmail(), u.Email) + assert.Equal(t, org3.GetEmail(), u.Email) }) t.Run("GetAuthenticatedUser", func(t *testing.T) { |