Skip to content

Commit 8cf3d3c

Browse files
committed
fixed test case for [email protected]; add debug;
1 parent 5dd1dad commit 8cf3d3c

File tree

6 files changed

+53
-28
lines changed

6 files changed

+53
-28
lines changed

lib/gitlab.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
* Module dependencies.
1111
*/
1212

13+
var debug = require('debug')('gitlab');
1314
var urllib = require('urllib');
1415
var Milestone = require('./milestone');
1516
var Project = require('./project');
@@ -58,6 +59,7 @@ Client.prototype.request = function (method, pathname, data, callback) {
5859
dataType: 'json',
5960
data: data,
6061
}, function (err, result, res) {
62+
debug('%s %s %j: result: %j, err: %j', method, url, data, result, err);
6163
if (err) {
6264
if (err.name === 'SyntaxError') {
6365
err.name = 'Gitlab' + res.statusCode + 'Error';

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"test": "make test"
88
},
99
"dependencies": {
10-
"urllib": "0.3.4"
10+
"urllib": "0.3.4",
11+
"debug": "0.7.x"
1112
},
1213
"devDependencies": {
1314
"should": "*",

test/issue.test.js

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ describe('issue.test.js', function () {
2222
should.not.exists(err);
2323
row.id.should.equal(1098);
2424
row.should.have.keys('id', 'project_id', 'title', 'description', 'labels',
25-
'milestone', 'assignee', 'author', 'closed',
25+
'milestone', 'assignee', 'author', 'state',
2626
'updated_at', 'created_at');
2727
done();
2828
});
@@ -38,7 +38,7 @@ describe('issue.test.js', function () {
3838
issues.length.should.above(0);
3939
var row = issues[0];
4040
row.should.have.keys('id', 'project_id', 'title', 'description', 'labels',
41-
'milestone', 'assignee', 'author', 'closed',
41+
'milestone', 'assignee', 'author', 'state',
4242
'updated_at', 'created_at');
4343
done();
4444
});
@@ -49,33 +49,49 @@ describe('issue.test.js', function () {
4949
describe('client.issues.create(), update()', function () {
5050
it('should create, update a issue', function (done) {
5151
client.issues.create({
52-
id: 223, title: 'test title ' + new Date(),
52+
id: 223,
53+
title: 'test title ' + new Date(),
5354
description: '测试 `markdown` \n [abc](/abc)',
54-
assignee_id: 142, milestone_id: 117, labels: 'test,gitlabapi'
55+
assignee_id: 142,
56+
milestone_id: 117,
57+
labels: 'test,gitlabapi'
5558
}, function (err, row) {
5659
should.not.exists(err);
5760
row.project_id.should.equal(223);
61+
row.state.should.equal('opened');
5862
client.issues.update({
5963
id: 223,
6064
issue_id: row.id,
61-
closed: 1,
65+
title: row.title + ' update',
66+
state_event: 'close',
6267
}, function (err, row) {
6368
should.not.exists(err);
64-
row.closed.should.equal(true);
69+
row.title.should.include(' update');
70+
row.state.should.equal('closed');
6571
done();
6672
});
6773
});
6874
});
6975

70-
it('should update a closed issue', function (done) {
76+
it('should update a close, reopen and close issue', function (done) {
7177
client.issues.update({
7278
id: 223,
73-
issue_id: 1098,
74-
closed: 1
79+
issue_id: 1385,
80+
description: 'need to be closed!',
81+
state_event: 'close',
7582
}, function (err, row) {
7683
should.not.exists(err);
77-
row.closed.should.equal(true);
78-
done();
84+
row.state.should.equal('closed');
85+
client.issues.update({
86+
id: 223,
87+
issue_id: 1385,
88+
description: 'need to be reopen!',
89+
state_event: 'reopen',
90+
}, function (err, row) {
91+
should.not.exists(err);
92+
row.state.should.equal('reopened');
93+
done();
94+
});
7995
});
8096
});
8197

@@ -87,7 +103,7 @@ describe('issue.test.js', function () {
87103
should.not.exists(err);
88104
rows.length.should.above(0);
89105
var row = rows[0];
90-
row.should.have.keys('id', 'body', 'author', 'created_at');
106+
row.should.have.keys('id', 'body', 'author', 'created_at', 'attachment');
91107
done();
92108
});
93109
});

test/member.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ describe('member.test.js', function () {
2020
it('should return a member', function (done) {
2121
client.members.get({id: 223, user_id: 142}, function (err, member) {
2222
should.not.exists(err);
23-
member.should.have.keys('id', 'username', 'email', 'name', 'blocked', 'created_at', 'access_level');
23+
member.should.have.keys('id', 'username', 'email', 'name', 'state', 'created_at', 'access_level');
2424
done();
2525
});
2626
});
@@ -34,7 +34,7 @@ describe('member.test.js', function () {
3434
should.not.exists(err);
3535
members.should.length(5);
3636
var member = members[0];
37-
member.should.have.keys('id', 'username', 'email', 'name', 'blocked', 'created_at', 'access_level');
37+
member.should.have.keys('id', 'username', 'email', 'name', 'state', 'created_at', 'access_level');
3838
done();
3939
});
4040
});

test/milestone.test.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ describe('milestone.test.js', function () {
2222
should.not.exists(err);
2323
milestone.should.have.property('id');
2424
milestone.should.have.keys('id', 'project_id', 'title', 'description',
25-
'due_date', 'closed', 'updated_at', 'created_at');
25+
'due_date', 'state', 'updated_at', 'created_at');
2626
done();
2727
});
2828
});
@@ -36,7 +36,7 @@ describe('milestone.test.js', function () {
3636
should.not.exists(err);
3737
milestones.should.length(5);
3838
milestones[0].should.have.keys('id', 'project_id', 'title', 'description',
39-
'due_date', 'closed', 'updated_at', 'created_at');
39+
'due_date', 'state', 'updated_at', 'created_at');
4040
done();
4141
});
4242
});
@@ -55,21 +55,21 @@ describe('milestone.test.js', function () {
5555
should.not.exists(err);
5656
milestone.should.have.property('id');
5757
milestone.should.have.property('project_id', 223);
58-
milestone.closed.should.equal(false);
58+
milestone.state.should.equal('active');
5959
milestone.due_date.should.equal('2013-02-14');
6060
client.milestones.update({
6161
id: 223,
6262
milestone_id: milestone.id,
6363
title: milestone.title + ' || test update milestone' + new Date(),
6464
description: milestone.description + ' || \n ## description for update milestone' + new Date(),
6565
due_date: '2013-02-15',
66-
closed: '1',
67-
state: 'closed',
66+
// closed: '1',
67+
state_event: 'close',
6868
}, function (err, milestone) {
6969
should.not.exists(err);
7070
milestone.should.have.keys('id', 'project_id', 'title', 'description',
71-
'due_date', 'closed', 'updated_at', 'created_at');
72-
milestone.closed.should.equal(true);
71+
'due_date', 'state', 'updated_at', 'created_at');
72+
milestone.state.should.equal('closed');
7373
milestone.due_date.should.equal('2013-02-15');
7474
done();
7575
});

test/project.test.js

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@ describe('project.test.js', function () {
1818
describe('client.projects.get()', function () {
1919

2020
it('should return a project', function (done) {
21-
client.projects.get({id: 223}, function (err, project) {
21+
client.projects.get({id: 441}, function (err, project) {
2222
should.not.exists(err);
2323
project.should.have.keys('id', 'name', 'description', 'default_branch',
24-
'owner', 'private', 'issues_enabled', 'merge_requests_enabled', 'wall_enabled',
24+
'owner',
25+
'public', 'path', 'path_with_namespace', 'namespace',
26+
'issues_enabled', 'merge_requests_enabled', 'wall_enabled',
2527
'wiki_enabled', 'created_at');
26-
project.owner.should.have.keys('id', 'username', 'email', 'name', 'blocked', 'created_at');
28+
project.owner.should.have.keys('id', 'username', 'email', 'name', 'state', 'created_at');
2729
done();
2830
});
2931
});
@@ -38,9 +40,11 @@ describe('project.test.js', function () {
3840
projects.should.length(5);
3941
var project = projects[0];
4042
project.should.have.keys('id', 'name', 'description', 'default_branch',
41-
'owner', 'private', 'issues_enabled', 'merge_requests_enabled', 'wall_enabled',
43+
'owner',
44+
'public', 'path', 'path_with_namespace', 'namespace',
45+
'issues_enabled', 'merge_requests_enabled', 'wall_enabled',
4246
'wiki_enabled', 'created_at');
43-
project.owner.should.have.keys('id', 'username', 'email', 'name', 'blocked', 'created_at');
47+
project.owner.should.have.keys('id', 'username', 'email', 'name', 'state', 'created_at');
4448
done();
4549
});
4650
});
@@ -53,7 +57,9 @@ describe('project.test.js', function () {
5357
should.not.exists(err);
5458
project.should.have.keys('created_at', 'default_branch', 'description', 'id',
5559
'issues_enabled', 'merge_requests_enabled', 'name', 'namespace_id',
56-
'owner_id', 'path', 'private_flag', 'updated_at', 'wall_enabled', 'wiki_enabled');
60+
'creator_id', 'snippets_enabled', 'public',
61+
'issues_tracker_id', 'issues_tracker',
62+
'path', 'private_flag', 'updated_at', 'wall_enabled', 'wiki_enabled');
5763
done();
5864
});
5965
});

0 commit comments

Comments
 (0)