From 1a9821f57a0293db3adc0eab8aff08ca5fa1026c Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 13 Jun 2022 17:37:59 +0800 Subject: Move issues related files into models/issues (#19931) * Move access and repo permission to models/perm/access * fix test * fix git test * Move functions sequence * Some improvements per @KN4CK3R and @delvh * Move issues related code to models/issues * Move some issues related sub package * Merge * Fix test * Fix test * Fix test * Fix test * Rename some files --- models/issue_comment_test.go | 64 -------------------------------------------- 1 file changed, 64 deletions(-) delete mode 100644 models/issue_comment_test.go (limited to 'models/issue_comment_test.go') diff --git a/models/issue_comment_test.go b/models/issue_comment_test.go deleted file mode 100644 index d323a08167..0000000000 --- a/models/issue_comment_test.go +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright 2017 The Gitea Authors. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE file. - -package models - -import ( - "testing" - "time" - - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - - "github.com/stretchr/testify/assert" -) - -func TestCreateComment(t *testing.T) { - assert.NoError(t, unittest.PrepareTestDatabase()) - - issue := unittest.AssertExistsAndLoadBean(t, &Issue{}).(*Issue) - repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: issue.RepoID}).(*repo_model.Repository) - doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}).(*user_model.User) - - now := time.Now().Unix() - comment, err := CreateComment(&CreateCommentOptions{ - Type: CommentTypeComment, - Doer: doer, - Repo: repo, - Issue: issue, - Content: "Hello", - }) - assert.NoError(t, err) - then := time.Now().Unix() - - assert.EqualValues(t, CommentTypeComment, comment.Type) - assert.EqualValues(t, "Hello", comment.Content) - assert.EqualValues(t, issue.ID, comment.IssueID) - assert.EqualValues(t, doer.ID, comment.PosterID) - unittest.AssertInt64InRange(t, now, then, int64(comment.CreatedUnix)) - unittest.AssertExistsAndLoadBean(t, comment) // assert actually added to DB - - updatedIssue := unittest.AssertExistsAndLoadBean(t, &Issue{ID: issue.ID}).(*Issue) - unittest.AssertInt64InRange(t, now, then, int64(updatedIssue.UpdatedUnix)) -} - -func TestFetchCodeComments(t *testing.T) { - assert.NoError(t, unittest.PrepareTestDatabase()) - - issue := unittest.AssertExistsAndLoadBean(t, &Issue{ID: 2}).(*Issue) - user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}).(*user_model.User) - res, err := FetchCodeComments(db.DefaultContext, issue, user) - assert.NoError(t, err) - assert.Contains(t, res, "README.md") - assert.Contains(t, res["README.md"], int64(4)) - assert.Len(t, res["README.md"][4], 1) - assert.Equal(t, int64(4), res["README.md"][4][0].ID) - - user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}).(*user_model.User) - res, err = FetchCodeComments(db.DefaultContext, issue, user2) - assert.NoError(t, err) - assert.Len(t, res, 1) -} -- cgit v1.2.3