@@ -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