@@ -12,7 +12,7 @@ import {
1212 darwinVersion ,
1313 XCODE_SELECT_LINK_PATH ,
1414 xcodeVersionFromLink ,
15- xcodeVersionFromSdk ,
15+ xcodeSdkVersion ,
1616 xcodeVersionFromXcodeBuild ,
1717} from "./platform" ;
1818import {
@@ -298,7 +298,7 @@ test.serial(
298298) ;
299299
300300test . serial (
301- "xcodeVersionFromSdk returns undefined for non-zero exit code" ,
301+ "xcodeSdkVersion returns undefined for non-zero exit code" ,
302302 async ( t ) => {
303303 const logger = new RecordingLogger ( ) ;
304304
@@ -308,7 +308,7 @@ test.serial(
308308 const toolrunnerStub = sinon . stub ( toolrunner , "ToolRunner" ) . returns ( runner ) ;
309309
310310 await t . notThrowsAsync ( async ( ) => {
311- const result = await xcodeVersionFromSdk ( logger ) ;
311+ const result = await xcodeSdkVersion ( logger ) ;
312312
313313 t . is ( result , undefined ) ;
314314
@@ -325,41 +325,38 @@ test.serial(
325325 } ,
326326) ;
327327
328- test . serial (
329- "xcodeVersionFromSdk extracts version from xcrun stdout" ,
330- async ( t ) => {
331- const logger = new RecordingLogger ( ) ;
328+ test . serial ( "xcodeSdkVersion extracts version from xcrun stdout" , async ( t ) => {
329+ const logger = new RecordingLogger ( ) ;
332330
333- const which = sinon . stub ( io , "which" ) . resolves ( "/path/to/xcrun" ) ;
331+ const which = sinon . stub ( io , "which" ) . resolves ( "/path/to/xcrun" ) ;
334332
335- let stdoutListener : ( ( data : Buffer ) => void ) | undefined = undefined ;
336- const exec = sinon . stub < [ ] , Promise < number > > ( ) . callsFake ( async ( ) => {
337- if ( stdoutListener !== undefined ) {
338- stdoutListener ( Buffer . from ( "26.5" ) ) ;
339- }
340- return 0 ;
341- } ) ;
342- const runner = sinon . createStubInstance ( toolrunner . ToolRunner , { exec } ) ;
333+ let stdoutListener : ( ( data : Buffer ) => void ) | undefined = undefined ;
334+ const exec = sinon . stub < [ ] , Promise < number > > ( ) . callsFake ( async ( ) => {
335+ if ( stdoutListener !== undefined ) {
336+ stdoutListener ( Buffer . from ( "26.5" ) ) ;
337+ }
338+ return 0 ;
339+ } ) ;
340+ const runner = sinon . createStubInstance ( toolrunner . ToolRunner , { exec } ) ;
343341
344- const toolrunnerStub = sinon
345- . stub ( toolrunner , "ToolRunner" )
346- . callsFake ( ( _cmd , _args , opts : ExecOptions ) => {
347- stdoutListener = opts . listeners ?. stdout ;
348- return runner ;
349- } ) ;
342+ const toolrunnerStub = sinon
343+ . stub ( toolrunner , "ToolRunner" )
344+ . callsFake ( ( _cmd , _args , opts : ExecOptions ) => {
345+ stdoutListener = opts . listeners ?. stdout ;
346+ return runner ;
347+ } ) ;
350348
351- await t . notThrowsAsync ( async ( ) => {
352- const result = await xcodeVersionFromSdk ( logger ) ;
349+ await t . notThrowsAsync ( async ( ) => {
350+ const result = await xcodeSdkVersion ( logger ) ;
353351
354- t . not ( result , undefined ) ;
355- t . is ( result ?. major , 26 ) ;
356- t . is ( result ?. minor , 5 ) ;
352+ t . not ( result , undefined ) ;
353+ t . is ( result ?. major , 26 ) ;
354+ t . is ( result ?. minor , 5 ) ;
357355
358- t . is ( which . callCount , 1 ) ;
359- t . deepEqual ( which . args [ 0 ] , [ "xcrun" , true ] ) ;
356+ t . is ( which . callCount , 1 ) ;
357+ t . deepEqual ( which . args [ 0 ] , [ "xcrun" , true ] ) ;
360358
361- t . is ( toolrunnerStub . callCount , 1 ) ;
362- t . is ( exec . callCount , 1 ) ;
363- } ) ;
364- } ,
365- ) ;
359+ t . is ( toolrunnerStub . callCount , 1 ) ;
360+ t . is ( exec . callCount , 1 ) ;
361+ } ) ;
362+ } ) ;
0 commit comments