diff options
Diffstat (limited to 'model')
| -rw-r--r-- | model/config.go | 2 | ||||
| -rw-r--r-- | model/incoming_webhook.go | 2 | ||||
| -rw-r--r-- | model/incoming_webhook_test.go | 4 | ||||
| -rw-r--r-- | model/outgoing_webhook.go | 2 | ||||
| -rw-r--r-- | model/outgoing_webhook_test.go | 6 | ||||
| -rw-r--r-- | model/session_test.go | 2 | ||||
| -rw-r--r-- | model/user_test.go | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/model/config.go b/model/config.go index c0f443b72..5cc1a4edc 100644 --- a/model/config.go +++ b/model/config.go @@ -2370,7 +2370,7 @@ func (ss *ServiceSettings) isValid() *AppError { } } - host, port, err := net.SplitHostPort(*ss.ListenAddress) + host, port, _ := net.SplitHostPort(*ss.ListenAddress) var isValidHost bool if host == "" { isValidHost = true diff --git a/model/incoming_webhook.go b/model/incoming_webhook.go index 1d6d7b4f0..3856d22ff 100644 --- a/model/incoming_webhook.go +++ b/model/incoming_webhook.go @@ -93,7 +93,7 @@ func (o *IncomingWebhook) IsValid() *AppError { return NewAppError("IncomingWebhook.IsValid", "model.incoming_hook.display_name.app_error", nil, "", http.StatusBadRequest) } - if len(o.Description) > 128 { + if len(o.Description) > 500 { return NewAppError("IncomingWebhook.IsValid", "model.incoming_hook.description.app_error", nil, "", http.StatusBadRequest) } diff --git a/model/incoming_webhook_test.go b/model/incoming_webhook_test.go index 5498a6a0c..3f7d13695 100644 --- a/model/incoming_webhook_test.go +++ b/model/incoming_webhook_test.go @@ -80,12 +80,12 @@ func TestIncomingWebhookIsValid(t *testing.T) { t.Fatal(err) } - o.Description = strings.Repeat("1", 129) + o.Description = strings.Repeat("1", 501) if err := o.IsValid(); err == nil { t.Fatal("should be invalid") } - o.Description = strings.Repeat("1", 128) + o.Description = strings.Repeat("1", 500) if err := o.IsValid(); err != nil { t.Fatal(err) } diff --git a/model/outgoing_webhook.go b/model/outgoing_webhook.go index 698a226e3..5f7a67d04 100644 --- a/model/outgoing_webhook.go +++ b/model/outgoing_webhook.go @@ -171,7 +171,7 @@ func (o *OutgoingWebhook) IsValid() *AppError { return NewAppError("OutgoingWebhook.IsValid", "model.outgoing_hook.is_valid.display_name.app_error", nil, "", http.StatusBadRequest) } - if len(o.Description) > 128 { + if len(o.Description) > 500 { return NewAppError("OutgoingWebhook.IsValid", "model.outgoing_hook.is_valid.description.app_error", nil, "", http.StatusBadRequest) } diff --git a/model/outgoing_webhook_test.go b/model/outgoing_webhook_test.go index 3241e649f..5403fca6f 100644 --- a/model/outgoing_webhook_test.go +++ b/model/outgoing_webhook_test.go @@ -102,14 +102,14 @@ func TestOutgoingWebhookIsValid(t *testing.T) { t.Fatal(err) } - o.Description = strings.Repeat("1", 129) + o.Description = strings.Repeat("1", 501) if err := o.IsValid(); err == nil { t.Fatal("should be invalid") } - o.Description = strings.Repeat("1", 128) + o.Description = strings.Repeat("1", 500) if err := o.IsValid(); err != nil { - t.Fatal("should be invalid") + t.Fatal(err) } o.ContentType = strings.Repeat("1", 129) diff --git a/model/session_test.go b/model/session_test.go index bf32d2f09..88e0bdd43 100644 --- a/model/session_test.go +++ b/model/session_test.go @@ -31,7 +31,7 @@ func TestSessionDeepCopy(t *testing.T) { session = &Session{Id: sessionId} copySession = session.DeepCopy() - assert.Equal(t, sessionId, session.Id) + assert.Equal(t, sessionId, copySession.Id) session = &Session{TeamMembers: []*TeamMember{}} copySession = session.DeepCopy() diff --git a/model/user_test.go b/model/user_test.go index f86b52919..d7f7b6711 100644 --- a/model/user_test.go +++ b/model/user_test.go @@ -52,7 +52,7 @@ func TestUserDeepCopy(t *testing.T) { user = &User{Id: id} copyUser = user.DeepCopy() - assert.Equal(t, id, user.Id) + assert.Equal(t, id, copyUser.Id) } func TestUserJson(t *testing.T) { |