@@ -9,18 +9,11 @@ module.exports = {
9
9
for ( var i = 0 ; i < EXPECTED ; i ++ ) {
10
10
bcrypt . genSalt ( 10 , function ( err , salt ) {
11
11
assert . equals ( 29 , salt . length , "Salt (" + salt + ") isn't the correct length. It is: " + salt . length ) ;
12
- n ++ ;
13
- } ) ;
14
- }
15
-
16
- function checkVal ( ) {
17
- if ( n == EXPECTED ) {
18
- assert . done ( ) ;
19
- } else {
20
- setTimeout ( checkVal , 100 ) ;
12
+ if ( ++ n == EXPECTED ) {
13
+ assert . done ( ) ;
21
14
}
15
+ } ) ;
22
16
}
23
- setTimeout ( checkVal , 100 ) ;
24
17
} ,
25
18
test_hash_length : function ( assert ) {
26
19
assert . expect ( EXPECTED ) ;
@@ -29,18 +22,11 @@ module.exports = {
29
22
for ( var i = 0 ; i < EXPECTED ; i ++ ) {
30
23
bcrypt . hash ( 'test' , SALT , function ( err , crypted ) {
31
24
assert . equals ( 60 , crypted . length , "Encrypted (" + crypted + ") isn't the correct length. It is: " + crypted . length ) ;
32
- n ++ ;
25
+ if ( ++ n == EXPECTED ) {
26
+ assert . done ( ) ;
27
+ }
33
28
} ) ;
34
29
}
35
-
36
- function checkVal ( ) {
37
- if ( n == EXPECTED ) {
38
- assert . done ( ) ;
39
- } else {
40
- setTimeout ( checkVal , 100 ) ;
41
- }
42
- }
43
- setTimeout ( checkVal , 100 ) ;
44
30
} ,
45
31
test_compare : function ( assert ) {
46
32
assert . expect ( EXPECTED ) ;
@@ -49,18 +35,11 @@ module.exports = {
49
35
for ( var i = 0 ; i < EXPECTED ; i ++ ) {
50
36
bcrypt . compare ( 'test' , HASH , function ( err , match ) {
51
37
assert . equal ( true , match , "No match." ) ;
52
- n ++ ;
38
+ if ( ++ n == EXPECTED ) {
39
+ assert . done ( ) ;
40
+ }
53
41
} ) ;
54
42
}
55
-
56
- function checkVal ( ) {
57
- if ( n == EXPECTED ) {
58
- assert . done ( ) ;
59
- } else {
60
- setTimeout ( checkVal , 100 ) ;
61
- }
62
- }
63
- setTimeout ( checkVal , 100 ) ;
64
43
} ,
65
44
test_hash_and_compare : function ( assert ) {
66
45
assert . expect ( ( EXPECTED - 1 ) * 3 ) ;
@@ -87,29 +66,21 @@ module.exports = {
87
66
if ( idx >= ( EXPECTED - 1 ) ) {
88
67
good_done = true ;
89
68
}
90
- } ) ;
91
69
92
- bcrypt . compare ( 'bad' + password , hash , function ( err , res ) {
93
- //if (err) throw err;
94
- assert . ok ( ! res ) ;
95
- if ( idx >= ( EXPECTED - 1 ) ) {
96
- bad_done = true ;
97
- }
98
- } ) ;
99
-
100
- if ( idx < ( ( EXPECTED ) - 1 ) ) {
101
- next ( ) ;
102
- } else {
103
- function checkDone ( ) {
104
- if ( idx >= ( EXPECTED - 1 ) && good_done && bad_done ) {
105
- assert . done ( ) ;
106
- } else {
107
- setTimeout ( checkDone , 100 ) ;
70
+ bcrypt . compare ( 'bad' + password , hash , function ( err , res ) {
71
+ //if (err) throw err;
72
+ assert . ok ( ! res ) ;
73
+ if ( idx >= ( EXPECTED - 1 ) ) {
74
+ bad_done = true ;
108
75
}
109
- }
110
76
111
- setTimeout ( checkDone , 100 ) ;
112
- }
77
+ if ( idx < ( ( EXPECTED ) - 1 ) ) {
78
+ next ( ) ;
79
+ } else {
80
+ assert . done ( ) ;
81
+ }
82
+ } ) ;
83
+ } ) ;
113
84
} ) ;
114
85
}
115
86
0 commit comments