summaryrefslogtreecommitdiffstats
path: root/models/issues
diff options
context:
space:
mode:
authorNanguan Lin <70063547+lng2020@users.noreply.github.com>2023-09-14 10:59:53 +0800
committerGitHub <noreply@github.com>2023-09-14 02:59:53 +0000
commitda50be73604589be9381e8811af5465fa47558f1 (patch)
treee33d0b20157a84abb8714ab6d2f2bc901630371d /models/issues
parentd0318c4ae004e754a6e0e10a44df7552ad9a2712 (diff)
downloadgitea-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 'models/issues')
-rw-r--r--models/issues/assignees_test.go6
-rw-r--r--models/issues/issue_test.go6
-rw-r--r--models/issues/issue_xref_test.go4
-rw-r--r--models/issues/pull_test.go8
-rw-r--r--models/issues/reaction_test.go10
-rw-r--r--models/issues/review_test.go6
-rw-r--r--models/issues/stopwatch_test.go4
-rw-r--r--models/issues/tracked_time_test.go4
8 files changed, 24 insertions, 24 deletions
diff --git a/models/issues/assignees_test.go b/models/issues/assignees_test.go
index 2185f6fc42..65a5ddba31 100644
--- a/models/issues/assignees_test.go
+++ b/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)
diff --git a/models/issues/issue_test.go b/models/issues/issue_test.go
index f1bccc0cf8..b2ff74f0cf 100644
--- a/models/issues/issue_test.go
+++ b/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) {
diff --git a/models/issues/issue_xref_test.go b/models/issues/issue_xref_test.go
index 6e94c26272..5bcaf75518 100644
--- a/models/issues/issue_xref_test.go
+++ b/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})
}
diff --git a/models/issues/pull_test.go b/models/issues/pull_test.go
index 83977560ae..1105608858 100644
--- a/models/issues/pull_test.go
+++ b/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: `\#path @user3`, Tokens: []string{`#path`, "@user3"}},
- {Line: `path\ with\ spaces/ @user3`, Tokens: []string{`path with spaces/`, "@user3"}},
+ {Line: `docs/(aws|google|azure)/[^/]*\\.(md|txt) @org3 @org2/team2`, Tokens: []string{`docs/(aws|google|azure)/[^/]*\.(md|txt)`, "@org3", "@org2/team2"}},
+ {Line: `\#path @org3`, Tokens: []string{`#path`, "@org3"}},
+ {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)
}
diff --git a/models/issues/reaction_test.go b/models/issues/reaction_test.go
index e397568ac0..ceb7f2c2a6 100644
--- a/models/issues/reaction_test.go
+++ b/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, user3.ID, issueID, 0, "+1")
+ addReaction(t, org3.ID, issueID, 0, "heart")
+ 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{
diff --git a/models/issues/review_test.go b/models/issues/review_test.go
index 19816e864b..8f0e773f4c 100644
--- a/models/issues/review_test.go
+++ b/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,
},
diff --git a/models/issues/stopwatch_test.go b/models/issues/stopwatch_test.go
index ea3827a1f6..fa937ecbed 100644
--- a/models/issues/stopwatch_test.go
+++ b/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())
diff --git a/models/issues/tracked_time_test.go b/models/issues/tracked_time_test.go
index 1d88109183..caced78c9e 100644
--- a/models/issues/tracked_time_test.go
+++ b/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)