@@ -46,11 +46,11 @@ public async Task BlakeServe_BakesBeforeServing()
4646
4747 // Act - Start serve command
4848 using var cts = new CancellationTokenSource ( TimeSpan . FromSeconds ( 20 ) ) ;
49- var result = await RunBlakeFromDotnetAsync ( "serve" , testDir , cancellationToken : cts . Token ) ;
49+ var result = await RunBlakeCommandAsync ( [ "serve" , testDir ] , cts . Token ) ;
5050
5151 // Assert
5252 // Should have attempted to bake first
53- Assert . Contains ( result . OutputText , o => o . Contains ( "Baking in:" ) ) ;
53+ Assert . Contains ( result . OutputText , o => o . Contains ( $ "Baking Blake site in: { testDir } ") ) ;
5454
5555 // Should have created generated content
5656 FileSystemHelper . AssertDirectoryExists ( Path . Combine ( testDir , ".generated" ) ) ;
@@ -79,7 +79,7 @@ public async Task BlakeServe_WithBakeFailure_DoesNotStartServer()
7979
8080 // Act
8181 using var cts = new CancellationTokenSource ( TimeSpan . FromSeconds ( 20 ) ) ;
82- var result = await RunBlakeFromDotnetAsync ( "serve" , testDir , cancellationToken : cts . Token ) ;
82+ var result = await RunBlakeCommandAsync ( [ "serve" , testDir ] , cts . Token ) ;
8383
8484 // Assert
8585 if ( result . ExitCode != 0 )
@@ -99,7 +99,7 @@ public async Task BlakeServe_WithValidProject_AttemptsToRunDotnetRun()
9999
100100 // Act
101101 using var cts = new CancellationTokenSource ( TimeSpan . FromSeconds ( 20 ) ) ;
102- var result = await RunBlakeFromDotnetAsync ( "serve" , testDir , cancellationToken : cts . Token ) ;
102+ var result = await RunBlakeCommandAsync ( [ "serve" , testDir ] , cts . Token ) ;
103103
104104 // Assert
105105 // Should attempt to run the app (even if it fails due to missing dependencies in test environment)
@@ -185,14 +185,14 @@ public async Task BlakeServe_WithMissingContentFolder_HandlesGracefully()
185185
186186 // Act
187187 using var cts = new CancellationTokenSource ( TimeSpan . FromSeconds ( 20 ) ) ;
188- var result = await RunBlakeFromDotnetAsync ( "serve" , testDir , cancellationToken : cts . Token ) ;
188+ var result = await RunBlakeCommandAsync ( [ "serve" , testDir ] , cts . Token ) ;
189189
190190 // Assert
191191 // Should handle missing content gracefully and still try to serve
192192 Assert . True ( ( result . Canceled . HasValue && result . Canceled . Value == true ) || result . ExitCode == 0 ) ;
193-
193+
194194 // Should still attempt baking
195- Assert . Contains ( result . OutputText , o => o . Contains ( "Baking in:" ) ) ;
195+ Assert . Contains ( result . OutputText , o => o . Contains ( $ "Baking Blake site in: { testDir } ") ) ;
196196 }
197197
198198 [ Fact ]
@@ -204,7 +204,7 @@ public async Task BlakeServe_CreatesGeneratedFolder()
204204
205205 // Act
206206 using var cts = new CancellationTokenSource ( TimeSpan . FromSeconds ( 20 ) ) ;
207- var result = await RunBlakeFromDotnetAsync ( "serve" , testDir , cancellationToken : cts . Token ) ;
207+ var result = await RunBlakeCommandAsync ( [ "serve" , testDir ] , cts . Token ) ;
208208
209209 // Assert
210210 // Should be cancelled
@@ -223,11 +223,11 @@ public async Task BlakeServe_UsesCurrentDirectoryWhenNoPathProvided()
223223
224224 // Act - Run blake serve without path argument from the project directory
225225 using var cts = new CancellationTokenSource ( TimeSpan . FromSeconds ( 20 ) ) ;
226- var result = await RunBlakeFromDotnetAsync ( "serve" , testDir , cancellationToken : cts . Token ) ;
226+ var result = await RunBlakeCommandAsync ( [ "serve" , testDir ] , cts . Token ) ;
227227
228228 // Assert
229229 Assert . True ( ( result . Canceled . HasValue && result . Canceled . Value == true ) || result . ExitCode == 0 ) ;
230- Assert . Contains ( result . OutputText , o => o . Contains ( "Baking in:" ) ) ;
230+ Assert . Contains ( result . OutputText , o => o . Contains ( $ "Baking Blake site in: { testDir } ") ) ;
231231
232232 // Should create .generated in the working directory
233233 FileSystemHelper . AssertDirectoryExists ( Path . Combine ( testDir , ".generated" ) ) ;
@@ -242,11 +242,11 @@ public async Task BlakeServe_ShowsProgressMessages()
242242
243243 // Act
244244 using var cts = new CancellationTokenSource ( TimeSpan . FromSeconds ( 20 ) ) ;
245- var result = await RunBlakeFromDotnetAsync ( "serve" , testDir , cancellationToken : cts . Token ) ;
245+ var result = await RunBlakeCommandAsync ( [ "serve" , testDir ] , cts . Token ) ;
246246
247247 // Assert
248248 // Should show baking progress
249- Assert . Contains ( result . OutputText , o => o . Contains ( "Baking in:" ) ) ;
249+ Assert . Contains ( result . OutputText , o => o . Contains ( $ "Baking Blake site in: { testDir } ") ) ;
250250
251251 // May show build completion or app startup messages
252252 Assert . Contains ( result . OutputText , o =>
@@ -280,7 +280,7 @@ public async Task BlakeServe_IntegrationWithBakeOptions()
280280
281281 // Act - Should not include drafts by default
282282 using var cts = new CancellationTokenSource ( TimeSpan . FromSeconds ( 20 ) ) ;
283- var result = await RunBlakeFromDotnetAsync ( "serve" , testDir , cancellationToken : cts . Token ) ;
283+ var result = await RunBlakeCommandAsync ( [ "serve" , testDir ] , cts . Token ) ;
284284
285285 // Assert
286286 // Should have baked (drafts excluded by default)
@@ -299,7 +299,7 @@ public async Task BlakeServe_HandlesProjectWithoutCsproj()
299299
300300 // Act
301301 using var cts = new CancellationTokenSource ( TimeSpan . FromSeconds ( 20 ) ) ;
302- var result = await RunBlakeFromDotnetAsync ( "serve" , testDir , cancellationToken : cts . Token ) ;
302+ var result = await RunBlakeCommandAsync ( [ "serve" , testDir ] , cts . Token ) ;
303303
304304 // Assert
305305 // Should either fail gracefully or handle the missing project file
@@ -313,6 +313,6 @@ public async Task BlakeServe_HandlesProjectWithoutCsproj()
313313 }
314314
315315 // Should still attempt to bake first
316- Assert . Contains ( result . OutputText , o => o . Contains ( "Baking in:" ) ) ;
316+ Assert . Contains ( result . OutputText , o => o . Contains ( $ "Baking Blake site in: { testDir } ") ) ;
317317 }
318318}
0 commit comments