fix tests

Author: lunny

models/action_test.go

@@ -5,8 +5,6 @@ import (
 	"path"
 	"testing"
 
-	"code.gitea.io/git"
-	"code.gitea.io/gitea/modules/notification"
 	"code.gitea.io/gitea/modules/setting"
 
 	"github.com/stretchr/testify/assert"
@@ -242,121 +240,6 @@ func TestUpdateIssuesCommit_Issue5957(t *testing.T) {
 	CheckConsistencyFor(t, &Action{})
 }
 
-func testCorrectRepoAction(t *testing.T, opts CommitRepoActionOptions, actionBean *Action) {
-	AssertNotExistsBean(t, actionBean)
-	evt, err := CommitRepoAction(opts)
-	notification.NotifyCommitsPushed(evt.Pusher, evt.OpType, evt.Repo, evt.RefName, evt.Data)
-	assert.NoError(t, err)
-	AssertExistsAndLoadBean(t, actionBean)
-	CheckConsistencyFor(t, &Action{})
-}
-
-func TestCommitRepoAction(t *testing.T) {
-	samples := []struct {
-		userID                  int64
-		repositoryID            int64
-		commitRepoActionOptions CommitRepoActionOptions
-		action                  Action
-	}{
-		{
-			userID:       2,
-			repositoryID: 2,
-			commitRepoActionOptions: CommitRepoActionOptions{
-				RefFullName: "refName",
-				OldCommitID: "oldCommitID",
-				NewCommitID: "newCommitID",
-				Commits: &PushCommits{
-					avatars: make(map[string]string),
-					Commits: []*PushCommit{
-						{
-							Sha1:           "abcdef1",
-							CommitterEmail: "[email protected]",
-							CommitterName:  "User Two",
-							AuthorEmail:    "[email protected]",
-							AuthorName:     "User Four",
-							Message:        "message1",
-						},
-						{
-							Sha1:           "abcdef2",
-							CommitterEmail: "[email protected]",
-							CommitterName:  "User Two",
-							AuthorEmail:    "[email protected]",
-							AuthorName:     "User Two",
-							Message:        "message2",
-						},
-					},
-					Len: 2,
-				},
-			},
-			action: Action{
-				OpType:  ActionCommitRepo,
-				RefName: "refName",
-			},
-		},
-		{
-			userID:       2,
-			repositoryID: 1,
-			commitRepoActionOptions: CommitRepoActionOptions{
-				RefFullName: git.TagPrefix + "v1.1",
-				OldCommitID: git.EmptySHA,
-				NewCommitID: "newCommitID",
-				Commits:     &PushCommits{},
-			},
-			action: Action{
-				OpType:  ActionPushTag,
-				RefName: "v1.1",
-			},
-		},
-		{
-			userID:       2,
-			repositoryID: 1,
-			commitRepoActionOptions: CommitRepoActionOptions{
-				RefFullName: git.TagPrefix + "v1.1",
-				OldCommitID: "oldCommitID",
-				NewCommitID: git.EmptySHA,
-				Commits:     &PushCommits{},
-			},
-			action: Action{
-				OpType:  ActionDeleteTag,
-				RefName: "v1.1",
-			},
-		},
-		{
-			userID:       2,
-			repositoryID: 1,
-			commitRepoActionOptions: CommitRepoActionOptions{
-				RefFullName: git.BranchPrefix + "feature/1",
-				OldCommitID: "oldCommitID",
-				NewCommitID: git.EmptySHA,
-				Commits:     &PushCommits{},
-			},
-			action: Action{
-				OpType:  ActionDeleteBranch,
-				RefName: "feature/1",
-			},
-		},
-	}
-
-	for _, s := range samples {
-		PrepareTestEnv(t)
-
-		user := AssertExistsAndLoadBean(t, &User{ID: s.userID}).(*User)
-		repo := AssertExistsAndLoadBean(t, &Repository{ID: s.repositoryID, OwnerID: user.ID}).(*Repository)
-		repo.Owner = user
-
-		s.commitRepoActionOptions.PusherName = user.Name
-		s.commitRepoActionOptions.RepoOwnerID = user.ID
-		s.commitRepoActionOptions.RepoName = repo.Name
-
-		s.action.ActUserID = user.ID
-		s.action.RepoID = repo.ID
-		s.action.Repo = repo
-		s.action.IsPrivate = repo.IsPrivate
-
-		testCorrectRepoAction(t, s.commitRepoActionOptions, &s.action)
-	}
-}
-
 func TestGetFeeds(t *testing.T) {
 	// test with an individual user
 	assert.NoError(t, PrepareTestDatabase())

models/repo_test.go

@@ -9,7 +9,6 @@ import (
 	"testing"
 
 	"code.gitea.io/gitea/modules/markup"
-	"code.gitea.io/gitea/modules/notification"
 	"code.gitea.io/gitea/modules/setting"
 
 	"github.com/Unknwon/com"
@@ -163,19 +162,11 @@ func TestTransferOwnership(t *testing.T) {
 	repo.Owner = AssertExistsAndLoadBean(t, &User{ID: repo.OwnerID}).(*User)
 	assert.NoError(t, TransferOwnership(doer, "user2", repo))
 
-	notification.NotifyRepositoryTransfered(doer, doer, repo)
-
 	transferredRepo := AssertExistsAndLoadBean(t, &Repository{ID: 3}).(*Repository)
 	assert.EqualValues(t, 2, transferredRepo.OwnerID)
 
 	assert.False(t, com.IsExist(RepoPath("user3", "repo3")))
 	assert.True(t, com.IsExist(RepoPath("user2", "repo3")))
-	AssertExistsAndLoadBean(t, &Action{
-		OpType:    ActionTransferRepo,
-		ActUserID: 2,
-		RepoID:    3,
-		Content:   "user3/repo3",
-	})
 
 	CheckConsistencyFor(t, &Repository{}, &User{}, &Team{})
 }