@@ -11,6 +11,8 @@ import {
1111 normalizeGitRemoteUrl ,
1212 parseGitHubRepositoryNameWithOwnerFromRemoteUrl ,
1313 parseOriginUrlFromGitConfig ,
14+ resolveAutoFeatureBranchName ,
15+ sanitizeFeatureBranchName ,
1416 WORKTREE_BRANCH_PREFIX ,
1517} from "./git.ts" ;
1618
@@ -294,6 +296,59 @@ describe("applyGitStatusStreamEvent", () => {
294296 } ) ;
295297} ) ;
296298
299+ describe ( "sanitizeFeatureBranchName" , ( ) => {
300+ it . each ( [ "feature" , "fix" , "team/jules" ] ) ( "preserves the %s namespace" , ( namespace ) => {
301+ expect ( sanitizeFeatureBranchName ( `${ namespace } /refine-toolbar` ) ) . toBe (
302+ `${ namespace } /refine-toolbar` ,
303+ ) ;
304+ } ) ;
305+
306+ it ( "sanitizes an explicit namespace before preserving it" , ( ) => {
307+ expect ( sanitizeFeatureBranchName ( ' "FIX//Calendar recruitment filter" ' ) ) . toBe (
308+ "fix/calendar-recruitment-filter" ,
309+ ) ;
310+ } ) ;
311+
312+ it . each ( [
313+ [ "refine toolbar" , "feature/refine-toolbar" ] ,
314+ [ "" , "feature/update" ] ,
315+ [ " /?. / " , "feature/update" ] ,
316+ [ "fix///" , "feature/fix" ] ,
317+ ] ) ( "keeps the fallback for unprefixed input %s" , ( input , expected ) => {
318+ expect ( sanitizeFeatureBranchName ( input ) ) . toBe ( expected ) ;
319+ } ) ;
320+
321+ it ( "keeps the existing length limit for namespaced branches" , ( ) => {
322+ expect ( sanitizeFeatureBranchName ( `fix/${ "x" . repeat ( 80 ) } ` ) ) . toBe ( `fix/${ "x" . repeat ( 60 ) } ` ) ;
323+ } ) ;
324+ } ) ;
325+
326+ describe ( "resolveAutoFeatureBranchName" , ( ) => {
327+ it ( "resolves case-insensitive collisions within the generated namespace" , ( ) => {
328+ expect (
329+ resolveAutoFeatureBranchName (
330+ [ "FIX/refine-toolbar" , "fix/refine-toolbar-2" ] ,
331+ "fix/refine-toolbar" ,
332+ ) ,
333+ ) . toBe ( "fix/refine-toolbar-3" ) ;
334+ } ) ;
335+
336+ it ( "keeps the fallback when no preferred branch is supplied" , ( ) => {
337+ expect ( resolveAutoFeatureBranchName ( [ "feature/update" ] ) ) . toBe ( "feature/update-2" ) ;
338+ } ) ;
339+
340+ it . each ( [
341+ [ "fix/name" , [ "fix" ] , "fix-2/name" ] ,
342+ [ "team/jules/fix/name" , [ "team/jules" ] , "team/jules-2/fix/name" ] ,
343+ [ "fix/name" , [ "fix/name/child" ] , "fix/name-2" ] ,
344+ [ "FIX/name" , [ "FIX" , "FIX-2" ] , "fix-3/name" ] ,
345+ [ "fix/name" , [ "fixes" , "fix/name-extra/child" ] , "fix/name" ] ,
346+ [ undefined , [ "feature" , "feature-2" ] , "feature-3/update" ] ,
347+ ] ) ( "resolves %s against namespace blockers %j" , ( preferredBranch , existingNames , expected ) => {
348+ expect ( resolveAutoFeatureBranchName ( existingNames , preferredBranch ) ) . toBe ( expected ) ;
349+ } ) ;
350+ } ) ;
351+
297352describe ( "formatGeneratedBranchName" , ( ) => {
298353 it . each ( [ "t3code" , "t3code/" ] ) ( "joins static prefix %s with one slash" , ( prefix ) => {
299354 expect (
0 commit comments