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 /services | |
| 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 'services')
| -rw-r--r-- | services/issue/commit_test.go | 4 | ||||
| -rw-r--r-- | services/repository/transfer_test.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/services/issue/commit_test.go b/services/issue/commit_test.go index 1bc9f6f951..0518803683 100644 --- a/services/issue/commit_test.go +++ b/services/issue/commit_test.go @@ -262,7 +262,7 @@ func TestUpdateIssuesCommit_AnotherRepoNoPermission(t *testing.T) { CommitterName: "User Ten", AuthorEmail: "user10@example.com", AuthorName: "User Ten", - Message: "close user3/repo3#1", + Message: "close org3/repo3#1", }, { Sha1: "abcdef4", @@ -270,7 +270,7 @@ func TestUpdateIssuesCommit_AnotherRepoNoPermission(t *testing.T) { CommitterName: "User Ten", AuthorEmail: "user10@example.com", AuthorName: "User Ten", - Message: "close " + setting.AppURL + "user3/repo3/issues/1", + Message: "close " + setting.AppURL + "org3/repo3/issues/1", }, } diff --git a/services/repository/transfer_test.go b/services/repository/transfer_test.go index 45a5b381fe..d55c76ea47 100644 --- a/services/repository/transfer_test.go +++ b/services/repository/transfer_test.go @@ -42,7 +42,7 @@ func TestTransferOwnership(t *testing.T) { transferredRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 3}) assert.EqualValues(t, 2, transferredRepo.OwnerID) - exist, err := util.IsExist(repo_model.RepoPath("user3", "repo3")) + exist, err := util.IsExist(repo_model.RepoPath("org3", "repo3")) assert.NoError(t, err) assert.False(t, exist) exist, err = util.IsExist(repo_model.RepoPath("user2", "repo3")) @@ -52,7 +52,7 @@ func TestTransferOwnership(t *testing.T) { OpType: activities_model.ActionTransferRepo, ActUserID: 2, RepoID: 3, - Content: "user3/repo3", + Content: "org3/repo3", }) unittest.CheckConsistencyFor(t, &repo_model.Repository{}, &user_model.User{}, &organization.Team{}) |