@@ -4822,6 +4822,101 @@ it.layer(layerGitManagerTest)("GitManager", (it) => {
48224822 } ) ,
48234823 ) ;
48244824
4825+ it . effect . each ( [ "commit" , "short-commit" , "tag" , "revision" ] as const ) (
4826+ "creates a PR against the default branch with a legacy %s base setting" ,
4827+ ( kind ) =>
4828+ Effect . gen ( function * ( ) {
4829+ const repoDir = yield * makeTempDir ( "t3code-git-manager-" ) ;
4830+ yield * initRepo ( repoDir ) ;
4831+ yield * runGit ( repoDir , [ "branch" , "-m" , "main" , "trunk" ] ) ;
4832+ const remoteDir = yield * createBareRemote ( ) ;
4833+ yield * runGit ( repoDir , [ "remote" , "add" , "origin" , remoteDir ] ) ;
4834+ yield * runGit ( repoDir , [ "push" , "-u" , "origin" , "trunk" ] ) ;
4835+ yield * runGit ( repoDir , [ "checkout" , "-b" , "feature/legacy-base" ] ) ;
4836+ NodeFS . writeFileSync ( NodePath . join ( repoDir , "feature.txt" ) , "feature\n" ) ;
4837+ yield * runGit ( repoDir , [ "add" , "feature.txt" ] ) ;
4838+ yield * runGit ( repoDir , [ "commit" , "-m" , "Feature commit" ] ) ;
4839+ const commit = ( yield * runGit ( repoDir , [ "rev-parse" , "HEAD" ] ) ) . stdout . trim ( ) ;
4840+ yield * runGit ( repoDir , [ "tag" , "v1" ] ) ;
4841+ const baseRef =
4842+ kind === "commit"
4843+ ? commit
4844+ : kind === "short-commit"
4845+ ? commit . slice ( 0 , 12 )
4846+ : kind === "tag"
4847+ ? "v1"
4848+ : "HEAD~0" ;
4849+ yield * runGit ( repoDir , [ "config" , "branch.feature/legacy-base.gh-merge-base" , baseRef ] ) ;
4850+ yield * runGit ( repoDir , [ "push" , "-u" , "origin" , "feature/legacy-base" ] ) ;
4851+ let generatedBase = "" ;
4852+ let generatedSummary = "" ;
4853+ const { manager, ghCalls } = yield * makeManager ( {
4854+ ghScenario : { defaultBranch : "trunk" , prListSequence : [ "[]" , "[]" ] } ,
4855+ textGeneration : {
4856+ generatePrContent : ( input ) => {
4857+ generatedBase = input . baseBranch ;
4858+ generatedSummary = input . commitSummary ;
4859+ return Effect . succeed ( { title : "Feature PR" , body : "Feature body" } ) ;
4860+ } ,
4861+ } ,
4862+ } ) ;
4863+
4864+ const result = yield * runStackedAction ( manager , { cwd : repoDir , action : "create_pr" } ) ;
4865+
4866+ expect ( result . pr . status ) . toBe ( "created" ) ;
4867+ expect ( generatedBase ) . toBe ( "trunk" ) ;
4868+ expect ( generatedSummary ) . toContain ( "Feature commit" ) ;
4869+ expect (
4870+ ghCalls . some ( ( call ) =>
4871+ call . includes ( "pr create --base trunk --head feature/legacy-base" ) ,
4872+ ) ,
4873+ ) . toBe ( true ) ;
4874+ } ) ,
4875+ ) ;
4876+
4877+ it . effect . each ( [
4878+ "release/v2" ,
4879+ "refs/heads/release/v2" ,
4880+ "origin/release/v2" ,
4881+ "deadbeef" ,
4882+ "remote-only" ,
4883+ ] ) ( "preserves the configured PR target branch %s" , ( baseRef ) =>
4884+ Effect . gen ( function * ( ) {
4885+ const repoDir = yield * makeTempDir ( "t3code-git-manager-" ) ;
4886+ yield * initRepo ( repoDir ) ;
4887+ const baseBranch = baseRef === "deadbeef" ? baseRef : "release/v2" ;
4888+ const remoteDir = yield * createBareRemote ( ) ;
4889+ yield * runGit ( repoDir , [ "remote" , "add" , "origin" , remoteDir ] ) ;
4890+ yield * runGit ( repoDir , [ "checkout" , "-b" , baseBranch ] ) ;
4891+ yield * runGit ( repoDir , [ "push" , "-u" , "origin" , baseBranch ] ) ;
4892+ yield * runGit ( repoDir , [ "checkout" , "-b" , "feature/configured-base" ] ) ;
4893+ if ( baseRef === "remote-only" ) {
4894+ yield * runGit ( repoDir , [ "branch" , "-D" , baseBranch ] ) ;
4895+ }
4896+ NodeFS . writeFileSync ( NodePath . join ( repoDir , "feature.txt" ) , "feature\n" ) ;
4897+ yield * runGit ( repoDir , [ "add" , "feature.txt" ] ) ;
4898+ yield * runGit ( repoDir , [ "commit" , "-m" , "Feature commit" ] ) ;
4899+ yield * runGit ( repoDir , [ "push" , "-u" , "origin" , "feature/configured-base" ] ) ;
4900+ yield * runGit ( repoDir , [
4901+ "config" ,
4902+ "branch.feature/configured-base.gh-merge-base" ,
4903+ baseRef === "remote-only" ? baseBranch : baseRef ,
4904+ ] ) ;
4905+ const { manager, ghCalls } = yield * makeManager ( {
4906+ ghScenario : { prListSequence : [ "[]" , "[]" ] } ,
4907+ } ) ;
4908+
4909+ const result = yield * runStackedAction ( manager , { cwd : repoDir , action : "create_pr" } ) ;
4910+
4911+ expect ( result . pr . status ) . toBe ( "created" ) ;
4912+ expect (
4913+ ghCalls . some ( ( call ) =>
4914+ call . includes ( `pr create --base ${ baseBranch } --head feature/configured-base` ) ,
4915+ ) ,
4916+ ) . toBe ( true ) ;
4917+ } ) ,
4918+ ) ;
4919+
48254920 it . effect ( "generates PR content from branch changes when the remote base advances" , ( ) =>
48264921 Effect . gen ( function * ( ) {
48274922 const repoDir = yield * makeTempDir ( "t3code-git-manager-" ) ;
0 commit comments