@@ -8,7 +8,7 @@ import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
8
8
import any from '@travi/any' ;
9
9
import { when } from 'jest-when' ;
10
10
11
- import * as gitScaffolder from './vcs/git/git.js' ;
11
+ import { scaffold as liftGit , initialize as scaffoldGit } from './vcs/git/git.js' ;
12
12
import * as vcsHostScaffolder from './vcs/host/scaffolder.js' ;
13
13
import * as licenseScaffolder from './license/scaffolder.js' ;
14
14
import * as languageScaffolder from './language/scaffolder.js' ;
@@ -109,10 +109,10 @@ describe('project scaffolder', () => {
109
109
when ( languagePrompt . default )
110
110
. calledWith ( languageScaffolders , decisions )
111
111
. mockResolvedValue ( { [ questionNames . PROJECT_LANGUAGE ] : projectLanguage } ) ;
112
- when ( gitScaffolder . initialize )
112
+ when ( scaffoldGit )
113
113
. calledWith ( gitRepoShouldBeInitialized , projectPath , projectName , vcsHosts , visibility , decisions )
114
114
. mockResolvedValue ( vcs ) ;
115
- gitScaffolder . scaffold . mockResolvedValue ( { nextSteps : gitNextSteps } ) ;
115
+ liftGit . mockResolvedValue ( { nextSteps : gitNextSteps } ) ;
116
116
when ( licenseScaffolder . default )
117
117
. calledWith ( { projectRoot : projectPath , license, copyright, vcs} )
118
118
. mockResolvedValue ( licenseResults ) ;
@@ -138,7 +138,7 @@ describe('project scaffolder', () => {
138
138
139
139
await scaffold ( options ) ;
140
140
141
- expect ( gitScaffolder . scaffold ) . toHaveBeenCalledWith ( {
141
+ expect ( liftGit ) . toHaveBeenCalledWith ( {
142
142
projectRoot : projectPath ,
143
143
origin : vcsOriginDetails
144
144
} ) ;
@@ -171,7 +171,7 @@ describe('project scaffolder', () => {
171
171
172
172
await scaffold ( ) ;
173
173
174
- expect ( gitScaffolder . initialize )
174
+ expect ( scaffoldGit )
175
175
. toHaveBeenCalledWith ( gitRepoShouldBeInitialized , projectPath , projectName , { } , undefined , undefined ) ;
176
176
} ) ;
177
177
@@ -180,7 +180,7 @@ describe('project scaffolder', () => {
180
180
when ( optionsValidator . validate ) . calledWith ( emptyOptions ) . mockReturnValue ( { } ) ;
181
181
when ( prompts . promptForBaseDetails ) . calledWith ( projectPath , undefined , undefined ) . mockResolvedValue ( { } ) ;
182
182
languagePrompt . default . mockResolvedValue ( { } ) ;
183
- gitScaffolder . initialize . mockResolvedValue ( { } ) ;
183
+ scaffoldGit . mockResolvedValue ( { } ) ;
184
184
185
185
await scaffold ( emptyOptions ) ;
186
186
} ) ;
@@ -218,7 +218,7 @@ describe('project scaffolder', () => {
218
218
219
219
await scaffold ( options ) ;
220
220
221
- expect ( gitScaffolder . scaffold ) . toHaveBeenCalledWith ( { projectRoot : projectPath , origin : vcsOriginDetails } ) ;
221
+ expect ( liftGit ) . toHaveBeenCalledWith ( { projectRoot : projectPath , origin : vcsOriginDetails } ) ;
222
222
expect ( scaffoldReadme ) . toHaveBeenCalledWith ( { projectName, projectRoot : projectPath , description} ) ;
223
223
} ) ;
224
224
@@ -227,11 +227,11 @@ describe('project scaffolder', () => {
227
227
prompts . promptForBaseDetails . mockResolvedValue ( { [ questionNames . GIT_REPO ] : false } ) ;
228
228
languagePrompt . default . mockResolvedValue ( { } ) ;
229
229
scaffoldReadme . mockResolvedValue ( ) ;
230
- gitScaffolder . initialize . mockResolvedValue ( undefined ) ;
230
+ scaffoldGit . mockResolvedValue ( undefined ) ;
231
231
232
232
await scaffold ( options ) ;
233
233
234
- expect ( gitScaffolder . scaffold ) . not . toHaveBeenCalled ( ) ;
234
+ expect ( liftGit ) . not . toHaveBeenCalled ( ) ;
235
235
expect ( vcsHostScaffolder . default ) . not . toHaveBeenCalled ( ) ;
236
236
expect ( dependencyUpdaterScaffolder . default ) . not . toHaveBeenCalled ( ) ;
237
237
} ) ;
@@ -260,8 +260,8 @@ describe('project scaffolder', () => {
260
260
when ( optionsValidator . validate )
261
261
. calledWith ( options )
262
262
. mockReturnValue ( { languages : languageScaffolders , vcsHosts, decisions} ) ;
263
- gitScaffolder . initialize . mockResolvedValue ( vcs ) ;
264
- gitScaffolder . scaffold . mockResolvedValue ( { nextSteps : gitNextSteps } ) ;
263
+ scaffoldGit . mockResolvedValue ( vcs ) ;
264
+ liftGit . mockResolvedValue ( { nextSteps : gitNextSteps } ) ;
265
265
prompts . promptForBaseDetails . mockResolvedValue ( {
266
266
[ coreQuestionNames . PROJECT_NAME ] : projectName ,
267
267
[ coreQuestionNames . VISIBILITY ] : visibility ,
@@ -299,7 +299,7 @@ describe('project scaffolder', () => {
299
299
300
300
await scaffold ( options ) ;
301
301
302
- expect ( gitScaffolder . scaffold ) . toHaveBeenCalledWith ( { projectRoot : projectPath , origin : vcsOriginDetails } ) ;
302
+ expect ( liftGit ) . toHaveBeenCalledWith ( { projectRoot : projectPath , origin : vcsOriginDetails } ) ;
303
303
expect ( scaffoldReadme ) . toHaveBeenCalledWith ( { projectName, projectRoot : projectPath , description} ) ;
304
304
expect ( execaPipe ) . toHaveBeenCalledWith ( process . stdout ) ;
305
305
expect ( resultsReporter . reportResults ) . toHaveBeenCalledWith ( { nextSteps : [ ...gitNextSteps , ...languageNextSteps ] } ) ;
@@ -309,7 +309,7 @@ describe('project scaffolder', () => {
309
309
when ( optionsValidator . validate )
310
310
. calledWith ( options )
311
311
. mockReturnValue ( { languages : languageScaffolders , vcsHosts, decisions} ) ;
312
- gitScaffolder . initialize . mockResolvedValue ( vcs ) ;
312
+ scaffoldGit . mockResolvedValue ( vcs ) ;
313
313
prompts . promptForBaseDetails . mockResolvedValue ( {
314
314
[ coreQuestionNames . PROJECT_NAME ] : projectName ,
315
315
[ coreQuestionNames . VISIBILITY ] : visibility ,
@@ -328,7 +328,7 @@ describe('project scaffolder', () => {
328
328
329
329
await scaffold ( options ) ;
330
330
331
- expect ( gitScaffolder . scaffold ) . toHaveBeenCalledWith ( { projectRoot : projectPath , origin : vcsOriginDetails } ) ;
331
+ expect ( liftGit ) . toHaveBeenCalledWith ( { projectRoot : projectPath , origin : vcsOriginDetails } ) ;
332
332
expect ( scaffoldReadme ) . toHaveBeenCalledWith ( { projectName, projectRoot : projectPath , description} ) ;
333
333
expect ( execa ) . not . toHaveBeenCalled ( ) ;
334
334
} ) ;
@@ -337,7 +337,7 @@ describe('project scaffolder', () => {
337
337
when ( optionsValidator . validate ) . calledWith ( options ) . mockReturnValue ( { } ) ;
338
338
prompts . promptForBaseDetails . mockResolvedValue ( { } ) ;
339
339
languagePrompt . default . mockResolvedValue ( { [ questionNames . PROJECT_LANGUAGE ] : projectLanguage } ) ;
340
- gitScaffolder . initialize . mockResolvedValue ( { } ) ;
340
+ scaffoldGit . mockResolvedValue ( { } ) ;
341
341
342
342
await scaffold ( options ) ;
343
343
@@ -359,7 +359,7 @@ describe('project scaffolder', () => {
359
359
when ( optionsValidator . validate ) . calledWith ( options ) . mockReturnValue ( { } ) ;
360
360
prompts . promptForBaseDetails . mockResolvedValue ( { } ) ;
361
361
languagePrompt . default . mockResolvedValue ( { } ) ;
362
- gitScaffolder . initialize . mockResolvedValue ( { } ) ;
362
+ scaffoldGit . mockResolvedValue ( { } ) ;
363
363
languageScaffolder . default . mockResolvedValue ( { badges : { } , projectDetails : { } } ) ;
364
364
365
365
await scaffold ( options ) ;
0 commit comments