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 /models/repo | |
| 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 'models/repo')
| -rw-r--r-- | models/repo/repo_list_test.go | 10 | ||||
| -rw-r--r-- | models/repo/repo_test.go | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/models/repo/repo_list_test.go b/models/repo/repo_list_test.go index 7097b6ea14..8a1799aac0 100644 --- a/models/repo/repo_list_test.go +++ b/models/repo/repo_list_test.go @@ -66,7 +66,7 @@ func getTestCases() []struct { count: 0, }, { - name: "PublicRepositoriesOfUser3", + name: "PublicRepositoriesOfOrg3", opts: &repo_model.SearchRepoOptions{ListOptions: db.ListOptions{Page: 1, PageSize: 10}, OwnerID: 20, Collaborate: util.OptionalBoolFalse}, count: 2, }, @@ -81,7 +81,7 @@ func getTestCases() []struct { count: 0, }, { - name: "PublicAndPrivateRepositoriesOfUser3", + name: "PublicAndPrivateRepositoriesOfOrg3", opts: &repo_model.SearchRepoOptions{ListOptions: db.ListOptions{Page: 1, PageSize: 10}, OwnerID: 20, Private: true, Collaborate: util.OptionalBoolFalse}, count: 4, }, @@ -96,7 +96,7 @@ func getTestCases() []struct { count: 1, }, { - name: "PublicRepositoriesOfUser3IncludingCollaborative", + name: "PublicRepositoriesOfOrg3IncludingCollaborative", opts: &repo_model.SearchRepoOptions{ListOptions: db.ListOptions{Page: 1, PageSize: 10}, OwnerID: 20}, count: 3, }, @@ -111,7 +111,7 @@ func getTestCases() []struct { count: 4, }, { - name: "PublicAndPrivateRepositoriesOfUser3IncludingCollaborative", + name: "PublicAndPrivateRepositoriesOfOrg3IncludingCollaborative", opts: &repo_model.SearchRepoOptions{ListOptions: db.ListOptions{Page: 1, PageSize: 10}, OwnerID: 20, Private: true}, count: 7, }, @@ -168,7 +168,7 @@ func getTestCases() []struct { { name: "OwnerSlashRepoSearch", opts: &repo_model.SearchRepoOptions{Keyword: "user/repo2", ListOptions: db.ListOptions{Page: 1, PageSize: 10}, Private: true, OwnerID: 0}, - count: 3, + count: 2, }, { name: "OwnerSlashSearch", diff --git a/models/repo/repo_test.go b/models/repo/repo_test.go index 92a58ea3f9..fb021561c3 100644 --- a/models/repo/repo_test.go +++ b/models/repo/repo_test.go @@ -121,7 +121,7 @@ func TestMetas(t *testing.T) { metas = repo.ComposeMetas() assert.Contains(t, metas, "org") assert.Contains(t, metas, "teams") - assert.Equal(t, "user3", metas["org"]) + assert.Equal(t, "org3", metas["org"]) assert.Equal(t, ",owners,team1,", metas["teams"]) } |