@@ -17,33 +17,33 @@ var user, user2, user3;
1717 */
1818describe ( 'User Model Unit Tests:' , function ( ) {
1919 before ( function ( done ) {
20- user = new User ( {
20+ user = {
2121 firstName : 'Full' ,
2222 lastName : 'Name' ,
2323 displayName : 'Full Name' ,
24242525 username : 'username' ,
2626 password : 'password' ,
2727 provider : 'local'
28- } ) ;
29- user2 = new User ( {
28+ } ;
29+ user2 = {
3030 firstName : 'Full' ,
3131 lastName : 'Name' ,
3232 displayName : 'Full Name' ,
33333434 username : 'username' ,
3535 password : 'password' ,
3636 provider : 'local'
37- } ) ;
38- user3 = new User ( {
37+ } ;
38+ user3 = {
3939 firstName : 'Different' ,
4040 lastName : 'User' ,
4141 displayName : 'Full Different Name' ,
42424343 username : 'different_username' ,
4444 password : 'different_password' ,
4545 provider : 'local'
46- } ) ;
46+ } ;
4747
4848 done ( ) ;
4949 } ) ;
@@ -57,59 +57,92 @@ describe('User Model Unit Tests:', function () {
5757 } ) ;
5858
5959 it ( 'should be able to save without problems' , function ( done ) {
60- user . save ( done ) ;
60+ var _user = new User ( user ) ;
61+
62+ _user . save ( function ( err ) {
63+ should . not . exist ( err ) ;
64+ _user . remove ( function ( err ) {
65+ should . not . exist ( err ) ;
66+ done ( ) ;
67+ } ) ;
68+ } ) ;
6169 } ) ;
6270
6371 it ( 'should fail to save an existing user again' , function ( done ) {
64- user . save ( function ( ) {
65- user2 . save ( function ( err ) {
72+ var _user = new User ( user ) ;
73+ var _user2 = new User ( user2 ) ;
74+
75+ _user . save ( function ( ) {
76+ _user2 . save ( function ( err ) {
6677 should . exist ( err ) ;
67- done ( ) ;
78+ _user . remove ( function ( err ) {
79+ should . not . exist ( err ) ;
80+ done ( ) ;
81+ } ) ;
6882 } ) ;
6983 } ) ;
7084 } ) ;
7185
7286 it ( 'should be able to show an error when try to save without first name' , function ( done ) {
73- user . firstName = '' ;
74- return user . save ( function ( err ) {
87+ var _user = new User ( user ) ;
88+
89+ _user . firstName = '' ;
90+ _user . save ( function ( err ) {
7591 should . exist ( err ) ;
7692 done ( ) ;
7793 } ) ;
7894 } ) ;
7995
8096 it ( 'should confirm that saving user model doesnt change the password' , function ( done ) {
81- user . firstName = 'test' ;
82- var passwordBefore = user . password ;
83- return user . save ( function ( err ) {
84- var passwordAfter = user . password ;
85- passwordBefore . should . equal ( passwordAfter ) ;
86- done ( ) ;
97+ var _user = new User ( user ) ;
98+
99+ _user . save ( function ( err ) {
100+ should . not . exist ( err ) ;
101+ var passwordBefore = _user . password ;
102+ _user . firstName = 'test' ;
103+ _user . save ( function ( err ) {
104+ var passwordAfter = _user . password ;
105+ passwordBefore . should . equal ( passwordAfter ) ;
106+ _user . remove ( function ( err ) {
107+ should . not . exist ( err ) ;
108+ done ( ) ;
109+ } ) ;
110+ } ) ;
87111 } ) ;
88112 } ) ;
89113
90114 it ( 'should be able to save 2 different users' , function ( done ) {
91- user . remove ( function ( err ) {
115+ var _user = new User ( user ) ;
116+ var _user3 = new User ( user3 ) ;
117+
118+ _user . save ( function ( err ) {
92119 should . not . exist ( err ) ;
93- user . save ( function ( err ) {
94- user3 . save ( function ( err ) {
120+ _user3 . save ( function ( err ) {
121+ should . not . exist ( err ) ;
122+ _user3 . remove ( function ( err ) {
95123 should . not . exist ( err ) ;
96- user3 . remove ( function ( err ) {
124+ _user . remove ( function ( err ) {
97125 should . not . exist ( err ) ;
98126 done ( ) ;
99127 } ) ;
100-
101128 } ) ;
102129 } ) ;
103130 } ) ;
104131 } ) ;
105132
106133 it ( 'should not be able to save different user with the same email address' , function ( done ) {
107- user . remove ( function ( err ) {
134+ var _user = new User ( user ) ;
135+ var _user3 = new User ( user3 ) ;
136+
137+ _user . remove ( function ( err ) {
108138 should . not . exist ( err ) ;
109- user . save ( function ( err ) {
110- user3 . email = user . email ;
111- user3 . save ( function ( err ) {
139+ _user . save ( function ( err ) {
140+ var user3_email = _user3 . email ;
141+ _user3 . email = _user . email ;
142+ _user3 . save ( function ( err ) {
112143 should . exist ( err ) ;
144+ // Restoring the original email for test3 so it can be used in later tests
145+ _user3 . email = user3_email ;
113146 done ( ) ;
114147 } ) ;
115148 } ) ;
0 commit comments