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 /modules/references/references_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'
![ksnip_20230913-112819](https://github.com/go-gitea/gitea/assets/70063547/442988c5-4cf4-49b8-aa01-4dd6bf0ca954)
3. Change the search result number of `user/repo2` because
`user3/repo21` can't be searched now
![ksnip_20230913-112931](https://github.com/go-gitea/gitea/assets/70063547/d9ebeba4-479f-4110-9a85-825efbc981fd)
4. Change the first org name getting from API because the result is
ordered by alphabet asc and now `org 17` is before `org25`
![JW8U7NIO(J$H
_YCRB36H)T](https://github.com/go-gitea/gitea/assets/70063547/f55a685c-cf24-40e5-a87f-3a2327319548)
![)KFD411O4I8RB5ZOH7E0
Z3](https://github.com/go-gitea/gitea/assets/70063547/a0dc3299-249c-46f6-91cb-d15d4ee88dd5)
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 'modules/references/references_test.go')
-rw-r--r-- | modules/references/references_test.go | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/modules/references/references_test.go b/modules/references/references_test.go index 75e002c99a..b60d6b0459 100644 --- a/modules/references/references_test.go +++ b/modules/references/references_test.go @@ -78,15 +78,15 @@ func TestFindAllIssueReferences(t *testing.T) { []testResult{}, }, { - "This user3/repo4#200 yes.", + "This org3/repo4#200 yes.", []testResult{ - {200, "user3", "repo4", "200", false, XRefActionNone, &RefSpan{Start: 5, End: 20}, nil, ""}, + {200, "org3", "repo4", "200", false, XRefActionNone, &RefSpan{Start: 5, End: 19}, nil, ""}, }, }, { - "This user3/repo4!200 yes.", + "This org3/repo4!200 yes.", []testResult{ - {200, "user3", "repo4", "200", true, XRefActionNone, &RefSpan{Start: 5, End: 20}, nil, ""}, + {200, "org3", "repo4", "200", true, XRefActionNone, &RefSpan{Start: 5, End: 19}, nil, ""}, }, }, { @@ -106,13 +106,13 @@ func TestFindAllIssueReferences(t *testing.T) { }, }, { - "This [four](http://gitea.com:3000/user3/repo4/issues/203) yes.", + "This [four](http://gitea.com:3000/org3/repo4/issues/203) yes.", []testResult{ - {203, "user3", "repo4", "203", false, XRefActionNone, nil, nil, ""}, + {203, "org3", "repo4", "203", false, XRefActionNone, nil, nil, ""}, }, }, { - "This [five](http://github.com/user3/repo4/issues/204) no.", + "This [five](http://github.com/org3/repo4/issues/204) no.", []testResult{}, }, { @@ -151,9 +151,9 @@ func TestFindAllIssueReferences(t *testing.T) { }, }, { - "Do you fix user6/repo6#300 ? yes", + "Do you fix org6/repo6#300 ? yes", []testResult{ - {300, "user6", "repo6", "300", false, XRefActionCloses, &RefSpan{Start: 11, End: 26}, &RefSpan{Start: 7, End: 10}, ""}, + {300, "org6", "repo6", "300", false, XRefActionCloses, &RefSpan{Start: 11, End: 25}, &RefSpan{Start: 7, End: 10}, ""}, }, }, { @@ -190,9 +190,9 @@ func TestFindAllIssueReferences(t *testing.T) { }, }, { - "This user3/repo4#200, yes.", + "This org3/repo4#200, yes.", []testResult{ - {200, "user3", "repo4", "200", false, XRefActionNone, &RefSpan{Start: 5, End: 20}, nil, ""}, + {200, "org3", "repo4", "200", false, XRefActionNone, &RefSpan{Start: 5, End: 19}, nil, ""}, }, }, { @@ -498,15 +498,15 @@ func TestCustomizeCloseKeywords(t *testing.T) { }, }, { - "CerrĂ³ user6/repo6#300 yes", + "CerrĂ³ org6/repo6#300 yes", []testResult{ - {300, "user6", "repo6", "300", false, XRefActionCloses, &RefSpan{Start: 7, End: 22}, &RefSpan{Start: 0, End: 6}, ""}, + {300, "org6", "repo6", "300", false, XRefActionCloses, &RefSpan{Start: 7, End: 21}, &RefSpan{Start: 0, End: 6}, ""}, }, }, { - "Reabre user3/repo4#200 yes", + "Reabre org3/repo4#200 yes", []testResult{ - {200, "user3", "repo4", "200", false, XRefActionReopens, &RefSpan{Start: 7, End: 22}, &RefSpan{Start: 0, End: 6}, ""}, + {200, "org3", "repo4", "200", false, XRefActionReopens, &RefSpan{Start: 7, End: 21}, &RefSpan{Start: 0, End: 6}, ""}, }, }, } |