From 965db577b2ab9c94f8f89e97332f089a698e20ec Mon Sep 17 00:00:00 2001
From: Patrick Augusto <ptkato.irl@gmail.com>
Date: Fri, 4 Jun 2021 18:55:25 -0300
Subject: [PATCH] Fixing test prompt for interactive
---
.../src/Distribution/Client/Init/Interactive/Command.hs | 7 ++++---
.../UnitTests/Distribution/Client/Init/Interactive.hs | 3 +--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cabal-install/src/Distribution/Client/Init/Interactive/Command.hs b/cabal-install/src/Distribution/Client/Init/Interactive/Command.hs
index f4151c2775..bc13878d08 100644
--- a/cabal-install/src/Distribution/Client/Init/Interactive/Command.hs
+++ b/cabal-install/src/Distribution/Client/Init/Interactive/Command.hs
@@ -139,9 +139,10 @@ createProject v pkgIx srcDb initFlags = do
(Just exeTarget) testTarget
TestSuite -> do
- testTarget <- genTestTarget initFlags pkgIx
+ let initFlags' = initFlags { initializeTestSuite = Flag True }
+ testTarget <- genTestTarget initFlags' pkgIx
- comments <- noCommentsPrompt initFlags
+ comments <- noCommentsPrompt initFlags'
return $ ProjectSettings
(mkOpts comments cabalSpec) pkgDesc
@@ -238,7 +239,7 @@ genTestTarget
=> InitFlags
-> InstalledPackageIndex
-> m (Maybe TestTarget)
-genTestTarget flags pkgs = initializeTestSuitePrompt (flags {initializeTestSuite = NoFlag}) >>= go
+genTestTarget flags pkgs = initializeTestSuitePrompt flags >>= go
where
go initialized
| not initialized = return Nothing
diff --git a/cabal-install/tests/UnitTests/Distribution/Client/Init/Interactive.hs b/cabal-install/tests/UnitTests/Distribution/Client/Init/Interactive.hs
index 4afc6ebe9f..c5827b7f7e 100644
--- a/cabal-install/tests/UnitTests/Distribution/Client/Init/Interactive.hs
+++ b/cabal-install/tests/UnitTests/Distribution/Client/Init/Interactive.hs
@@ -71,7 +71,7 @@ createProjectTest pkgIx srcDb = testGroup "createProject tests"
, dependencies = Flag []
}
- case (_runPrompt $ createProject silent pkgIx srcDb dummyFlags') (fromList ["y", "3", "quxTest/Main.hs"]) of
+ case (_runPrompt $ createProject silent pkgIx srcDb dummyFlags') (fromList ["3", "quxTest/Main.hs"]) of
Right (ProjectSettings opts desc (Just lib) (Just exe) (Just test), _) -> do
_optOverwrite opts @?= False
_optMinimal opts @?= False
@@ -341,7 +341,6 @@ createProjectTest pkgIx srcDb = testGroup "createProject tests"
-- category
, "3"
-- test target
- , "y"
-- main file
, "1"
-- test dir
--
GitLab