Skip to content

Commit 9cd8a1b

Browse files
committed
Always run generate wizard with project name
1 parent 7f5b838 commit 9cd8a1b

2 files changed

Lines changed: 21 additions & 4 deletions

File tree

src/main/kotlin/file/SetupApp.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -546,10 +546,6 @@ object SetupApp {
546546
internal var installPatchPrompt: ((String, String?) -> String?)? = null
547547

548548
internal fun prepareGenerate(setup: SetupMain): Boolean {
549-
if (setup.commandArg.isNotBlank()) {
550-
return true
551-
}
552-
553549
val prompt = generatePrompt ?: terminalPrompt()
554550

555551
while (setup.commandArg.isBlank()) {

src/test/kotlin/GenerateTests.kt

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,27 @@ class GenerateTests {
396396
Assert.assertTrue(setup.curatedDependencyIds.isEmpty())
397397
}
398398

399+
@Test(priority = 10)
400+
fun testGenerateWithNameUsesWizardPrompt() {
401+
val setup = SetupMain()
402+
setup.parseArgs(listOf("generate", "wizardproject"))
403+
val answers = java.util.ArrayDeque(listOf("jass", "pre1.29", "none", "y", "y", "n"))
404+
val prevPrompt = SetupApp.generatePrompt
405+
try {
406+
SetupApp.generatePrompt = { _, _ -> answers.removeFirst() }
407+
Assert.assertTrue(SetupApp.prepareGenerate(setup))
408+
} finally {
409+
SetupApp.generatePrompt = prevPrompt
410+
}
411+
412+
Assert.assertEquals(setup.commandArg, "wizardproject")
413+
Assert.assertEquals(setup.scriptMode, ScriptMode.JASS)
414+
Assert.assertEquals(setup.wc3Patch, CoreJassProvider.PRE_129_PATCH)
415+
Assert.assertTrue(setup.addAgents)
416+
Assert.assertTrue(setup.addGithubWorkflow)
417+
Assert.assertTrue(setup.curatedDependencyIds.isEmpty())
418+
}
419+
399420
@Test(priority = 10)
400421
fun testGenerateWizardRejectsUnsupportedScriptModeAndPatchInput() {
401422
val setup = SetupMain()

0 commit comments

Comments
 (0)