Skip to content

Commit

Permalink
Fix iOS CLI
Browse files Browse the repository at this point in the history
  • Loading branch information
bootstraponline committed Jun 18, 2019
1 parent 39329c3 commit c356614
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions release_notes.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## next (unreleased)

## v6.2.1

- [#563](https://github.com/TestArmada/flank/pull/563) Fix CLI support for iOS. ([bootstraponline](https://github.com/bootstraponline))

## v6.2.0

- [#560](https://github.com/TestArmada/flank/pull/560) Add `--test-runner-class` support for Android. ([jschear](https://github.com/jschear))
Expand Down
2 changes: 1 addition & 1 deletion test_runner/src/main/kotlin/ftl/args/IosArgs.kt
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ ${listToString(testTargets)}
mergeYmlMaps(GcloudYml, IosGcloudYml, FlankYml, IosFlankYml)
}

fun load(data: Path, cli: IosRunCommand? = null): IosArgs = IosArgs.load(String(Files.readAllBytes(data)), cli)
fun load(data: Path, cli: IosRunCommand? = null): IosArgs = load(String(Files.readAllBytes(data)), cli)

fun load(yamlData: String, cli: IosRunCommand? = null): IosArgs {
val data = YamlDeprecated.modifyAndThrow(yamlData, android = false)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Configuration is read from flank.yml
class AndroidRunCommand : Runnable {

override fun run() {
val config = AndroidArgs.load(Paths.get(configPath), this)
val config = AndroidArgs.load(Paths.get(configPath), cli = this)
runBlocking {
TestRunner.newRun(config)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Configuration is read from flank.yml
)
class IosRunCommand : Runnable {
override fun run() {
val config = IosArgs.load(Paths.get(configPath))
val config = IosArgs.load(Paths.get(configPath), cli = this)
runBlocking {
TestRunner.newRun(config)
}
Expand Down

0 comments on commit c356614

Please sign in to comment.