2 files changed, 26 insertions, 11 deletions

diff --git a/webapp/tests/client_admin.test.jsx b/webapp/tests/client_admin.test.jsx
index a6a6e1a85..2ed08dc62 100644
--- a/webapp/tests/client_admin.test.jsx
+++ b/webapp/tests/client_admin.test.jsx
@@ -15,7 +15,7 @@ describe('Client.Admin', function() {
                     done(new Error('should need system admin permissions'));
                 },
                 function(err) {
-                    assert.equal(err.id, 'api.context.system_permissions.app_error');
+                    assert.equal(err.id, 'api.context.permissions.app_error');
                     done();
                 }
             );
@@ -30,7 +30,7 @@ describe('Client.Admin', function() {
                     done(new Error('should need system admin permissions'));
                 },
                 function(err) {
-                    assert.equal(err.id, 'api.context.system_permissions.app_error');
+                    assert.equal(err.id, 'api.context.permissions.app_error');
                     done();
                 }
             );
@@ -45,7 +45,7 @@ describe('Client.Admin', function() {
                     done(new Error('should need system admin permissions'));
                 },
                 function(err) {
-                    assert.equal(err.id, 'api.context.system_permissions.app_error');
+                    assert.equal(err.id, 'api.context.permissions.app_error');
                     done();
                 }
             );
@@ -69,7 +69,7 @@ describe('Client.Admin', function() {
                     done(new Error('should need system admin permissions'));
                 },
                 function(err) {
-                    assert.equal(err.id, 'api.context.system_permissions.app_error');
+                    assert.equal(err.id, 'api.context.permissions.app_error');
                     done();
                 }
             );
@@ -84,7 +84,7 @@ describe('Client.Admin', function() {
                     done(new Error('should need system admin permissions'));
                 },
                 function(err) {
-                    assert.equal(err.id, 'api.context.system_permissions.app_error');
+                    assert.equal(err.id, 'api.context.permissions.app_error');
                     done();
                 }
             );
@@ -99,7 +99,7 @@ describe('Client.Admin', function() {
                     done(new Error('should need system admin permissions'));
                 },
                 function(err) {
-                    assert.equal(err.id, 'api.context.system_permissions.app_error');
+                    assert.equal(err.id, 'api.context.permissions.app_error');
                     done();
                 }
             );
@@ -114,7 +114,7 @@ describe('Client.Admin', function() {
                     done(new Error('should need system admin permissions'));
                 },
                 function(err) {
-                    assert.equal(err.id, 'api.context.system_permissions.app_error');
+                    assert.equal(err.id, 'api.context.permissions.app_error');
                     done();
                 }
             );
@@ -131,7 +131,7 @@ describe('Client.Admin', function() {
                     done(new Error('should need system admin permissions'));
                 },
                 function(err) {
-                    assert.equal(err.id, 'api.context.system_permissions.app_error');
+                    assert.equal(err.id, 'api.context.permissions.app_error');
                     done();
                 }
             );
@@ -148,7 +148,7 @@ describe('Client.Admin', function() {
                     done(new Error('should need system admin permissions'));
                 },
                 function(err) {
-                    assert.equal(err.id, 'api.context.system_permissions.app_error');
+                    assert.equal(err.id, 'api.context.permissions.app_error');
                     done();
                 }
             );
@@ -167,7 +167,7 @@ describe('Client.Admin', function() {
                     done(new Error('should need system admin permissions'));
                 },
                 function(err) {
-                    assert.equal(err.id, 'api.context.system_permissions.app_error');
+                    assert.equal(err.id, 'api.context.permissions.app_error');
                     done();
                 }
             );
@@ -186,7 +186,7 @@ describe('Client.Admin', function() {
                     done(new Error('should need system admin permissions'));
                 },
                 function(err) {
-                    assert.equal(err.id, 'api.context.system_permissions.app_error');
+                    assert.equal(err.id, 'api.context.permissions.app_error');
                     done();
                 }
             );
diff --git a/webapp/tests/client_user.test.jsx b/webapp/tests/client_user.test.jsx
index 116eee4ae..6c65e8ef5 100644
--- a/webapp/tests/client_user.test.jsx
+++ b/webapp/tests/client_user.test.jsx
@@ -21,6 +21,21 @@ describe('Client.User', function() {
         });
     });
 
+    it('getUser', function(done) {
+        TestHelper.initBasic(() => {
+            TestHelper.basicClient().getUser(
+                TestHelper.basicUser().id,
+                function(data) {
+                    assert.equal(data.id, TestHelper.basicUser().id);
+                    done();
+                },
+                function(err) {
+                    done(new Error(err.message));
+                }
+            );
+        });
+    });
+
     it('getInitialLoad', function(done) {
         TestHelper.initBasic(() => {
             TestHelper.basicClient().getInitialLoad(