@@ -433,38 +433,61 @@ it.effect("keeps a named project and reports why when Git cannot commit", () =>
433433 ) ,
434434) ;
435435
436- it . effect ( "keeps a folder that another project owns when the create conflicts" , ( ) =>
437- withScratch ( ( { baseDir } ) =>
438- withGitEnv (
439- TEST_IDENTITY ,
440- Effect . gen ( function * ( ) {
441- const folders = yield * ManagedProjectFolders . ManagedProjectFolders ;
442- const projects = yield * ProjectService . ProjectService ;
443- const fileSystem = yield * FileSystem . FileSystem ;
444- const path = yield * Path . Path ;
445- const taken = path . join ( folders . namedProjectsRoot , "taken" ) ;
446- yield * projects . create ( {
447- commandId : CommandId . make ( "command:owner" ) ,
448- projectId : ProjectId . make ( "project:owner" ) ,
449- title : "Owner" ,
450- workspaceRoot : taken ,
451- createWorkspaceRootIfMissing : true ,
452- } ) ;
453- yield * fileSystem . remove ( taken , { recursive : true } ) ;
454-
455- const failure = yield * Effect . flip ( folders . createNamedProject ( { name : "Taken" } ) ) ;
456-
457- assert . equal ( failure . _tag , "NamedProjectCreateError" ) ;
458- assert . equal ( failure . message , "Failed to create the project." ) ;
459- assert . isTrue ( yield * fileSystem . exists ( path . join ( taken , "README.md" ) ) ) ;
460- const owner = yield * projects . getByWorkspaceRoot ( taken ) ;
461- assert . equal ( Option . getOrThrow ( owner ) . id , ProjectId . make ( "project:owner" ) ) ;
462- assert . deepEqual ( yield * fileSystem . readDirectory ( path . resolve ( baseDir , "projects" ) ) , [
463- "taken" ,
464- ] ) ;
465- } ) ,
436+ it . effect . each ( [ false , true ] ) (
437+ "keeps a conflicted folder even if its owner was deleted: %s" ,
438+ ( deleted ) =>
439+ withScratch (
440+ ( { baseDir } ) =>
441+ withGitEnv (
442+ TEST_IDENTITY ,
443+ Effect . gen ( function * ( ) {
444+ const folders = yield * ManagedProjectFolders . ManagedProjectFolders ;
445+ const projects = yield * ProjectService . ProjectService ;
446+ const fileSystem = yield * FileSystem . FileSystem ;
447+ const path = yield * Path . Path ;
448+ const taken = path . join ( folders . namedProjectsRoot , "taken" ) ;
449+ yield * projects . create ( {
450+ commandId : CommandId . make ( "command:owner" ) ,
451+ projectId : ProjectId . make ( "project:owner" ) ,
452+ title : "Owner" ,
453+ workspaceRoot : taken ,
454+ createWorkspaceRootIfMissing : true ,
455+ } ) ;
456+ yield * fileSystem . remove ( taken , { recursive : true } ) ;
457+
458+ const failure = yield * Effect . flip ( folders . createNamedProject ( { name : "Taken" } ) ) ;
459+
460+ assert . equal ( failure . _tag , "NamedProjectCreateError" ) ;
461+ assert . equal ( failure . message , "Failed to create the project." ) ;
462+ assert . isTrue ( yield * fileSystem . exists ( path . join ( taken , "README.md" ) ) ) ;
463+ const owner = yield * projects . getByWorkspaceRoot ( taken ) ;
464+ if ( deleted ) assert . isTrue ( Option . isNone ( owner ) ) ;
465+ else assert . equal ( Option . getOrThrow ( owner ) . id , ProjectId . make ( "project:owner" ) ) ;
466+ assert . deepEqual ( yield * fileSystem . readDirectory ( path . resolve ( baseDir , "projects" ) ) , [
467+ "taken" ,
468+ ] ) ;
469+ } ) ,
470+ ) ,
471+ {
472+ projects : ( real ) =>
473+ ProjectService . ProjectService . of ( {
474+ ...real ,
475+ create : ( input ) =>
476+ real . create ( input ) . pipe (
477+ Effect . tapError ( ( error ) =>
478+ deleted && error . _tag === "ProjectConflictError"
479+ ? real
480+ . delete ( {
481+ commandId : CommandId . make ( "delete-conflicting-owner" ) ,
482+ projectId : error . conflictingProjectId ,
483+ } )
484+ . pipe ( Effect . asVoid )
485+ : Effect . void ,
486+ ) ,
487+ ) ,
488+ } ) ,
489+ } ,
466490 ) ,
467- ) ,
468491) ;
469492
470493it . effect ( "removes the folder when the project create is rejected for another reason" , ( ) =>
@@ -533,3 +556,46 @@ it.effect("removes the folder when the create is cancelled before the project ex
533556 ) ;
534557 } ) ,
535558) ;
559+
560+ it . effect ( "keeps a folder another project claims while scaffolding is cancelled" , ( ) =>
561+ Effect . gen ( function * ( ) {
562+ const scaffolding = yield * Deferred . make < void > ( ) ;
563+ yield * withScratch (
564+ ( ) =>
565+ Effect . gen ( function * ( ) {
566+ const folders = yield * ManagedProjectFolders . ManagedProjectFolders ;
567+ const projects = yield * ProjectService . ProjectService ;
568+ const fileSystem = yield * FileSystem . FileSystem ;
569+ const path = yield * Path . Path ;
570+ const workspaceRoot = path . join ( folders . namedProjectsRoot , "claimed" ) ;
571+ const fiber = yield * folders
572+ . createNamedProject ( { name : "Claimed" } )
573+ . pipe ( Effect . forkChild ) ;
574+ yield * Deferred . await ( scaffolding ) ;
575+ const owner = yield * projects . create ( {
576+ commandId : CommandId . make ( "command:claimed-owner" ) ,
577+ projectId : ProjectId . make ( "project:claimed-owner" ) ,
578+ title : "Claimed owner" ,
579+ workspaceRoot,
580+ } ) ;
581+ const ownerFile = path . join ( workspaceRoot , "owner.txt" ) ;
582+ yield * fileSystem . writeFileString ( ownerFile , "keep\n" ) ;
583+
584+ yield * Fiber . interrupt ( fiber ) ;
585+
586+ assert . isTrue ( yield * fileSystem . exists ( ownerFile ) ) ;
587+ assert . equal (
588+ Option . getOrThrow ( yield * projects . getByWorkspaceRoot ( workspaceRoot ) ) . id ,
589+ owner . id ,
590+ ) ;
591+ } ) ,
592+ {
593+ git : Layer . mock ( GitVcsDriver . GitVcsDriver ) ( {
594+ readConfigValue : ( ) => Effect . succeed ( null ) ,
595+ execute : ( ) =>
596+ Deferred . succeed ( scaffolding , undefined ) . pipe ( Effect . andThen ( Effect . never ) ) ,
597+ } ) ,
598+ } ,
599+ ) ;
600+ } ) ,
601+ ) ;
0 commit comments