@@ -195,22 +195,19 @@ describe("Options", () => {
195195 expect ( typeof generator ) . toBe ( "function" ) ;
196196 } ) ;
197197
198- it ( "should include task hub name in metadata" , ( done ) => {
198+ it ( "should include task hub name in metadata" , async ( ) => {
199199 const options = new DurableTaskAzureManagedClientOptions ( )
200200 . setEndpointAddress ( VALID_ENDPOINT )
201201 . setTaskHubName ( VALID_TASKHUB ) ;
202202
203203 const generator = options . createMetadataGenerator ( ) ;
204204
205- generator ( { service_url : "https://example.com" } , ( error , metadata ) => {
206- expect ( error ) . toBeNull ( ) ;
207- expect ( metadata ) . toBeDefined ( ) ;
208- expect ( metadata ?. get ( "taskhub" ) ) . toContain ( VALID_TASKHUB ) ;
209- done ( ) ;
210- } ) ;
205+ const metadata = await generator ( ) ;
206+ expect ( metadata ) . toBeDefined ( ) ;
207+ expect ( metadata ?. get ( "taskhub" ) ) . toContain ( VALID_TASKHUB ) ;
211208 } ) ;
212209
213- it ( "should include authorization header when credential is set" , ( done ) => {
210+ it ( "should include authorization header when credential is set" , async ( ) => {
214211 const mockCredential = new MockTokenCredential ( ) ;
215212 const options = new DurableTaskAzureManagedClientOptions ( )
216213 . setEndpointAddress ( VALID_ENDPOINT )
@@ -219,30 +216,24 @@ describe("Options", () => {
219216
220217 const generator = options . createMetadataGenerator ( ) ;
221218
222- generator ( { service_url : "https://example.com" } , ( error , metadata ) => {
223- expect ( error ) . toBeNull ( ) ;
224- expect ( metadata ) . toBeDefined ( ) ;
225- const authHeader = metadata ?. get ( "Authorization" ) ;
226- expect ( authHeader ) . toBeDefined ( ) ;
227- expect ( authHeader ?. [ 0 ] ) . toContain ( "Bearer" ) ;
228- done ( ) ;
229- } ) ;
219+ const metadata = await generator ( ) ;
220+ expect ( metadata ) . toBeDefined ( ) ;
221+ const authHeader = metadata ?. get ( "Authorization" ) ;
222+ expect ( authHeader ) . toBeDefined ( ) ;
223+ expect ( authHeader ?. [ 0 ] ) . toContain ( "Bearer" ) ;
230224 } ) ;
231225
232- it ( "should NOT include workerid header in metadata (client only)" , ( done ) => {
226+ it ( "should NOT include workerid header in metadata (client only)" , async ( ) => {
233227 const options = new DurableTaskAzureManagedClientOptions ( )
234228 . setEndpointAddress ( VALID_ENDPOINT )
235229 . setTaskHubName ( VALID_TASKHUB ) ;
236230
237231 const generator = options . createMetadataGenerator ( ) ;
238232
239- generator ( { service_url : "https://example.com" } , ( error , metadata ) => {
240- expect ( error ) . toBeNull ( ) ;
241- expect ( metadata ) . toBeDefined ( ) ;
242- // Client should NOT have workerid header
243- expect ( metadata ?. get ( "workerid" ) ) . toEqual ( [ ] ) ;
244- done ( ) ;
245- } ) ;
233+ const metadata = await generator ( ) ;
234+ expect ( metadata ) . toBeDefined ( ) ;
235+ // Client should NOT have workerid header
236+ expect ( metadata ?. get ( "workerid" ) ) . toEqual ( [ ] ) ;
246237 } ) ;
247238 } ) ;
248239 } ) ;
@@ -284,37 +275,31 @@ describe("Options", () => {
284275 } ) ;
285276
286277 describe ( "createMetadataGenerator" , ( ) => {
287- it ( "should include workerid header in metadata" , ( done ) => {
278+ it ( "should include workerid header in metadata" , async ( ) => {
288279 const options = new DurableTaskAzureManagedWorkerOptions ( )
289280 . setEndpointAddress ( VALID_ENDPOINT )
290281 . setTaskHubName ( VALID_TASKHUB )
291282 . setWorkerId ( "test-worker" ) ;
292283
293284 const generator = options . createMetadataGenerator ( ) ;
294285
295- generator ( { service_url : "https://example.com" } , ( error , metadata ) => {
296- expect ( error ) . toBeNull ( ) ;
297- expect ( metadata ) . toBeDefined ( ) ;
298- expect ( metadata ?. get ( "workerid" ) ) . toContain ( "test-worker" ) ;
299- done ( ) ;
300- } ) ;
286+ const metadata = await generator ( ) ;
287+ expect ( metadata ) . toBeDefined ( ) ;
288+ expect ( metadata ?. get ( "workerid" ) ) . toContain ( "test-worker" ) ;
301289 } ) ;
302290
303- it ( "should include x-user-agent header with DurableTaskWorker" , ( done ) => {
291+ it ( "should include x-user-agent header with DurableTaskWorker" , async ( ) => {
304292 const options = new DurableTaskAzureManagedWorkerOptions ( )
305293 . setEndpointAddress ( VALID_ENDPOINT )
306294 . setTaskHubName ( VALID_TASKHUB ) ;
307295
308296 const generator = options . createMetadataGenerator ( ) ;
309297
310- generator ( { service_url : "https://example.com" } , ( error , metadata ) => {
311- expect ( error ) . toBeNull ( ) ;
312- expect ( metadata ) . toBeDefined ( ) ;
313- const userAgentHeader = metadata ?. get ( "x-user-agent" ) ;
314- expect ( userAgentHeader ) . toBeDefined ( ) ;
315- expect ( userAgentHeader ?. [ 0 ] ) . toContain ( "DurableTaskWorker" ) ;
316- done ( ) ;
317- } ) ;
298+ const metadata = await generator ( ) ;
299+ expect ( metadata ) . toBeDefined ( ) ;
300+ const userAgentHeader = metadata ?. get ( "x-user-agent" ) ;
301+ expect ( userAgentHeader ) . toBeDefined ( ) ;
302+ expect ( userAgentHeader ?. [ 0 ] ) . toContain ( "DurableTaskWorker" ) ;
318303 } ) ;
319304 } ) ;
320305 } ) ;
0 commit comments