1 files changed, 87 insertions, 16 deletions

diff --git a/webapp/tests/client_user.test.jsx b/webapp/tests/client_user.test.jsx
index 48a0150d4..8c6f0f970 100644
--- a/webapp/tests/client_user.test.jsx
+++ b/webapp/tests/client_user.test.jsx
@@ -444,23 +444,28 @@ describe('Client.User', function() {
         });
     });
 
-    it('getDirectProfiles', function(done) {
+    it('getProfiles', function(done) {
         TestHelper.initBasic(() => {
-            TestHelper.basicClient().getDirectProfiles(
+            TestHelper.basicClient().getProfiles(
+                0,
+                100,
                 function(data) {
-                    assert.equal(Object.keys(data).length === 0, true);
+                    assert.equal(Object.keys(data).length > 0, true);
                     done();
                 },
                 function(err) {
-                    done(new Error(err.getDirectProfiles));
+                    done(new Error(err.message));
                 }
             );
         });
     });
 
-    it('getProfiles', function(done) {
+    it('getProfilesInTeam', function(done) {
         TestHelper.initBasic(() => {
-            TestHelper.basicClient().getProfiles(
+            TestHelper.basicClient().getProfilesInTeam(
+                TestHelper.basicTeam().id,
+                0,
+                100,
                 function(data) {
                     assert.equal(data[TestHelper.basicUser().id].id, TestHelper.basicUser().id);
                     done();
@@ -472,10 +477,10 @@ describe('Client.User', function() {
         });
     });
 
-    it('getProfilesForTeam', function(done) {
+    it('getProfilesByIds', function(done) {
         TestHelper.initBasic(() => {
-            TestHelper.basicClient().getProfilesForTeam(
-                TestHelper.basicTeam().id,
+            TestHelper.basicClient().getProfilesByIds(
+                [TestHelper.basicUser().id],
                 function(data) {
                     assert.equal(data[TestHelper.basicUser().id].id, TestHelper.basicUser().id);
                     done();
@@ -487,9 +492,12 @@ describe('Client.User', function() {
         });
     });
 
-    it('getProfilesForDirectMessageList', function(done) {
+    it('getProfilesInChannel', function(done) {
         TestHelper.initBasic(() => {
-            TestHelper.basicClient().getProfilesForDirectMessageList(
+            TestHelper.basicClient().getProfilesInChannel(
+                TestHelper.basicChannel().id,
+                0,
+                100,
                 function(data) {
                     assert.equal(Object.keys(data).length > 0, true);
                     done();
@@ -501,16 +509,80 @@ describe('Client.User', function() {
         });
     });
 
-    /* TODO: FIX THIS TEST
-    it('getStatuses', function(done) {
+    it('getProfilesNotInChannel', function(done) {
+        TestHelper.initBasic(() => {
+            TestHelper.basicClient().getProfilesNotInChannel(
+                TestHelper.basicChannel().id,
+                0,
+                100,
+                function(data) {
+                    assert.equal(Object.keys(data).length > 0, false);
+                    done();
+                },
+                function(err) {
+                    done(new Error(err.message));
+                }
+            );
+        });
+    });
+
+    it('searchUsers', function(done) {
+        TestHelper.initBasic(() => {
+            TestHelper.basicClient().searchUsers(
+                'uid',
+                TestHelper.basicTeam().id,
+                {},
+                function(data) {
+                    assert.equal(data.length > 0, true);
+                    done();
+                },
+                function(err) {
+                    done(new Error(err.message));
+                }
+            );
+        });
+    });
+
+    it('autocompleteUsersInChannel', function(done) {
+        TestHelper.initBasic(() => {
+            TestHelper.basicClient().autocompleteUsersInChannel(
+                'uid',
+                TestHelper.basicChannel().id,
+                function(data) {
+                    assert.equal(data != null, true);
+                    done();
+                },
+                function(err) {
+                    done(new Error(err.message));
+                }
+            );
+        });
+    });
+
+    it('autocompleteUsersInTeam', function(done) {
+        TestHelper.initBasic(() => {
+            TestHelper.basicClient().autocompleteUsersInTeam(
+                'uid',
+                function(data) {
+                    assert.equal(data != null, true);
+                    done();
+                },
+                function(err) {
+                    done(new Error(err.message));
+                }
+            );
+        });
+    });
+
+    it('getStatusesByIds', function(done) {
         TestHelper.initBasic(() => {
             var ids = [];
             ids.push(TestHelper.basicUser().id);
 
-            TestHelper.basicClient().getStatuses(
+            TestHelper.basicClient().getStatusesByIds(
                 ids,
                 function(data) {
-                    assert.equal(data[TestHelper.basicUser().id], 'online');
+                    assert.equal(data[TestHelper.basicUser().id] != null, true);
                     done();
                 },
                 function(err) {
@@ -519,7 +591,6 @@ describe('Client.User', function() {
             );
         });
     });
-    */
 
     it('setActiveChannel', function(done) {
         TestHelper.initBasic(() => {