@@ -114,11 +114,36 @@ promises.push(assert.rejects(
114
114
}
115
115
) ) ;
116
116
117
+ {
118
+ const handler = ( generated , actual , err ) => {
119
+ assert . strictEqual ( err . generatedMessage , generated ) ;
120
+ assert . strictEqual ( err . code , 'ERR_ASSERTION' ) ;
121
+ assert . strictEqual ( err . actual , actual ) ;
122
+ assert . strictEqual ( err . operator , 'rejects' ) ;
123
+ assert ( / r e j e c t s / . test ( err . stack ) ) ;
124
+ return true ;
125
+ } ;
126
+ const err = new Error ( ) ;
127
+ promises . push ( assert . rejects (
128
+ assert . rejects ( Promise . reject ( null ) , { code : 'FOO' } ) ,
129
+ handler . bind ( null , true , null )
130
+ ) ) ;
131
+ promises . push ( assert . rejects (
132
+ assert . rejects ( Promise . reject ( 5 ) , { code : 'FOO' } , 'AAAAA' ) ,
133
+ handler . bind ( null , false , 5 )
134
+ ) ) ;
135
+ promises . push ( assert . rejects (
136
+ assert . rejects ( Promise . reject ( err ) , { code : 'FOO' } , 'AAAAA' ) ,
137
+ handler . bind ( null , false , err )
138
+ ) ) ;
139
+ }
140
+
117
141
// Check `assert.doesNotReject`.
118
142
{
119
143
// `assert.doesNotReject` accepts a function or a promise
120
144
// or a thenable as first argument.
121
- const promise = assert . doesNotReject ( ( ) => new Map ( ) , common . mustNotCall ( ) ) ;
145
+ /* eslint-disable no-restricted-syntax */
146
+ let promise = assert . doesNotReject ( ( ) => new Map ( ) , common . mustNotCall ( ) ) ;
122
147
promises . push ( assert . rejects ( promise , {
123
148
message : 'Expected instance of Promise to be returned ' +
124
149
'from the "promiseFn" function but got instance of Map.' ,
@@ -149,9 +174,7 @@ promises.push(assert.rejects(
149
174
code : 'ERR_INVALID_RETURN_VALUE'
150
175
} )
151
176
) ;
152
- }
153
177
154
- {
155
178
const handler1 = ( err ) => {
156
179
assert ( err instanceof assert . AssertionError ,
157
180
`${ err . name } is not instance of AssertionError` ) ;
@@ -173,47 +196,24 @@ promises.push(assert.rejects(
173
196
174
197
const rejectingFn = async ( ) => assert . fail ( ) ;
175
198
176
- let promise = assert . doesNotReject ( rejectingFn , common . mustCall ( handler1 ) ) ;
199
+ promise = assert . doesNotReject ( rejectingFn , common . mustCall ( handler1 ) ) ;
177
200
promises . push ( assert . rejects ( promise , common . mustCall ( handler2 ) ) ) ;
178
201
179
202
promise = assert . doesNotReject ( rejectingFn ( ) , common . mustCall ( handler1 ) ) ;
180
203
promises . push ( assert . rejects ( promise , common . mustCall ( handler2 ) ) ) ;
181
204
182
205
promise = assert . doesNotReject ( ( ) => assert . fail ( ) , common . mustNotCall ( ) ) ;
183
206
promises . push ( assert . rejects ( promise , common . mustCall ( handler1 ) ) ) ;
184
- }
185
207
186
- promises . push ( assert . rejects (
187
- assert . doesNotReject ( 123 ) ,
188
- {
189
- code : 'ERR_INVALID_ARG_TYPE' ,
190
- message : 'The "promiseFn" argument must be one of type ' +
191
- 'Function or Promise. Received type number'
192
- }
193
- ) ) ;
194
-
195
- {
196
- const handler = ( generated , actual , err ) => {
197
- assert . strictEqual ( err . generatedMessage , generated ) ;
198
- assert . strictEqual ( err . code , 'ERR_ASSERTION' ) ;
199
- assert . strictEqual ( err . actual , actual ) ;
200
- assert . strictEqual ( err . operator , 'rejects' ) ;
201
- assert ( / r e j e c t s / . test ( err . stack ) ) ;
202
- return true ;
203
- } ;
204
- const err = new Error ( ) ;
205
208
promises . push ( assert . rejects (
206
- assert . rejects ( Promise . reject ( null ) , { code : 'FOO' } ) ,
207
- handler . bind ( null , true , null )
208
- ) ) ;
209
- promises . push ( assert . rejects (
210
- assert . rejects ( Promise . reject ( 5 ) , { code : 'FOO' } , 'AAAAA' ) ,
211
- handler . bind ( null , false , 5 )
212
- ) ) ;
213
- promises . push ( assert . rejects (
214
- assert . rejects ( Promise . reject ( err ) , { code : 'FOO' } , 'AAAAA' ) ,
215
- handler . bind ( null , false , err )
209
+ assert . doesNotReject ( 123 ) ,
210
+ {
211
+ code : 'ERR_INVALID_ARG_TYPE' ,
212
+ message : 'The "promiseFn" argument must be one of type ' +
213
+ 'Function or Promise. Received type number'
214
+ }
216
215
) ) ;
216
+ /* eslint-enable no-restricted-syntax */
217
217
}
218
218
219
219
// Make sure all async code gets properly executed.
0 commit comments