@@ -74,53 +74,32 @@ test("darwinVersion returns semver if parsing succeeds", (t) => {
7474test . serial ( "xcodeVersion returns undefined if symlink doesn't exist" , ( t ) => {
7575 const logger = new RecordingLogger ( ) ;
7676
77- const lstatSync = sinon . stub ( fs , "lstatSync" ) . returns ( undefined ) ;
78-
79- t . is ( xcodeVersion ( logger ) , undefined ) ;
80- t . is ( lstatSync . callCount , 1 ) ;
81- t . deepEqual ( lstatSync . args [ 0 ] , [
82- XCODE_SELECT_LINK_PATH ,
83- { throwIfNoEntry : false } ,
84- ] ) ;
85-
86- checkExpectedLogMessages ( t , logger . messages , [
87- "'/private/var/db/xcode_select_link' does not exist" ,
88- ] ) ;
89- } ) ;
90-
91- test . serial ( "xcodeVersion returns undefined if lstatSync throws" , ( t ) => {
92- const logger = new RecordingLogger ( ) ;
93-
94- const lstatSync = sinon . stub ( fs , "lstatSync" ) . throws ( new Error ( "ENOENT" ) ) ;
77+ const readlinkSync = sinon
78+ . stub ( fs , "readlinkSync" )
79+ . throws ( new Error ( "ENOENT: no such file or directory" ) ) ;
9580
9681 t . is ( xcodeVersion ( logger ) , undefined ) ;
97- t . is ( lstatSync . callCount , 1 ) ;
98- t . deepEqual ( lstatSync . args [ 0 ] , [
99- XCODE_SELECT_LINK_PATH ,
100- { throwIfNoEntry : false } ,
101- ] ) ;
82+ t . is ( readlinkSync . callCount , 1 ) ;
83+ t . deepEqual ( readlinkSync . args [ 0 ] , [ XCODE_SELECT_LINK_PATH ] ) ;
10284
10385 checkExpectedLogMessages ( t , logger . messages , [
104- "Unable to determine Xcode version: ENOENT" ,
86+ "Unable to determine Xcode version: ENOENT: no such file or directory " ,
10587 ] ) ;
10688} ) ;
10789
10890test . serial ( "xcodeVersion returns undefined if file is not a symlink" , ( t ) => {
10991 const logger = new RecordingLogger ( ) ;
11092
111- const lstatSync = sinon
112- . stub ( fs , "lstatSync " )
113- . returns ( { isSymbolicLink : ( ) => false } as fs . Stats ) ;
93+ const readlinkSync = sinon
94+ . stub ( fs , "readlinkSync " )
95+ . throws ( new Error ( "EINVAL: invalid argument" ) ) ;
11496
11597 t . is ( xcodeVersion ( logger ) , undefined ) ;
116- t . is ( lstatSync . callCount , 1 ) ;
117- t . deepEqual ( lstatSync . args [ 0 ] , [
118- XCODE_SELECT_LINK_PATH ,
119- { throwIfNoEntry : false } ,
120- ] ) ;
98+ t . is ( readlinkSync . callCount , 1 ) ;
99+ t . deepEqual ( readlinkSync . args [ 0 ] , [ XCODE_SELECT_LINK_PATH ] ) ;
121100
122101 checkExpectedLogMessages ( t , logger . messages , [
123- "exists, but is not a symbolic link " ,
102+ "Unable to determine Xcode version: EINVAL: invalid argument " ,
124103 ] ) ;
125104} ) ;
126105
@@ -129,17 +108,9 @@ test.serial(
129108 ( t ) => {
130109 const logger = new RecordingLogger ( ) ;
131110
132- const lstatSync = sinon
133- . stub ( fs , "lstatSync" )
134- . returns ( { isSymbolicLink : ( ) => true } as fs . Stats ) ;
135111 const readlinkSync = sinon . stub ( fs , "readlinkSync" ) . returns ( "" ) ;
136112
137113 t . is ( xcodeVersion ( logger ) , undefined ) ;
138- t . is ( lstatSync . callCount , 1 ) ;
139- t . deepEqual ( lstatSync . args [ 0 ] , [
140- XCODE_SELECT_LINK_PATH ,
141- { throwIfNoEntry : false } ,
142- ] ) ;
143114 t . is ( readlinkSync . callCount , 1 ) ;
144115 t . deepEqual ( readlinkSync . args [ 0 ] , [ XCODE_SELECT_LINK_PATH ] ) ;
145116
@@ -154,19 +125,11 @@ test.serial(
154125 ( t ) => {
155126 const logger = new RecordingLogger ( ) ;
156127
157- const lstatSync = sinon
158- . stub ( fs , "lstatSync" )
159- . returns ( { isSymbolicLink : ( ) => true } as fs . Stats ) ;
160128 const readlinkSync = sinon
161129 . stub ( fs , "readlinkSync" )
162130 . returns ( "/Applications/Xcode.app/Contents/Developer" ) ;
163131
164132 t . is ( xcodeVersion ( logger ) , undefined ) ;
165- t . is ( lstatSync . callCount , 1 ) ;
166- t . deepEqual ( lstatSync . args [ 0 ] , [
167- XCODE_SELECT_LINK_PATH ,
168- { throwIfNoEntry : false } ,
169- ] ) ;
170133 t . is ( readlinkSync . callCount , 1 ) ;
171134 t . deepEqual ( readlinkSync . args [ 0 ] , [ XCODE_SELECT_LINK_PATH ] ) ;
172135
@@ -179,19 +142,11 @@ test.serial(
179142test . serial ( "xcodeVersion returns undefined if match can't be parsed" , ( t ) => {
180143 const logger = new RecordingLogger ( ) ;
181144
182- const lstatSync = sinon
183- . stub ( fs , "lstatSync" )
184- . returns ( { isSymbolicLink : ( ) => true } as fs . Stats ) ;
185145 const readlinkSync = sinon
186146 . stub ( fs , "readlinkSync" )
187147 . returns ( "/Applications/Xcode_00.0.app/Contents/Developer" ) ;
188148
189149 t . is ( xcodeVersion ( logger ) , undefined ) ;
190- t . is ( lstatSync . callCount , 1 ) ;
191- t . deepEqual ( lstatSync . args [ 0 ] , [
192- XCODE_SELECT_LINK_PATH ,
193- { throwIfNoEntry : false } ,
194- ] ) ;
195150 t . is ( readlinkSync . callCount , 1 ) ;
196151 t . deepEqual ( readlinkSync . args [ 0 ] , [ XCODE_SELECT_LINK_PATH ] ) ;
197152
@@ -203,9 +158,6 @@ test.serial("xcodeVersion returns undefined if match can't be parsed", (t) => {
203158test . serial ( "xcodeVersion returns version from resolved path" , ( t ) => {
204159 const logger = new RecordingLogger ( ) ;
205160
206- const lstatSync = sinon
207- . stub ( fs , "lstatSync" )
208- . returns ( { isSymbolicLink : ( ) => true } as fs . Stats ) ;
209161 const readlinkSync = sinon
210162 . stub ( fs , "readlinkSync" )
211163 . returns ( "/Applications/Xcode_16.4.app/Contents/Developer" ) ;
@@ -217,21 +169,13 @@ test.serial("xcodeVersion returns version from resolved path", (t) => {
217169 t . is ( result . minor , 4 ) ;
218170 }
219171
220- t . is ( lstatSync . callCount , 1 ) ;
221- t . deepEqual ( lstatSync . args [ 0 ] , [
222- XCODE_SELECT_LINK_PATH ,
223- { throwIfNoEntry : false } ,
224- ] ) ;
225172 t . is ( readlinkSync . callCount , 1 ) ;
226173 t . deepEqual ( readlinkSync . args [ 0 ] , [ XCODE_SELECT_LINK_PATH ] ) ;
227174} ) ;
228175
229176test . serial ( "xcodeVersion returns major version from resolved path" , ( t ) => {
230177 const logger = new RecordingLogger ( ) ;
231178
232- const lstatSync = sinon
233- . stub ( fs , "lstatSync" )
234- . returns ( { isSymbolicLink : ( ) => true } as fs . Stats ) ;
235179 const readlinkSync = sinon
236180 . stub ( fs , "readlinkSync" )
237181 . returns ( "/Applications/Xcode_16.app/Contents/Developer" ) ;
@@ -243,11 +187,6 @@ test.serial("xcodeVersion returns major version from resolved path", (t) => {
243187 t . is ( result . minor , 0 ) ;
244188 }
245189
246- t . is ( lstatSync . callCount , 1 ) ;
247- t . deepEqual ( lstatSync . args [ 0 ] , [
248- XCODE_SELECT_LINK_PATH ,
249- { throwIfNoEntry : false } ,
250- ] ) ;
251190 t . is ( readlinkSync . callCount , 1 ) ;
252191 t . deepEqual ( readlinkSync . args [ 0 ] , [ XCODE_SELECT_LINK_PATH ] ) ;
253192} ) ;
@@ -257,9 +196,6 @@ test.serial(
257196 ( t ) => {
258197 const logger = new RecordingLogger ( ) ;
259198
260- const lstatSync = sinon
261- . stub ( fs , "lstatSync" )
262- . returns ( { isSymbolicLink : ( ) => true } as fs . Stats ) ;
263199 const readlinkSync = sinon
264200 . stub ( fs , "readlinkSync" )
265201 . returns ( "/Applications/Xcode_16.5.9.app/Contents/Developer" ) ;
@@ -271,11 +207,6 @@ test.serial(
271207 t . is ( result . minor , 5 ) ;
272208 }
273209
274- t . is ( lstatSync . callCount , 1 ) ;
275- t . deepEqual ( lstatSync . args [ 0 ] , [
276- XCODE_SELECT_LINK_PATH ,
277- { throwIfNoEntry : false } ,
278- ] ) ;
279210 t . is ( readlinkSync . callCount , 1 ) ;
280211 t . deepEqual ( readlinkSync . args [ 0 ] , [ XCODE_SELECT_LINK_PATH ] ) ;
281212 } ,
0 commit comments