Skip to content

Commit ef4ffc0

Browse files
committed
fix test code style
1 parent fb4f306 commit ef4ffc0

File tree

14 files changed

+1234
-1286
lines changed

14 files changed

+1234
-1286
lines changed

gulpfile.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,10 @@ gulp.task('compress-docs', ['docs'], function() {
5454
.pipe(tar('js-sdk-api-docs-' + version + '.tar'))
5555
.pipe(gzip())
5656
.pipe(gulp.dest('dist'));
57-
})
58-
59-
AV = require('./lib/av').AV;
57+
});
6058

6159
gulp.task('test', function() {
62-
return gulp.src('tests/*.js', {read: false})
60+
return gulp.src('test/*.js', {read: false})
6361
.pipe(order([
6462
'test.js',
6563
'file.js',
@@ -76,7 +74,6 @@ gulp.task('test', function() {
7674
]))
7775
.pipe(mocha({
7876
timeout: 100000,
79-
globals: ['AV'],
8077
}));
8178
});
8279

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"qiniu": "6.1.3"
1313
},
1414
"devDependencies": {
15+
"debug": "^2.1.1",
1516
"expect.js ": "0.2.0",
1617
"gulp": "^3.8.10",
1718
"gulp-clean": "^0.3.1",

test/acl.js

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
var GameScore = AV.Object.extend("GameScore");
22
describe("ObjectACL",function(){
3-
describe("*",function(){
4-
it("set * acl",function(done){
5-
var gameScore = new GameScore();
6-
gameScore.set("score", 2);
7-
gameScore.set("playerName", "sdf");
8-
gameScore.set("cheatMode", false);
9-
10-
var postACL = new AV.ACL();
11-
postACL.setPublicReadAccess(true);
12-
postACL.setPublicWriteAccess(true);
13-
14-
postACL.setReadAccess("546",true);
15-
postACL.setReadAccess("56238",true);
16-
postACL.setWriteAccess("5a061",true);
17-
postACL.setRoleWriteAccess("r6",true);
18-
gameScore.setACL(postACL);
19-
gameScore.save(null, {
20-
success: function(result) {
21-
expect(result.id).to.be.ok();
22-
23-
done();
24-
25-
},
26-
error: function(gameScore, error) {
27-
throw error;
28-
}
29-
});
30-
});
31-
});
32-
});
3+
describe("*",function(){
4+
it("set * acl",function(done){
5+
var gameScore = new GameScore();
6+
gameScore.set("score", 2);
7+
gameScore.set("playerName", "sdf");
8+
gameScore.set("cheatMode", false);
9+
10+
var postACL = new AV.ACL();
11+
postACL.setPublicReadAccess(true);
12+
postACL.setPublicWriteAccess(true);
13+
14+
postACL.setReadAccess("546",true);
15+
postACL.setReadAccess("56238",true);
16+
postACL.setWriteAccess("5a061",true);
17+
postACL.setRoleWriteAccess("r6",true);
18+
gameScore.setACL(postACL);
19+
gameScore.save(null, {
20+
success: function(result) {
21+
expect(result.id).to.be.ok();
22+
23+
done();
24+
25+
},
26+
error: function(gameScore, error) {
27+
throw error;
28+
}
29+
});
30+
});
31+
});
32+
});

test/collection.js

Lines changed: 34 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,42 @@
11
var GameScore = AV.Object.extend("GameScore");
22
var GameScoreCollection = AV.Collection.extend({
3-
model: GameScore
4-
});
3+
model: GameScore
4+
});
55
var collection;
66
describe("Collection",function(){
7-
describe("#query",function(){
8-
it("should return collection",function(done){
9-
collection = new GameScoreCollection();
7+
describe("#query",function(){
8+
it("should return collection",function(done){
9+
collection = new GameScoreCollection();
1010

11-
var query = new AV.Query(GameScore);
12-
13-
collection = query.collection();
14-
15-
collection.fetch({
16-
success: function(collection) {
17-
console.log(collection)
18-
done();
11+
var query = new AV.Query(GameScore);
1912

20-
},
21-
error: function(collection, error) {
22-
throw error
23-
// The collection could not be retrieved.
24-
}
25-
});
26-
});
27-
})
13+
collection = query.collection();
2814

29-
describe("Modify Collection",function(){
30-
it("add entity",function(done){
31-
collection = new GameScoreCollection();
32-
collection.add({
33-
"score":12,
34-
"playerName":"player2"
35-
})
36-
collection.reset([
37-
{"score": 12},
38-
{"playerName": "Jane"}
39-
]);
40-
done();
41-
})
42-
})
15+
collection.fetch({
16+
success: function(collection) {
17+
debug(collection);
18+
done();
19+
},
20+
error: function(collection, error) {
21+
throw error;
22+
// The collection could not be retrieved.
23+
}
24+
});
25+
});
26+
});
4327

44-
describe("",function(){
45-
it("",function(done){
46-
done();
47-
})
48-
})
49-
50-
})
28+
describe("Modify Collection",function(){
29+
it("add entity",function(done){
30+
collection = new GameScoreCollection();
31+
collection.add({
32+
"score":12,
33+
"playerName":"player2"
34+
});
35+
collection.reset([
36+
{"score": 12},
37+
{"playerName": "Jane"}
38+
]);
39+
done();
40+
});
41+
});
42+
});

test/error.js

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
var TestError = AV.Object.extend("TestError");
22
describe("error",function(){
33

4-
it("return error",function(done){
5-
var test = new TestError();
6-
test.set("num",1);
7-
test.save();
8-
var test1 = new TestError();
9-
test.set("num","s");
10-
test.save(null,{
11-
success:function(obj){
12-
console.log(obj);
13-
done();
14-
},
15-
error:function(obj,err){
16-
console.log(obj);
17-
console.log(err);
18-
done();
19-
}
20-
}
21-
);
22-
});
23-
24-
});
4+
it("return error",function(done){
5+
var test = new TestError();
6+
test.set("num",1);
7+
test.save();
8+
var test1 = new TestError();
9+
test.set("num","s");
10+
test.save(null,{
11+
success:function(obj){
12+
debug(obj);
13+
done();
14+
},
15+
error:function(obj,err){
16+
debug(obj);
17+
debug(err);
18+
done();
19+
}
20+
}
21+
);
22+
});
23+
24+
});

0 commit comments

Comments
 (0)