From d99eb51b96cfd22543c884628f582285588156ea Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Sat, 26 Oct 2019 23:30:16 +0800
Subject: [PATCH] fix test

---
 models/issue_assignees_test.go  |  9 --------
 services/issue/assignee_test.go | 37 +++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 9 deletions(-)
 create mode 100644 services/issue/assignee_test.go

diff --git a/models/issue_assignees_test.go b/models/issue_assignees_test.go
index 1c5b5e7a22f40..163234b167793 100644
--- a/models/issue_assignees_test.go
+++ b/models/issue_assignees_test.go
@@ -58,13 +58,4 @@ func TestUpdateAssignee(t *testing.T) {
 	isAssigned, err = IsUserAssignedToIssue(issue, &User{ID: 4})
 	assert.NoError(t, err)
 	assert.False(t, isAssigned)
-
-	// Clean everyone
-	err = DeleteNotPassedAssignee(issue, user1, []*User{})
-	assert.NoError(t, err)
-
-	// Check they're gone
-	assignees, err = GetAssigneesByIssue(issue)
-	assert.NoError(t, err)
-	assert.Equal(t, 0, len(assignees))
 }
diff --git a/services/issue/assignee_test.go b/services/issue/assignee_test.go
new file mode 100644
index 0000000000000..bdd2009bf0a81
--- /dev/null
+++ b/services/issue/assignee_test.go
@@ -0,0 +1,37 @@
+// Copyright 2019 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 issue
+
+import (
+	"testing"
+
+	"code.gitea.io/gitea/models"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestDeleteNotPassedAssignee(t *testing.T) {
+	assert.NoError(t, models.PrepareTestDatabase())
+
+	// Fake issue with assignees
+	issue, err := models.GetIssueWithAttrsByID(1)
+	assert.NoError(t, err)
+
+	user1, err := models.GetUserByID(1) // This user is already assigned (see the definition in fixtures), so running  UpdateAssignee should unassign him
+	assert.NoError(t, err)
+
+	// Check if he got removed
+	isAssigned, err := models.IsUserAssignedToIssue(issue, user1)
+	assert.NoError(t, err)
+	assert.True(t, isAssigned)
+
+	// Clean everyone
+	err = DeleteNotPassedAssignee(issue, user1, []*models.User{})
+	assert.NoError(t, err)
+
+	// Check they're gone
+	assignees, err := models.GetAssigneesByIssue(issue)
+	assert.NoError(t, err)
+	assert.Equal(t, 0, len(assignees))
+}