@@ -28,9 +28,22 @@ const TEMPLATE_DIRECTORIES = [
2828 "docs/PULL_REQUEST_TEMPLATE" ,
2929] as const ;
3030
31- const GITLAB_TEMPLATE_PATHS = [
32- ".gitlab/merge_request_templates/Default.md" ,
33- ".gitlab/merge_request_templates/default.md" ,
31+ const GITLAB_DEFAULT_TEMPLATE_NAMES = [
32+ "Default.md" ,
33+ "default.md" ,
34+ "DEFAULT.MD" ,
35+ "Default.MD" ,
36+ ] as const ;
37+
38+ const AZURE_DEVOPS_TEMPLATE_PATHS = [
39+ ".azuredevops/pull_request_template.md" ,
40+ ".azuredevops/pull_request_template.txt" ,
41+ ".vsts/pull_request_template.md" ,
42+ ".vsts/pull_request_template.txt" ,
43+ "docs/pull_request_template.md" ,
44+ "docs/pull_request_template.txt" ,
45+ "pull_request_template.md" ,
46+ "pull_request_template.txt" ,
3447] as const ;
3548
3649const PrTemplateDetectionTestLayer = GitVcsDriver . layer . pipe (
@@ -150,29 +163,71 @@ it.effect.each(TEMPLATE_DIRECTORIES)("recognizes the $0 directory", (relativeDir
150163 ) ,
151164) ;
152165
153- it . effect . each ( GITLAB_TEMPLATE_PATHS ) (
154- "recognizes the GitLab merge request template at $0" ,
166+ it . effect . each ( GITLAB_DEFAULT_TEMPLATE_NAMES ) (
167+ "recognizes the GitLab default template named $0" ,
168+ ( templateFileName ) =>
169+ runWithTempDirectory ( ( cwd ) =>
170+ Effect . gen ( function * ( ) {
171+ const relativePath = `.gitlab/merge_request_templates/${ templateFileName } ` ;
172+ yield * writeTemplate ( cwd , relativePath , `template from ${ templateFileName } ` ) ;
173+ yield * commitTemplates ( cwd ) ;
174+
175+ const template = yield * detectTemplate ( cwd , "HEAD" , "gitlab" ) ;
176+ assert . strictEqual ( Option . getOrUndefined ( template ) , `template from ${ templateFileName } ` ) ;
177+ } ) ,
178+ ) ,
179+ ) ;
180+
181+ it . effect ( "prefers the GitLab default template over named templates" , ( ) =>
182+ runWithTempDirectory ( ( cwd ) =>
183+ Effect . gen ( function * ( ) {
184+ yield * writeTemplate ( cwd , ".gitlab/merge_request_templates/Default.md" , "default template" ) ;
185+ yield * writeTemplate ( cwd , ".gitlab/merge_request_templates/feature.md" , "feature template" ) ;
186+ yield * commitTemplates ( cwd ) ;
187+
188+ const template = yield * detectTemplate ( cwd , "HEAD" , "gitlab" ) ;
189+ assert . strictEqual ( Option . getOrUndefined ( template ) , "default template" ) ;
190+ } ) ,
191+ ) ,
192+ ) ;
193+
194+ it . effect ( "does not use a named GitLab template when no default exists" , ( ) =>
195+ runWithTempDirectory ( ( cwd ) =>
196+ Effect . gen ( function * ( ) {
197+ yield * writeTemplate ( cwd , ".gitlab/merge_request_templates/feature.md" , "feature template" ) ;
198+ yield * commitTemplates ( cwd ) ;
199+
200+ const template = yield * detectTemplate ( cwd , "HEAD" , "gitlab" ) ;
201+ assert . isTrue ( Option . isNone ( template ) ) ;
202+ } ) ,
203+ ) ,
204+ ) ;
205+
206+ it . effect . each ( AZURE_DEVOPS_TEMPLATE_PATHS ) (
207+ "recognizes the Azure DevOps template at $0" ,
155208 ( relativePath ) =>
156209 runWithTempDirectory ( ( cwd ) =>
157210 Effect . gen ( function * ( ) {
158211 yield * writeTemplate ( cwd , relativePath , `template from ${ relativePath } ` ) ;
159212 yield * commitTemplates ( cwd ) ;
160213
161- const template = yield * detectTemplate ( cwd , "HEAD" , "gitlab " ) ;
214+ const template = yield * detectTemplate ( cwd , "HEAD" , "azure-devops " ) ;
162215 assert . strictEqual ( Option . getOrUndefined ( template ) , `template from ${ relativePath } ` ) ;
163216 } ) ,
164217 ) ,
165218) ;
166219
167- it . effect ( "recognizes the Azure DevOps pull request template " , ( ) =>
220+ it . effect ( "uses the first Azure DevOps template in folder precedence order " , ( ) =>
168221 runWithTempDirectory ( ( cwd ) =>
169222 Effect . gen ( function * ( ) {
170- const relativePath = ".azuredevops/pull_request_template.md" ;
171- yield * writeTemplate ( cwd , relativePath , `template from ${ relativePath } ` ) ;
223+ yield * writeTemplate ( cwd , ".azuredevops/pull_request_template.txt" , "azuredevops txt" ) ;
224+ yield * writeTemplate ( cwd , ".vsts/pull_request_template.md" , "vsts md" ) ;
225+ yield * writeTemplate ( cwd , "docs/pull_request_template.txt" , "docs txt" ) ;
226+ yield * writeTemplate ( cwd , "pull_request_template.md" , "root md" ) ;
172227 yield * commitTemplates ( cwd ) ;
173228
174229 const template = yield * detectTemplate ( cwd , "HEAD" , "azure-devops" ) ;
175- assert . strictEqual ( Option . getOrUndefined ( template ) , `template from ${ relativePath } ` ) ;
230+ assert . strictEqual ( Option . getOrUndefined ( template ) , "azuredevops txt" ) ;
176231 } ) ,
177232 ) ,
178233) ;
0 commit comments