diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-11-02 14:38:34 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-02 14:38:34 -0400 |
commit | 137ade29d061e158543da814ecd0d06d7e992c1f (patch) | |
tree | cb528f2db486f78a4e9fe5a75a693ce6d3968cca /model/user_search_test.go | |
parent | b45cc443c9e9fdf8147d354b95b6fecb31b2e7b2 (diff) | |
download | chat-137ade29d061e158543da814ecd0d06d7e992c1f.tar.gz chat-137ade29d061e158543da814ecd0d06d7e992c1f.tar.bz2 chat-137ade29d061e158543da814ecd0d06d7e992c1f.zip |
PLT-4535/PLT-4503 Fix inactive users in searches and add option functionality to DB user search (#4413)
* Add options to user database search
* Fix inactive users showing up incorrectly in some user searches
* Read JSON for searchUsers API into anonymous struct
* Move anonymous struct to be a normal struct in model directory and upadte client to use it
* Added clarification comment about slightly odd query condition in search
Diffstat (limited to 'model/user_search_test.go')
-rw-r--r-- | model/user_search_test.go | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/model/user_search_test.go b/model/user_search_test.go new file mode 100644 index 000000000..b2543ffdb --- /dev/null +++ b/model/user_search_test.go @@ -0,0 +1,19 @@ +// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. + +package model + +import ( + "strings" + "testing" +) + +func TestUserSearchJson(t *testing.T) { + userSearch := UserSearch{Term: NewId(), TeamId: NewId()} + json := userSearch.ToJson() + ruserSearch := UserSearchFromJson(strings.NewReader(json)) + + if userSearch.Term != ruserSearch.Term { + t.Fatal("Terms do not match") + } +} |