@@ -4604,6 +4604,7 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
46044604 Effect . gen ( function * ( ) {
46054605 const cwd = yield * makeTmpDir ( ) ;
46064606 const remote = yield * makeTmpDir ( "git-remote-" ) ;
4607+ const upstream = yield * makeTmpDir ( "git-upstream-" ) ;
46074608 yield * initRepoWithCommit ( cwd ) ;
46084609 const driver = yield * GitVcsDriver . GitVcsDriver ;
46094610 yield * git ( cwd , [ "branch" , "-M" , "main" ] ) ;
@@ -4613,7 +4614,14 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
46134614 yield * git ( cwd , [ "checkout" , "-b" , "dev" ] ) ;
46144615 yield * git ( cwd , [ "push" , "-u" , "origin" , "dev" ] ) ;
46154616 const devSha = yield * git ( cwd , [ "rev-parse" , "HEAD" ] ) ;
4616- yield * git ( cwd , [ "checkout" , "-b" , "feature/x" , "origin/dev" ] ) ;
4617+ yield * git ( upstream , [ "init" , "--bare" ] ) ;
4618+ yield * git ( cwd , [ "remote" , "add" , "upstream" , upstream ] ) ;
4619+ yield * writeTextFile ( cwd , "upstream.txt" , "upstream work\n" ) ;
4620+ yield * git ( cwd , [ "add" , "-A" ] ) ;
4621+ yield * driver . commit ( cwd , "Add upstream update" , "" ) ;
4622+ yield * git ( cwd , [ "push" , "upstream" , "dev" ] ) ;
4623+ const upstreamDevSha = yield * git ( cwd , [ "rev-parse" , "HEAD" ] ) ;
4624+ yield * git ( cwd , [ "checkout" , "-b" , "feature/x" , "upstream/dev" ] ) ;
46174625 yield * writeTextFile ( cwd , "feature.txt" , "feature\n" ) ;
46184626 yield * git ( cwd , [ "add" , "-A" ] ) ;
46194627 yield * driver . commit ( cwd , "Add feature" , "" ) ;
@@ -4631,11 +4639,19 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
46314639 "Add feature" ,
46324640 ) ;
46334641 assert . equal ( yield * git ( remote , [ "--git-dir=." , "rev-parse" , "dev" ] ) , devSha ) ;
4642+ assert . equal ( yield * git ( upstream , [ "--git-dir=." , "rev-parse" , "dev" ] ) , upstreamDevSha ) ;
46344643 assert . equal (
46354644 yield * git ( cwd , [ "rev-parse" , "--abbrev-ref" , "@{upstream}" ] ) ,
46364645 "origin/feature/x" ,
46374646 ) ;
46384647 assert . equal ( yield * driver . readConfigValue ( cwd , "branch.feature/x.gh-merge-base" ) , "dev" ) ;
4648+
4649+ const preview = yield * driver . getReviewDiffPreview ( { cwd } ) ;
4650+ const changes = preview . sources . find ( ( source ) => source . kind === "branch-range" ) ! ;
4651+ assert . deepStrictEqual ( changes . files , [
4652+ { path : "feature.txt" , previousPath : null , additions : 1 , deletions : 0 } ,
4653+ ] ) ;
4654+ assert . equal ( changes . baseRef , "upstream/dev" ) ;
46394655 } ) ,
46404656 ) ;
46414657
0 commit comments