@@ -2974,23 +2974,67 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
29742974 const cwd = yield * makeTmpDir ( ) ;
29752975 const remote = yield * makeTmpDir ( "git-remote-" ) ;
29762976 const { initialBranch } = yield * initRepoWithCommit ( cwd ) ;
2977- const driver = yield * GitVcsDriver . GitVcsDriver ;
2977+ const delegate = yield * ChildProcessSpawner . ChildProcessSpawner ;
2978+ const commands : Array < ReadonlyArray < string > > = [ ] ;
2979+ const spawner = ChildProcessSpawner . make ( ( command ) =>
2980+ Effect . gen ( function * ( ) {
2981+ if ( ChildProcess . isStandardCommand ( command ) ) commands . push ( command . args ) ;
2982+ return yield * delegate . spawn ( command ) ;
2983+ } ) ,
2984+ ) ;
2985+ const driver = yield * makeGitVcsDriverCore ( ) . pipe (
2986+ Effect . provideService ( ChildProcessSpawner . ChildProcessSpawner , spawner ) ,
2987+ Effect . provide ( layerServerConfig ) ,
2988+ ) ;
2989+ const assertCheckout = (
2990+ checkoutArgs : ReadonlyArray < string > ,
2991+ existenceReads : number ,
2992+ trackingReads : number ,
2993+ ) => {
2994+ assert . deepEqual (
2995+ commands . filter ( ( args ) => args [ 0 ] === "checkout" ) ,
2996+ [ checkoutArgs ] ,
2997+ ) ;
2998+ assert . equal ( commands . filter ( ( args ) => args [ 0 ] === "show-ref" ) . length , existenceReads ) ;
2999+ assert . equal ( commands . filter ( ( args ) => args [ 0 ] === "for-each-ref" ) . length , trackingReads ) ;
3000+ assert . deepEqual (
3001+ commands . filter ( ( args ) => args [ 0 ] === "branch" ) ,
3002+ [ [ "branch" , "--show-current" ] ] ,
3003+ ) ;
3004+ } ;
29783005 yield * git ( remote , [ "init" , "--bare" ] ) ;
29793006 yield * git ( cwd , [ "remote" , "add" , "origin" , remote ] ) ;
29803007 yield * git ( cwd , [ "push" , "origin" , "HEAD:refs/heads/remote-only" ] ) ;
29813008
29823009 for ( let attempt = 0 ; attempt < 2 ; attempt += 1 ) {
3010+ commands . length = 0 ;
29833011 const result = yield * driver . switchRef ( { cwd, refName : "origin/remote-only" } ) ;
2984- assert . equal ( result . refName , "remote-only" ) ;
3012+ assert . equal ( result . refName , attempt === 0 ? "remote-only" : "review/renamed" ) ;
3013+ assertCheckout (
3014+ attempt === 0
3015+ ? [ "checkout" , "--track" , "origin/remote-only" , "--" ]
3016+ : [ "checkout" , "review/renamed" , "--" ] ,
3017+ attempt === 0 ? 3 : 2 ,
3018+ 1 ,
3019+ ) ;
29853020 assert . equal (
29863021 yield * git ( cwd , [ "rev-parse" , "--abbrev-ref" , "@{upstream}" ] ) ,
29873022 "origin/remote-only" ,
29883023 ) ;
3024+ if ( attempt === 0 ) yield * git ( cwd , [ "branch" , "-m" , "review/renamed" ] ) ;
29893025 yield * driver . switchRef ( { cwd, refName : initialBranch } ) ;
29903026 }
3027+ yield * git ( cwd , [ "branch" , "origin/remote-only" ] ) ;
3028+ commands . length = 0 ;
3029+ const shadowed = yield * driver . switchRef ( { cwd, refName : "origin/remote-only" } ) ;
3030+ assert . equal ( shadowed . refName , "origin/remote-only" ) ;
3031+ assertCheckout ( [ "checkout" , "origin/remote-only" , "--" ] , 2 , 0 ) ;
3032+
29913033 const commit = yield * git ( cwd , [ "rev-parse" , "HEAD" ] ) ;
3034+ commands . length = 0 ;
29923035 const detached = yield * driver . switchRef ( { cwd, refName : commit } ) ;
29933036 assert . equal ( detached . refName , null ) ;
3037+ assertCheckout ( [ "checkout" , commit , "--" ] , 2 , 0 ) ;
29943038 assert . equal ( yield * git ( cwd , [ "rev-parse" , "HEAD" ] ) , commit ) ;
29953039 } ) ,
29963040 ) ;
0 commit comments