summaryrefslogtreecommitdiffstats
path: root/model
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2015-11-03 15:27:35 -0500
committerJoramWilander <jwawilander@gmail.com>2015-11-03 15:27:35 -0500
commita15649e3827025a1222684b7960b4ec19351bc81 (patch)
tree7099a62ed8e7e47e5201f6d2c9ec7241afb0d09c /model
parenta26145ef91197ba374d525c947984ae672cbd94d (diff)
downloadchat-a15649e3827025a1222684b7960b4ec19351bc81.tar.gz
chat-a15649e3827025a1222684b7960b4ec19351bc81.tar.bz2
chat-a15649e3827025a1222684b7960b4ec19351bc81.zip
Updated getStatuses unit testgs
Diffstat (limited to 'model')
-rw-r--r--model/client.go4
-rw-r--r--model/version.go8
2 files changed, 6 insertions, 6 deletions
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 {