diff options
| -rw-r--r-- | api/user_test.go | 8 | ||||
| -rw-r--r-- | model/client.go | 4 | ||||
| -rw-r--r-- | model/version.go | 8 |
3 files changed, 13 insertions, 7 deletions
diff --git a/api/user_test.go b/api/user_test.go index 0ad3541bc..f067182cb 100644 --- a/api/user_test.go +++ b/api/user_test.go @@ -1020,9 +1020,15 @@ func TestStatuses(t *testing.T) { ruser := Client.Must(Client.CreateUser(&user, "")).Data.(*model.User) store.Must(Srv.Store.User().VerifyEmail(ruser.Id)) + user2 := model.User{TeamId: rteam.Data.(*model.Team).Id, Email: strings.ToLower(model.NewId()) + "corey@test.com", Nickname: "Corey Hulen", Password: "pwd"} + ruser2 := Client.Must(Client.CreateUser(&user2, "")).Data.(*model.User) + store.Must(Srv.Store.User().VerifyEmail(ruser2.Id)) + Client.LoginByEmail(team.Name, user.Email, user.Password) - r1, err := Client.GetStatuses() + userIds := []string{ruser2.Id} + + r1, err := Client.GetStatuses(userIds) if err != nil { t.Fatal(err) } diff --git a/model/client.go b/model/client.go index 19183098e..d022d3714 100644 --- a/model/client.go +++ b/model/client.go @@ -783,8 +783,8 @@ func (c *Client) ResetPassword(data map[string]string) (*Result, *AppError) { } } -func (c *Client) GetStatuses() (*Result, *AppError) { - if r, err := c.DoApiGet("/users/status", "", ""); err != nil { +func (c *Client) GetStatuses(data []string) (*Result, *AppError) { + if r, err := c.DoApiPost("/users/status", ArrayToJson(data)); err != nil { return nil, err } else { return &Result{r.Header.Get(HEADER_REQUEST_ID), diff --git a/model/version.go b/model/version.go index a61004fde..5dce70e1d 100644 --- a/model/version.go +++ b/model/version.go @@ -21,9 +21,9 @@ var versions = []string{ } var CurrentVersion string = versions[0] -var BuildNumber = "_BUILD_NUMBER_" -var BuildDate = "_BUILD_DATE_" -var BuildHash = "_BUILD_HASH_" +var BuildNumber = "dev" +var BuildDate = "Tue 3 Nov 2015 20:11:28 UTC" +var BuildHash = "a26145ef91197ba374d525c947984ae672cbd94d" func SplitVersion(version string) (int64, int64, int64) { parts := strings.Split(version, ".") @@ -69,7 +69,7 @@ func GetPreviousVersion(currentVersion string) (int64, int64) { } func IsOfficalBuild() bool { - return BuildNumber != "_BUILD_NUMBER_" + return BuildNumber != "dev" } func IsCurrentVersion(versionToCheck string) bool { |