Fixes

Flank · May 4, 2021 · fb722ac · fb722ac
1 parent 3bc3fc9
commit fb722ac
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/test_runner/src/main/kotlin/ftl/domain/DescribeIosLocales.kt b/test_runner/src/main/kotlin/ftl/domain/DescribeIosLocales.kt
@@ -6,6 +6,7 @@ import ftl.api.fetchLocales
 import ftl.args.IosArgs
 import ftl.presentation.Output
 import ftl.run.exception.FlankConfigurationError
+import ftl.run.exception.FlankGeneralError
 import java.nio.file.Paths
 
 interface DescribeIosLocales : Output {
@@ -18,5 +19,5 @@ fun DescribeIosLocales.invoke() {
 
     fetchLocales(Identity(IosArgs.loadOrDefault(Paths.get(configPath)).project, Platform.IOS, locale)).find {
         it.id == locale
-    }?.out()
+    }?.out() ?: throw FlankGeneralError("ERROR: '$locale' is not a valid locale")
 }
diff --git a/test_runner/src/main/kotlin/ftl/environment/ListLocales.kt b/test_runner/src/main/kotlin/ftl/environment/ListLocales.kt
@@ -29,14 +29,14 @@ private const val NAME = "NAME"
 private const val REGION = "REGION"
 
 fun List<Locale>.getLocaleDescription(localeId: String) =
-    findLocales(localeId)?.prepareDescription(localeId).orErrorMessage(localeId).plus("\n")
+    findLocales(localeId)?.prepareDescription().orErrorMessage(localeId).plus("\n")
 
 private fun List<Locale>.findLocales(localeId: String) = find { it.id == localeId }
 
-fun Locale.prepareDescription(locale: String) = """
+fun Locale.prepareDescription() = """
 id: $id
 name: $name
-""".trimIndent().addRegionIfExist(region).addTagsIfExists(this).orErrorMessage(locale).plus("\n")
+""".trimIndent().addRegionIfExist(region).addTagsIfExists(this)
 
 private fun String.addRegionIfExist(region: String?) =
     if (!region.isNullOrEmpty()) StringBuilder(this).appendLine("\nregion: $region").trim().toString()

diff --git a/.../kotlin/ftl/presentation/cli/firebase/test/ios/configuration/IosLocalesDescribeCommand.kt b/.../kotlin/ftl/presentation/cli/firebase/test/ios/configuration/IosLocalesDescribeCommand.kt
@@ -44,7 +44,7 @@ class IosLocalesDescribeCommand :
 
     override val out = outputLogger {
         when (this) {
-            is Locale -> prepareDescription(locale)
+            is Locale -> prepareDescription()
             else -> throwUnknownType()
         }
     }