Merge pull request #22 from dfalling/fixTests

Fix tests

Author: fengmk2

test/gitlab.test.js

@@ -43,7 +43,7 @@ describe('gitlab.test.js', function () {
 
     it('should request 404 error', function (done) {
       client.request('get', '/projects/:id/milestones', {id: 99999999}, function (err, milestones) {
-        should.not.exists(err);
+        should.exists(err);
         should.not.exists(milestones);
         done();
       });

test/hook.test.js

@@ -50,8 +50,9 @@ describe('hook.test.js', function () {
     it('should return a hook', function* () {
       var hook = yield client.thunk.hooks.get({ id: client.id, hook_id: hookId });
       hook.id.should.equal(hookId);
-      hook.should.have.keys('id', 'url', 'created_at', 'project_id',
-        'push_events', 'issues_events', 'merge_requests_events', 'tag_push_events');
+      hook.should.have.keys('id', 'url', 'created_at', 'project_id', 'push_events',
+          'issues_events', 'merge_requests_events', 'tag_push_events', 'note_events',
+          'build_events', 'enable_ssl_verification');
       hook.push_events.should.be.a.Boolean;
     });
   });
@@ -62,7 +63,9 @@ describe('hook.test.js', function () {
       hooks.length.should.above(0);
       var hook = hooks[0];
       hook.should.have.keys('id', 'url', 'created_at', 'project_id',
-        'push_events', 'issues_events', 'merge_requests_events', 'tag_push_events');
+          'push_events', 'issues_events', 'merge_requests_events',
+          'tag_push_events', 'note_events', 'build_events',
+          'enable_ssl_verification');
     });
   });
 
@@ -104,8 +107,11 @@ describe('hook.test.js', function () {
 
       yield client.thunk.hooks.remove({id: client.id, hook_id: hook.id});
 
-      var hook = yield client.thunk.hooks.get({id: client.id, hook_id: hook.id});
-      should.not.exist(hook);
+      try {
+        var hook = yield client.thunk.hooks.get({id: client.id, hook_id: hook.id});
+      } catch (err) {
+        err.name.should.equal('Gitlab404Error');
+      }
     });
   });
 });

test/issue.test.js

@@ -40,8 +40,8 @@ describe('issue.test.js', function () {
         should.not.exists(err);
         row.id.should.equal(issueId);
         row.should.have.keys('id', 'iid', 'project_id', 'title', 'description', 'labels',
-          'milestone', 'assignee', 'author', 'state',
-          'updated_at', 'created_at');
+          'milestone', 'assignee', 'author', 'state', 'updated_at', 'created_at', 
+          'subscribed', 'user_notes_count');
         done();
       });
     });
@@ -51,8 +51,8 @@ describe('issue.test.js', function () {
       .then(function (row) {
         row.id.should.equal(issueId);
         row.should.have.keys('id', 'iid', 'project_id', 'title', 'description', 'labels',
-          'milestone', 'assignee', 'author', 'state',
-          'updated_at', 'created_at');
+          'milestone', 'assignee', 'author', 'state', 'updated_at', 'created_at', 
+          'subscribed', 'user_notes_count');
         done();
       })
       .catch(done);
@@ -62,8 +62,8 @@ describe('issue.test.js', function () {
       var row = yield client.thunk.issues.get({id: client.id, issue_id: issueId});
       row.id.should.equal(issueId);
       row.should.have.keys('id', 'iid', 'project_id', 'title', 'description', 'labels',
-        'milestone', 'assignee', 'author', 'state',
-        'updated_at', 'created_at');
+        'milestone', 'assignee', 'author', 'state', 'updated_at', 'created_at', 
+        'subscribed', 'user_notes_count');
     });
   });
 
@@ -75,8 +75,8 @@ describe('issue.test.js', function () {
         issues.length.should.above(0);
         var row = issues[0];
         row.should.have.keys('id', 'iid', 'project_id', 'title', 'description', 'labels',
-          'milestone', 'assignee', 'author', 'state',
-          'updated_at', 'created_at');
+          'milestone', 'assignee', 'author', 'state', 'updated_at', 'created_at',
+          'subscribed', 'user_notes_count');
         done();
       });
     });
@@ -139,7 +139,8 @@ describe('issue.test.js', function () {
         should.not.exists(err);
         rows.length.should.above(0);
         var row = rows[0];
-        row.should.have.keys('id', 'body', 'author', 'created_at', 'attachment');
+        row.should.have.keys('id', 'body', 'author', 'created_at', 'attachment',
+             'updated_at', 'system', 'noteable_id', 'noteable_type', 'upvote', 'downvote');
         done();
       });
     });
@@ -148,7 +149,8 @@ describe('issue.test.js', function () {
       var rows = yield client.thunk.issues.listNotes({id: client.id, issue_id: issueId});
       rows.length.should.above(0);
       var row = rows[0];
-      row.should.have.keys('id', 'body', 'author', 'created_at', 'attachment');
+      row.should.have.keys('id', 'body', 'author', 'created_at', 'attachment',
+             'updated_at', 'system', 'noteable_id', 'noteable_type', 'upvote', 'downvote');
     });
   });
 

test/project.test.js

@@ -33,8 +33,12 @@ describe('project.test.js', function () {
           'public', 'path', 'path_with_namespace', 'name_with_namespace', 'namespace',
           'issues_enabled', 'merge_requests_enabled',
           'wiki_enabled', 'created_at', 'last_activity_at',
-          'archived', 'visibility_level', 'snippets_enabled', 'permissions');
-        project.owner.should.have.keys('id', 'username', 'name', 'state', 'avatar_url');
+          'archived', 'visibility_level', 'snippets_enabled', 'permissions',
+					'tag_list', 'builds_enabled', 'shared_runners_enabled', 'creator_id',
+				  'avatar_url', 'star_count', 'forks_count', 'open_issues_count',
+					'runners_token', 'public_builds');
+        project.owner.should.have.keys('id', 'username', 'name', 'state', 'avatar_url',
+					'web_url');
         done();
       });
     });
@@ -53,7 +57,8 @@ describe('project.test.js', function () {
         //   'public', 'path', 'path_with_namespace', 'namespace',
         //   'issues_enabled', 'merge_requests_enabled', 'wall_enabled',
         //   'wiki_enabled', 'created_at');
-        project.owner.should.have.keys('id', 'username', 'name', 'state', 'avatar_url');
+        project.owner.should.have.keys('id', 'username', 'name', 'state', 'avatar_url',
+					'web_url');
         done();
       });
     });
@@ -78,19 +83,4 @@ describe('project.test.js', function () {
     });
   });
 
-  describe.skip('client.projects.getByPath()', function () {
-    it('should return a project by path', function (done) {
-      client.projects.getByPath({path: 'fengmk2/node-gitlab-test'}, function (err, project) {
-        should.not.exists(err);
-        project.id.should.equal(1040);
-        // project.should.have.keys('created_at', 'default_branch', 'description', 'id',
-        //   'issues_enabled', 'merge_requests_enabled', 'name', 'namespace_id',
-        //   'creator_id', 'snippets_enabled', 'public',
-        //   'issues_tracker_id', 'issues_tracker', 'last_activity_at',
-        //   'path', 'private_flag', 'updated_at', 'wall_enabled', 'wiki_enabled');
-        done();
-      });
-    });
-  });
-
 });

test/project_member.test.js

@@ -44,7 +44,7 @@ describe('project_member.test.js', function () {
     it('should return a member', function (done) {
       client.projectMembers.get({id: client.id, user_id: 5}, function (err, member) {
         should.not.exists(err);
-        member.should.have.keys('id', 'username', 'name', 'state', 'access_level', 'avatar_url');
+        member.should.have.keys('id', 'username', 'name', 'state', 'access_level', 'avatar_url', 'web_url');
         done();
       });
     });
@@ -58,7 +58,7 @@ describe('project_member.test.js', function () {
         should.not.exists(err);
         members.should.length(2);
         var member = members[0];
-        member.should.have.keys('id', 'username', 'name', 'state', 'access_level', 'avatar_url');
+        member.should.have.keys('id', 'username', 'name', 'state', 'access_level', 'avatar_url', 'web_url');
         done();
       });
     });