Skip to content

Commit 7e85bdc

Browse files
committed
字符串使用单引号、使用 Promise
1 parent 7fb2967 commit 7e85bdc

File tree

6 files changed

+29
-37
lines changed

6 files changed

+29
-37
lines changed

src/cloudfunction.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module.exports = function(AV) {
3131
* of the function.
3232
*/
3333
run: function(name, data, options) {
34-
var request = AV._request("functions", name, null, 'POST',
34+
var request = AV._request('functions', name, null, 'POST',
3535
AV._encode(data, null, true), options && options.sessionToken);
3636

3737
return request.then(function(resp) {

src/object.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,7 @@ module.exports = function(AV) {
791791
}
792792

793793
var self = this;
794-
var request = AV._request("classes", this.className, this.id, 'GET',
794+
var request = AV._request('classes', this.className, this.id, 'GET',
795795
fetchOptions, options.sessionToken);
796796
return request.then(function(response) {
797797
self._finishFetch(self.parse(response), true);
@@ -977,7 +977,7 @@ module.exports = function(AV) {
977977
}
978978

979979
var request =
980-
AV._request("classes", this.className, this.id, 'DELETE', null, options.sessionToken);
980+
AV._request('classes', this.className, this.id, 'DELETE', null, options.sessionToken);
981981
return request.then(function() {
982982
if (options.wait) {
983983
triggerDestroy();
@@ -1247,7 +1247,7 @@ module.exports = function(AV) {
12471247
}
12481248
});
12491249
var request =
1250-
AV._request("classes", className, id, 'DELETE', null, options.sessionToken);
1250+
AV._request('classes', className, id, 'DELETE', null, options.sessionToken);
12511251
return request._thenRunCallbacks(options);
12521252
};
12531253

src/query.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ module.exports = function(AV) {
155155
options = pvalues;
156156
}
157157

158-
var request = AV._request("cloudQuery", null, null, 'GET', params, options && options.sessionToken);
158+
var request = AV._request('cloudQuery', null, null, 'GET', params, options && options.sessionToken);
159159
return request.then(function(response) {
160160
//query to process results.
161161
var query = new AV.Query(response.className);
@@ -252,7 +252,7 @@ module.exports = function(AV) {
252252
return obj;
253253
},
254254
_createRequest: function(params, options){
255-
return AV._request("classes", this.className, null, "GET",
255+
return AV._request('classes', this.className, null, "GET",
256256
params || this.toJSON(), options && options.sessionToken);
257257
},
258258

src/search.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ module.exports = function(AV) {
125125
_highlights: null,
126126
_sortBuilder: null,
127127
_createRequest: function(params, options){
128-
return AV._request("search/select", null, null, "GET",
128+
return AV._request('search/select', null, null, 'GET',
129129
params || this.toJSON(), options && options.sessionToken);
130130
},
131131

src/status.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ module.exports = function(AV) {
5858
destroy: function(options){
5959
if(!this.id)
6060
return AV.Promise.error('The status id is not exists.')._thenRunCallbacks(options);
61-
var request = AV._request("statuses", null, this.id, 'DELETE', options && options.sessionToken);
61+
var request = AV._request('statuses', null, this.id, 'DELETE', options && options.sessionToken);
6262
return request._thenRunCallbacks(options);
6363
},
6464
/**
@@ -294,7 +294,7 @@ module.exports = function(AV) {
294294
return new AV.Status();
295295
},
296296
_createRequest: function(params, options){
297-
return AV._request("subscribe/statuses", null, null, "GET",
297+
return AV._request('subscribe/statuses', null, null, 'GET',
298298
params || this.toJSON(), options && options.sessionToken);
299299
},
300300

test/user.js

Lines changed: 20 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -299,16 +299,14 @@ describe("User", function() {
299299
it('User#signUp', function() {
300300
user = new AV.User();
301301

302-
user.set("username", username);
303-
user.set("password", password);
304-
user.set("email", email);
305-
306-
return user.signUp(null, {
307-
success: function(user) {
308-
expect(user._isCurrentUser).to.be.equal(false);
309-
expect(AV.User._currentUser).to.be.equal(null);
310-
expect(user._sessionToken).to.be.ok();
311-
}
302+
user.set('username', username);
303+
user.set('password', password);
304+
user.set('email', email);
305+
306+
return user.signUp().then(function(user) {
307+
expect(user._isCurrentUser).to.be.equal(false);
308+
expect(AV.User._currentUser).to.be.equal(null);
309+
expect(user._sessionToken).to.be.ok();
312310
});
313311
});
314312

@@ -326,27 +324,21 @@ describe("User", function() {
326324
});
327325
});
328326

329-
it('User#save without token', function(done) {
330-
user.save({username: username + 'changed'}, {
331-
success: function() {
332-
done(new Error('Should not success'));
333-
},
334-
error: function(err) {
335-
expect(err.code).to.be.equal(206);
336-
done();
337-
}
327+
it('User#save without token', function() {
328+
return user.save({username: username + 'changed'}).then(function() {
329+
throw new Error('Should not success');
330+
}, function(err) {
331+
expect(err.code).to.be.equal(206);
338332
});
339333
});
340334

341-
it('User#save with token', function(done) {
342-
user.save({username: username + 'changed'}, {
343-
sessionToken: user.getSessionToken(),
344-
success: function() {
345-
done();
346-
},
347-
error: function(err) {
348-
done(err);
349-
}
335+
it('User#save with token', function() {
336+
return user.save({
337+
username: username + 'changed'
338+
}, {sessionToken: user.getSessionToken()}).then(function() {
339+
user.fetch().then(function() {
340+
expect(user.username).to.be.equal(username + 'changed');
341+
});
350342
});
351343
});
352344

0 commit comments

Comments
 (0)