Update backend changes + add web route tests

Author: kemzeb

modules/label/label.go

@@ -26,7 +26,7 @@ type ErrInvalidLabelColor struct {
 }
 
 func (e *ErrInvalidLabelColor) Error() string {
-	return fmt.Sprintf("invalid label color: %s", e.Color)
+	return "invalid label color: " + e.Color
 }
 
 func IsErrInvalidLabelColor(err error) bool {

routers/web/repo/issue_label.go

@@ -120,12 +120,11 @@ func NewLabel(ctx *context.Context) {
 	}
 	if err := issues_model.NewLabel(ctx, l); err != nil {
 		if label.IsErrInvalidLabelColor(err) {
-			ctx.Flash.Error(err.Error())
-			ctx.Redirect(ctx.Repo.RepoLink + "/labels")
+			ctx.Flash.Error("NewLabel: " + err.Error())
 		} else {
 			ctx.ServerError("NewLabel", err)
+			return
 		}
-		return
 	}
 	ctx.Redirect(ctx.Repo.RepoLink + "/labels")
 }
@@ -152,12 +151,11 @@ func UpdateLabel(ctx *context.Context) {
 	l.SetArchived(form.IsArchived)
 	if err := issues_model.UpdateLabel(ctx, l); err != nil {
 		if label.IsErrInvalidLabelColor(err) {
-			ctx.Flash.Error(err.Error())
-			ctx.Redirect(ctx.Repo.RepoLink + "/labels")
+			ctx.Flash.Error("UpdateLabel: " + err.Error())
 		} else {
 			ctx.ServerError("UpdateLabel", err)
+			return
 		}
-		return
 	}
 	ctx.Redirect(ctx.Repo.RepoLink + "/labels")
 }

routers/web/repo/issue_label_test.go

@@ -92,6 +92,23 @@ func TestNewLabel(t *testing.T) {
 	assert.Equal(t, "/user2/repo1/labels", test.RedirectURL(ctx.Resp))
 }
 
+func TestNewLabelGivenInvalidLabelCode(t *testing.T) {
+	unittest.PrepareTestEnv(t)
+	ctx, _ := contexttest.MockContext(t, "user2/repo1/labels/edit")
+	contexttest.LoadUser(t, ctx, 2)
+	contexttest.LoadRepo(t, ctx, 1)
+	web.SetForm(ctx, &forms.CreateLabelForm{
+		Title: "newlabel",
+		Color: "bad-label-code",
+	})
+	NewLabel(ctx)
+	assert.Equal(t, http.StatusSeeOther, ctx.Resp.WrittenStatus())
+	assert.True(t, ctx.Flash.Has("error"))
+	unittest.AssertNotExistsBean(t, &issues_model.Label{
+		Name: "newlabel",
+	})
+}
+
 func TestUpdateLabel(t *testing.T) {
 	unittest.PrepareTestEnv(t)
 	ctx, _ := contexttest.MockContext(t, "user2/repo1/labels/edit")
@@ -113,6 +130,29 @@ func TestUpdateLabel(t *testing.T) {
 	assert.Equal(t, "/user2/repo1/labels", test.RedirectURL(ctx.Resp))
 }
 
+func TestUpdateLabelGivenInvalidLabelCode(t *testing.T) {
+	unittest.PrepareTestEnv(t)
+	ctx, _ := contexttest.MockContext(t, "user2/repo1/labels/edit")
+	contexttest.LoadUser(t, ctx, 2)
+	contexttest.LoadRepo(t, ctx, 1)
+	web.SetForm(ctx, &forms.CreateLabelForm{
+		ID:    1,
+		Title: "label1",
+		Color: "bad-label-code",
+	})
+
+	UpdateLabel(ctx)
+
+	assert.Equal(t, http.StatusSeeOther, ctx.Resp.WrittenStatus())
+	assert.Equal(t, "/user2/repo1/labels", test.RedirectURL(ctx.Resp))
+	assert.True(t, ctx.Flash.Has("error"))
+	unittest.AssertExistsAndLoadBean(t, &issues_model.Label{
+		ID:    1,
+		Name:  "label1",
+		Color: "#abcdef",
+	})
+}
+
 func TestDeleteLabel(t *testing.T) {
 	unittest.PrepareTestEnv(t)
 	ctx, _ := contexttest.MockContext(t, "user2/repo1/labels/delete")