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>

models/fixtures/email_address.yml

@@ -73,8 +73,8 @@
 -
   id: 10
   uid: 3
-  email: user3@example.com
+  email: org3@example.com
-  lower_email: user3@example.com
+  lower_email: org3@example.com
   is_activated: true
   is_primary: true
 
@@ -97,16 +97,16 @@
 -
   id: 13
   uid: 6
-  email: user6@example.com
+  email: org6@example.com
-  lower_email: user6@example.com
+  lower_email: org6@example.com
   is_activated: true
   is_primary: true
 
 -
   id: 14
   uid: 7
-  email: user7@example.com
+  email: org7@example.com
-  lower_email: user7@example.com
+  lower_email: org7@example.com
   is_activated: true
   is_primary: true
 
@@ -153,8 +153,8 @@
 -
   id: 20
   uid: 17
-  email: user17@example.com
+  email: org17@example.com
-  lower_email: user17@example.com
+  lower_email: org17@example.com
   is_activated: true
   is_primary: true
 
@@ -169,8 +169,8 @@
 -
   id: 22
   uid: 19
-  email: user19@example.com
+  email: org19@example.com
-  lower_email: user19@example.com
+  lower_email: org19@example.com
   is_activated: true
   is_primary: true
 

models/fixtures/repository.yml

@@ -64,7 +64,7 @@
 -
   id: 3
   owner_id: 3
-  owner_name: user3
+  owner_name: org3
   lower_name: repo3
   name: repo3
   default_branch: master
@@ -126,7 +126,7 @@
 -
   id: 5
   owner_id: 3
-  owner_name: user3
+  owner_name: org3
   lower_name: repo5
   name: repo5
   num_watches: 0
@@ -671,7 +671,7 @@
 -
   id: 23
   owner_id: 17
-  owner_name: user17
+  owner_name: org17
   lower_name: big_test_public_4
   name: big_test_public_4
   num_watches: 0
@@ -701,7 +701,7 @@
 -
   id: 24
   owner_id: 17
-  owner_name: user17
+  owner_name: org17
   lower_name: big_test_private_4
   name: big_test_private_4
   num_watches: 0
@@ -791,7 +791,7 @@
 -
   id: 27
   owner_id: 19
-  owner_name: user19
+  owner_name: org19
   lower_name: big_test_public_mirror_6
   name: big_test_public_mirror_6
   num_watches: 0
@@ -821,7 +821,7 @@
 -
   id: 28
   owner_id: 19
-  owner_name: user19
+  owner_name: org19
   lower_name: big_test_private_mirror_6
   name: big_test_private_mirror_6
   num_watches: 0
@@ -942,7 +942,7 @@
 -
   id: 32 # org public repo
   owner_id: 3
-  owner_name: user3
+  owner_name: org3
   lower_name: repo21
   name: repo21
   num_watches: 0

models/fixtures/review.yml

@@ -129,6 +129,6 @@
   type: 1
   reviewer_id: 6
   issue_id: 11
-  content: "singular review from user6 and final review for this pr"
+  content: "singular review from org6 and final review for this pr"
   updated_unix: 946684831
   created_unix: 946684831

models/fixtures/user.yml

@@ -76,17 +76,17 @@
 
 -
   id: 3
-  lower_name: user3
+  lower_name: org3
-  name: user3
+  name: org3
   full_name: ' <<<< >> >> > >> > >>> >> '
-  email: user3@example.com
+  email: org3@example.com
   keep_email_private: false
   email_notifications_preference: onmention
   passwd: ZogKvWdyEx:password
   passwd_hash_algo: dummy
   must_change_password: false
   login_source: 0
-  login_name: user3
+  login_name: org3
   type: 1
   salt: ZogKvWdyEx
   max_repo_creation: -1
@@ -98,7 +98,7 @@
   allow_create_organization: true
   prohibit_login: false
   avatar: avatar3
-  avatar_email: user3@example.com
+  avatar_email: org3@example.com
   use_custom_avatar: false
   num_followers: 0
   num_following: 0
@@ -187,17 +187,17 @@
 
 -
   id: 6
-  lower_name: user6
+  lower_name: org6
-  name: user6
+  name: org6
-  full_name: User Six
+  full_name: Org Six
-  email: user6@example.com
+  email: org6@example.com
   keep_email_private: false
   email_notifications_preference: enabled
   passwd: ZogKvWdyEx:password
   passwd_hash_algo: dummy
   must_change_password: false
   login_source: 0
-  login_name: user6
+  login_name: org6
   type: 1
   salt: ZogKvWdyEx
   max_repo_creation: -1
@@ -209,7 +209,7 @@
   allow_create_organization: true
   prohibit_login: false
   avatar: avatar6
-  avatar_email: user6@example.com
+  avatar_email: org6@example.com
   use_custom_avatar: false
   num_followers: 0
   num_following: 0
@@ -224,17 +224,17 @@
 
 -
   id: 7
-  lower_name: user7
+  lower_name: org7
-  name: user7
+  name: org7
-  full_name: User Seven
+  full_name: Org Seven
-  email: user7@example.com
+  email: org7@example.com
   keep_email_private: false
   email_notifications_preference: disabled
   passwd: ZogKvWdyEx:password
   passwd_hash_algo: dummy
   must_change_password: false
   login_source: 0
-  login_name: user7
+  login_name: org7
   type: 1
   salt: ZogKvWdyEx
   max_repo_creation: -1
@@ -246,7 +246,7 @@
   allow_create_organization: true
   prohibit_login: false
   avatar: avatar7
-  avatar_email: user7@example.com
+  avatar_email: org7@example.com
   use_custom_avatar: false
   num_followers: 0
   num_following: 0
@@ -594,17 +594,17 @@
 
 -
   id: 17
-  lower_name: user17
+  lower_name: org17
-  name: user17
+  name: org17
-  full_name: User 17
+  full_name: org 17
-  email: user17@example.com
+  email: org17@example.com
   keep_email_private: false
   email_notifications_preference: enabled
   passwd: ZogKvWdyEx:password
   passwd_hash_algo: dummy
   must_change_password: false
   login_source: 0
-  login_name: user17
+  login_name: org17
   type: 1
   salt: ZogKvWdyEx
   max_repo_creation: -1
@@ -616,7 +616,7 @@
   allow_create_organization: true
   prohibit_login: false
   avatar: avatar17
-  avatar_email: user17@example.com
+  avatar_email: org17@example.com
   use_custom_avatar: false
   num_followers: 0
   num_following: 0
@@ -668,17 +668,17 @@
 
 -
   id: 19
-  lower_name: user19
+  lower_name: org19
-  name: user19
+  name: org19
-  full_name: User 19
+  full_name: Org 19
-  email: user19@example.com
+  email: org19@example.com
   keep_email_private: false
   email_notifications_preference: enabled
   passwd: ZogKvWdyEx:password
   passwd_hash_algo: dummy
   must_change_password: false
   login_source: 0
-  login_name: user19
+  login_name: org19
   type: 1
   salt: ZogKvWdyEx
   max_repo_creation: -1
@@ -690,7 +690,7 @@
   allow_create_organization: true
   prohibit_login: false
   avatar: avatar19
-  avatar_email: user19@example.com
+  avatar_email: org19@example.com
   use_custom_avatar: false
   num_followers: 0
   num_following: 0

models/issues/assignees_test.go

@@ -27,9 +27,9 @@ func TestUpdateAssignee(t *testing.T) {
 	_, _, err = issues_model.ToggleIssueAssignee(db.DefaultContext, issue, &user_model.User{ID: 1}, user2.ID)
 	assert.NoError(t, err)
 
-	user3, err := user_model.GetUserByID(db.DefaultContext, 3)
+	org3, err := user_model.GetUserByID(db.DefaultContext, 3)
 	assert.NoError(t, err)
-	_, _, err = issues_model.ToggleIssueAssignee(db.DefaultContext, issue, &user_model.User{ID: 1}, user3.ID)
+	_, _, err = issues_model.ToggleIssueAssignee(db.DefaultContext, issue, &user_model.User{ID: 1}, org3.ID)
 	assert.NoError(t, err)
 
 	user1, err := user_model.GetUserByID(db.DefaultContext, 1) // This user is already assigned (see the definition in fixtures), so running  UpdateAssignee should unassign him
@@ -47,7 +47,7 @@ func TestUpdateAssignee(t *testing.T) {
 	assert.NoError(t, err)
 
 	var expectedAssignees []*user_model.User
-	expectedAssignees = append(expectedAssignees, user2, user3)
+	expectedAssignees = append(expectedAssignees, user2, org3)
 
 	for in, assignee := range issue.Assignees {
 		assert.Equal(t, assignee.ID, expectedAssignees[in].ID)

models/issues/issue_test.go

@@ -430,11 +430,11 @@ func TestIssue_ResolveMentions(t *testing.T) {
 	// Public repo, doer
 	testSuccess("user2", "repo1", "user1", []string{"user1"}, []int64{})
 	// Private repo, team member
-	testSuccess("user17", "big_test_private_4", "user20", []string{"user2"}, []int64{2})
+	testSuccess("org17", "big_test_private_4", "user20", []string{"user2"}, []int64{2})
 	// Private repo, not a team member
-	testSuccess("user17", "big_test_private_4", "user20", []string{"user5"}, []int64{})
+	testSuccess("org17", "big_test_private_4", "user20", []string{"user5"}, []int64{})
 	// Private repo, whole team
-	testSuccess("user17", "big_test_private_4", "user15", []string{"user17/owners"}, []int64{18})
+	testSuccess("org17", "big_test_private_4", "user15", []string{"org17/owners"}, []int64{18})
 }
 
 func TestResourceIndex(t *testing.T) {

models/issues/issue_xref_test.go

@@ -54,7 +54,7 @@ func TestXRef_AddCrossReferences(t *testing.T) {
 	itarget = testCreateIssue(t, 3, 3, "title4", "content4", false)
 
 	// Cross-reference to issue #4 by admin
-	content = fmt.Sprintf("content5, mentions user3/repo3#%d", itarget.Index)
+	content = fmt.Sprintf("content5, mentions org3/repo3#%d", itarget.Index)
 	i = testCreateIssue(t, 2, 1, "title5", content, false)
 	ref = unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{IssueID: itarget.ID, RefIssueID: i.ID, RefCommentID: 0})
 	assert.Equal(t, issues_model.CommentTypeIssueRef, ref.Type)
@@ -63,7 +63,7 @@ func TestXRef_AddCrossReferences(t *testing.T) {
 	assert.Equal(t, references.XRefActionNone, ref.RefAction)
 
 	// Cross-reference to issue #4 with no permission
-	content = fmt.Sprintf("content6, mentions user3/repo3#%d", itarget.Index)
+	content = fmt.Sprintf("content6, mentions org3/repo3#%d", itarget.Index)
 	i = testCreateIssue(t, 4, 5, "title6", content, false)
 	unittest.AssertNotExistsBean(t, &issues_model.Comment{IssueID: itarget.ID, RefIssueID: i.ID, RefCommentID: 0})
 }

models/issues/pull_test.go

@@ -317,9 +317,9 @@ func TestParseCodeOwnersLine(t *testing.T) {
 		{Line: "# comment", Tokens: []string{}},
 		{Line: "!.* @user1 @org1/team1", Tokens: []string{"!.*", "@user1", "@org1/team1"}},
 		{Line: `.*\\.js @user2 #comment`, Tokens: []string{`.*\.js`, "@user2"}},
-		{Line: `docs/(aws|google|azure)/[^/]*\\.(md|txt) @user3 @org2/team2`, Tokens: []string{`docs/(aws|google|azure)/[^/]*\.(md|txt)`, "@user3", "@org2/team2"}},
+		{Line: `docs/(aws|google|azure)/[^/]*\\.(md|txt) @org3 @org2/team2`, Tokens: []string{`docs/(aws|google|azure)/[^/]*\.(md|txt)`, "@org3", "@org2/team2"}},
-		{Line: `\#path @user3`, Tokens: []string{`#path`, "@user3"}},
+		{Line: `\#path @org3`, Tokens: []string{`#path`, "@org3"}},
-		{Line: `path\ with\ spaces/ @user3`, Tokens: []string{`path with spaces/`, "@user3"}},
+		{Line: `path\ with\ spaces/ @org3`, Tokens: []string{`path with spaces/`, "@org3"}},
 	}
 
 	for _, g := range given {
@@ -335,7 +335,7 @@ func TestGetApprovers(t *testing.T) {
 	// to assert that there are no duplicated approvers.
 	setting.Repository.PullRequest.DefaultMergeMessageOfficialApproversOnly = false
 	approvers := pr.GetApprovers()
-	expected := "Reviewed-by: User Five <user5@example.com>\nReviewed-by: User Six <user6@example.com>\n"
+	expected := "Reviewed-by: User Five <user5@example.com>\nReviewed-by: Org Six <org6@example.com>\n"
 	assert.EqualValues(t, expected, approvers)
 }
 

models/issues/reaction_test.go

@@ -83,7 +83,7 @@ func TestIssueReactionCount(t *testing.T) {
 
 	user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
 	user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
-	user3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3})
+	org3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3})
 	user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
 	ghost := user_model.NewGhostUser()
 
@@ -92,8 +92,8 @@ func TestIssueReactionCount(t *testing.T) {
 
 	addReaction(t, user1.ID, issueID, 0, "heart")
 	addReaction(t, user2.ID, issueID, 0, "heart")
-	addReaction(t, user3.ID, issueID, 0, "heart")
+	addReaction(t, org3.ID, issueID, 0, "heart")
-	addReaction(t, user3.ID, issueID, 0, "+1")
+	addReaction(t, org3.ID, issueID, 0, "+1")
 	addReaction(t, user4.ID, issueID, 0, "+1")
 	addReaction(t, user4.ID, issueID, 0, "heart")
 	addReaction(t, ghost.ID, issueID, 0, "-1")
@@ -136,7 +136,7 @@ func TestIssueCommentDeleteReaction(t *testing.T) {
 
 	user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
 	user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
-	user3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3})
+	org3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3})
 	user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
 
 	var issue1ID int64 = 1
@@ -144,7 +144,7 @@ func TestIssueCommentDeleteReaction(t *testing.T) {
 
 	addReaction(t, user1.ID, issue1ID, comment1ID, "heart")
 	addReaction(t, user2.ID, issue1ID, comment1ID, "heart")
-	addReaction(t, user3.ID, issue1ID, comment1ID, "heart")
+	addReaction(t, org3.ID, issue1ID, comment1ID, "heart")
 	addReaction(t, user4.ID, issue1ID, comment1ID, "+1")
 
 	reactionsList, _, err := issues_model.FindReactions(db.DefaultContext, issues_model.FindReactionsOptions{

models/issues/review_test.go

@@ -80,7 +80,7 @@ func TestFindLatestReviews(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Len(t, reviews, 2)
 	assert.Equal(t, "duplicate review from user5 (latest)", reviews[0].Content)
-	assert.Equal(t, "singular review from user6 and final review for this pr", reviews[1].Content)
+	assert.Equal(t, "singular review from org6 and final review for this pr", reviews[1].Content)
 }
 
 func TestGetCurrentReview(t *testing.T) {
@@ -123,13 +123,13 @@ func TestGetReviewersByIssueID(t *testing.T) {
 
 	issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 3})
 	user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
-	user3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3})
+	org3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3})
 	user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
 
 	expectedReviews := []*issues_model.Review{}
 	expectedReviews = append(expectedReviews,
 		&issues_model.Review{
-			Reviewer:    user3,
+			Reviewer:    org3,
 			Type:        issues_model.ReviewTypeReject,
 			UpdatedUnix: 946684812,
 		},

models/issues/stopwatch_test.go

@@ -60,7 +60,7 @@ func TestCreateOrStopIssueStopwatch(t *testing.T) {
 
 	user2, err := user_model.GetUserByID(db.DefaultContext, 2)
 	assert.NoError(t, err)
-	user3, err := user_model.GetUserByID(db.DefaultContext, 3)
+	org3, err := user_model.GetUserByID(db.DefaultContext, 3)
 	assert.NoError(t, err)
 
 	issue1, err := issues_model.GetIssueByID(db.DefaultContext, 1)
@@ -68,7 +68,7 @@ func TestCreateOrStopIssueStopwatch(t *testing.T) {
 	issue2, err := issues_model.GetIssueByID(db.DefaultContext, 2)
 	assert.NoError(t, err)
 
-	assert.NoError(t, issues_model.CreateOrStopIssueStopwatch(user3, issue1))
+	assert.NoError(t, issues_model.CreateOrStopIssueStopwatch(org3, issue1))
 	sw := unittest.AssertExistsAndLoadBean(t, &issues_model.Stopwatch{UserID: 3, IssueID: 1})
 	assert.LessOrEqual(t, sw.CreatedUnix, timeutil.TimeStampNow())
 

models/issues/tracked_time_test.go

@@ -18,14 +18,14 @@ import (
 func TestAddTime(t *testing.T) {
 	assert.NoError(t, unittest.PrepareTestDatabase())
 
-	user3, err := user_model.GetUserByID(db.DefaultContext, 3)
+	org3, err := user_model.GetUserByID(db.DefaultContext, 3)
 	assert.NoError(t, err)
 
 	issue1, err := issues_model.GetIssueByID(db.DefaultContext, 1)
 	assert.NoError(t, err)
 
 	// 3661 = 1h 1min 1s
-	trackedTime, err := issues_model.AddTime(db.DefaultContext, user3, issue1, 3661, time.Now())
+	trackedTime, err := issues_model.AddTime(db.DefaultContext, org3, issue1, 3661, time.Now())
 	assert.NoError(t, err)
 	assert.Equal(t, int64(3), trackedTime.UserID)
 	assert.Equal(t, int64(1), trackedTime.IssueID)

models/organization/org_test.go

@@ -115,10 +115,10 @@ func TestUser_GetMembers(t *testing.T) {
 func TestGetOrgByName(t *testing.T) {
 	assert.NoError(t, unittest.PrepareTestDatabase())
 
-	org, err := organization.GetOrgByName(db.DefaultContext, "user3")
+	org, err := organization.GetOrgByName(db.DefaultContext, "org3")
 	assert.NoError(t, err)
 	assert.EqualValues(t, 3, org.ID)
-	assert.Equal(t, "user3", org.Name)
+	assert.Equal(t, "org3", org.Name)
 
 	_, err = organization.GetOrgByName(db.DefaultContext, "user2") // user2 is an individual
 	assert.True(t, organization.IsErrOrgNotExist(err))
@@ -343,7 +343,7 @@ func TestAccessibleReposEnv_MirrorRepos(t *testing.T) {
 func TestHasOrgVisibleTypePublic(t *testing.T) {
 	assert.NoError(t, unittest.PrepareTestDatabase())
 	owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
-	user3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3})
+	org3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3})
 
 	const newOrgName = "test-org-public"
 	org := &organization.Organization{
@@ -356,7 +356,7 @@ func TestHasOrgVisibleTypePublic(t *testing.T) {
 	org = unittest.AssertExistsAndLoadBean(t,
 		&organization.Organization{Name: org.Name, Type: user_model.UserTypeOrganization})
 	test1 := organization.HasOrgOrUserVisible(db.DefaultContext, org.AsUser(), owner)
-	test2 := organization.HasOrgOrUserVisible(db.DefaultContext, org.AsUser(), user3)
+	test2 := organization.HasOrgOrUserVisible(db.DefaultContext, org.AsUser(), org3)
 	test3 := organization.HasOrgOrUserVisible(db.DefaultContext, org.AsUser(), nil)
 	assert.True(t, test1) // owner of org
 	assert.True(t, test2) // user not a part of org
@@ -366,7 +366,7 @@ func TestHasOrgVisibleTypePublic(t *testing.T) {
 func TestHasOrgVisibleTypeLimited(t *testing.T) {
 	assert.NoError(t, unittest.PrepareTestDatabase())
 	owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
-	user3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3})
+	org3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3})
 
 	const newOrgName = "test-org-limited"
 	org := &organization.Organization{
@@ -379,7 +379,7 @@ func TestHasOrgVisibleTypeLimited(t *testing.T) {
 	org = unittest.AssertExistsAndLoadBean(t,
 		&organization.Organization{Name: org.Name, Type: user_model.UserTypeOrganization})
 	test1 := organization.HasOrgOrUserVisible(db.DefaultContext, org.AsUser(), owner)
-	test2 := organization.HasOrgOrUserVisible(db.DefaultContext, org.AsUser(), user3)
+	test2 := organization.HasOrgOrUserVisible(db.DefaultContext, org.AsUser(), org3)
 	test3 := organization.HasOrgOrUserVisible(db.DefaultContext, org.AsUser(), nil)
 	assert.True(t, test1)  // owner of org
 	assert.True(t, test2)  // user not a part of org
@@ -389,7 +389,7 @@ func TestHasOrgVisibleTypeLimited(t *testing.T) {
 func TestHasOrgVisibleTypePrivate(t *testing.T) {
 	assert.NoError(t, unittest.PrepareTestDatabase())
 	owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
-	user3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3})
+	org3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3})
 
 	const newOrgName = "test-org-private"
 	org := &organization.Organization{
@@ -402,7 +402,7 @@ func TestHasOrgVisibleTypePrivate(t *testing.T) {
 	org = unittest.AssertExistsAndLoadBean(t,
 		&organization.Organization{Name: org.Name, Type: user_model.UserTypeOrganization})
 	test1 := organization.HasOrgOrUserVisible(db.DefaultContext, org.AsUser(), owner)
-	test2 := organization.HasOrgOrUserVisible(db.DefaultContext, org.AsUser(), user3)
+	test2 := organization.HasOrgOrUserVisible(db.DefaultContext, org.AsUser(), org3)
 	test3 := organization.HasOrgOrUserVisible(db.DefaultContext, org.AsUser(), nil)
 	assert.True(t, test1)  // owner of org
 	assert.False(t, test2) // user not a part of org
@@ -493,7 +493,7 @@ func TestCreateOrganization3(t *testing.T) {
 	assert.NoError(t, unittest.PrepareTestDatabase())
 
 	owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
-	org := &organization.Organization{Name: "user3"}                      // should already exist
+	org := &organization.Organization{Name: "org3"}                       // should already exist
 	unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: org.Name}) // sanity check
 	err := organization.CreateOrganization(org, owner)
 	assert.Error(t, err)

models/organization/team_invite_test.go

@@ -30,12 +30,12 @@ func TestTeamInvite(t *testing.T) {
 	t.Run("CreateAndRemove", func(t *testing.T) {
 		user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
 
-		invite, err := organization.CreateTeamInvite(db.DefaultContext, user1, team, "user3@example.com")
+		invite, err := organization.CreateTeamInvite(db.DefaultContext, user1, team, "org3@example.com")
 		assert.NotNil(t, invite)
 		assert.NoError(t, err)
 
 		// Shouldn't allow duplicate invite
-		_, err = organization.CreateTeamInvite(db.DefaultContext, user1, team, "user3@example.com")
+		_, err = organization.CreateTeamInvite(db.DefaultContext, user1, team, "org3@example.com")
 		assert.Error(t, err)
 
 		// should remove invite

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",

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"])
 }
 

models/repo_transfer_test.go

@@ -41,10 +41,10 @@ func TestRepositoryTransfer(t *testing.T) {
 	assert.NoError(t, transfer.LoadAttributes(db.DefaultContext))
 	assert.Equal(t, "user2", transfer.Recipient.Name)
 
-	user6 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+	org6 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
 
 	// Only transfer can be started at any given time
-	err = CreatePendingRepositoryTransfer(db.DefaultContext, doer, user6, repo.ID, nil)
+	err = CreatePendingRepositoryTransfer(db.DefaultContext, doer, org6, repo.ID, nil)
 	assert.Error(t, err)
 	assert.True(t, IsErrRepoTransferInProgress(err))
 

models/user/email_address_test.go

@@ -209,7 +209,7 @@ func TestListEmails(t *testing.T) {
 	}
 
 	assert.True(t, contains(func(s *user_model.SearchEmailResult) bool { return s.UID == 18 }))
-	// 'user3' is an organization
+	// 'org3' is an organization
 	assert.False(t, contains(func(s *user_model.SearchEmailResult) bool { return s.UID == 3 }))
 
 	// Must find no records

models/user/user_test.go

@@ -39,7 +39,7 @@ func TestGetUserEmailsByNames(t *testing.T) {
 	assert.ElementsMatch(t, []string{"user8@example.com"}, user_model.GetUserEmailsByNames(db.DefaultContext, []string{"user8", "user9"}))
 	assert.ElementsMatch(t, []string{"user8@example.com", "user5@example.com"}, user_model.GetUserEmailsByNames(db.DefaultContext, []string{"user8", "user5"}))
 
-	assert.ElementsMatch(t, []string{"user8@example.com"}, user_model.GetUserEmailsByNames(db.DefaultContext, []string{"user8", "user7"}))
+	assert.ElementsMatch(t, []string{"user8@example.com"}, user_model.GetUserEmailsByNames(db.DefaultContext, []string{"user8", "org7"}))
 }
 
 func TestCanCreateOrganization(t *testing.T) {
@@ -372,9 +372,9 @@ func TestUpdateUser(t *testing.T) {
 func TestUpdateUserEmailAlreadyUsed(t *testing.T) {
 	assert.NoError(t, unittest.PrepareTestDatabase())
 	user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
-	user3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3})
+	org3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3})
 
-	user2.Email = user3.Email
+	user2.Email = org3.Email
 	err := user_model.UpdateUser(db.DefaultContext, user2, true)
 	assert.True(t, user_model.IsErrEmailAlreadyUsed(err))
 }

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}, ""},
 			},
 		},
 	}

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",
 		},
 	}
 

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{})