1 files changed, 69 insertions, 12 deletions

diff --git a/model/command_test.go b/model/command_test.go
index d362d8f2c..2376e2ef7 100644
--- a/model/command_test.go
+++ b/model/command_test.go
@@ -19,63 +19,115 @@ func TestCommandJson(t *testing.T) {
 }
 
 func TestCommandIsValid(t *testing.T) {
-	o := Command{}
+	o := Command{
+		Id:          NewId(),
+		Token:       NewId(),
+		CreateAt:    GetMillis(),
+		UpdateAt:    GetMillis(),
+		CreatorId:   NewId(),
+		TeamId:      NewId(),
+		Trigger:     "trigger",
+		URL:         "http://example.com",
+		Method:      COMMAND_METHOD_GET,
+		DisplayName: "",
+		Description: "",
+	}
 
+	if err := o.IsValid(); err != nil {
+		t.Fatal(err)
+	}
+
+	o.Id = ""
 	if err := o.IsValid(); err == nil {
 		t.Fatal("should be invalid")
 	}
 
 	o.Id = NewId()
+	if err := o.IsValid(); err != nil {
+		t.Fatal(err)
+	}
+
+	o.Token = ""
 	if err := o.IsValid(); err == nil {
 		t.Fatal("should be invalid")
 	}
 
-	o.CreateAt = GetMillis()
+	o.Token = NewId()
+	if err := o.IsValid(); err != nil {
+		t.Fatal(err)
+	}
+
+	o.CreateAt = 0
 	if err := o.IsValid(); err == nil {
 		t.Fatal("should be invalid")
 	}
 
-	o.UpdateAt = GetMillis()
+	o.CreateAt = GetMillis()
+	if err := o.IsValid(); err != nil {
+		t.Fatal(err)
+	}
+
+	o.UpdateAt = 0
 	if err := o.IsValid(); err == nil {
 		t.Fatal("should be invalid")
 	}
 
-	o.CreatorId = "123"
+	o.UpdateAt = GetMillis()
+	if err := o.IsValid(); err != nil {
+		t.Fatal(err)
+	}
+
+	o.CreatorId = ""
 	if err := o.IsValid(); err == nil {
 		t.Fatal("should be invalid")
 	}
 
 	o.CreatorId = NewId()
-	if err := o.IsValid(); err == nil {
-		t.Fatal("should be invalid")
+	if err := o.IsValid(); err != nil {
+		t.Fatal(err)
 	}
 
-	o.Token = "123"
+	o.TeamId = ""
 	if err := o.IsValid(); err == nil {
 		t.Fatal("should be invalid")
 	}
 
-	o.Token = NewId()
+	o.TeamId = NewId()
+	if err := o.IsValid(); err != nil {
+		t.Fatal(err)
+	}
+
+	o.Trigger = ""
 	if err := o.IsValid(); err == nil {
 		t.Fatal("should be invalid")
 	}
 
-	o.TeamId = "123"
+	o.Trigger = strings.Repeat("1", 129)
 	if err := o.IsValid(); err == nil {
 		t.Fatal("should be invalid")
 	}
 
-	o.TeamId = NewId()
+	o.Trigger = strings.Repeat("1", 128)
+	if err := o.IsValid(); err != nil {
+		t.Fatal(err)
+	}
+
+	o.URL = ""
 	if err := o.IsValid(); err == nil {
 		t.Fatal("should be invalid")
 	}
 
-	o.URL = "nowhere.com/"
+	o.URL = "1234"
 	if err := o.IsValid(); err == nil {
 		t.Fatal("should be invalid")
 	}
 
-	o.URL = "http://nowhere.com/"
+	o.URL = "https://example.com"
+	if err := o.IsValid(); err != nil {
+		t.Fatal(err)
+	}
+
+	o.Method = "https://example.com"
 	if err := o.IsValid(); err == nil {
 		t.Fatal("should be invalid")
 	}
@@ -85,6 +137,11 @@ func TestCommandIsValid(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	o.Method = COMMAND_METHOD_POST
+	if err := o.IsValid(); err != nil {
+		t.Fatal(err)
+	}
+
 	o.DisplayName = strings.Repeat("1", 65)
 	if err := o.IsValid(); err == nil {
 		t.Fatal("should be invalid")