Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add optional field to commands #1946

Merged
merged 9 commits into from
Sep 3, 2024
Merged

Add optional field to commands #1946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0101e44
Add optional field to all commands
tokou Aug 25, 2024
a3d6b69
Fix default label value
tokou Aug 25, 2024
3f4a06d
Add optional field to all Yaml commands
tokou Aug 25, 2024
3980483
Wire Yaml optional value to Command optional value
tokou Aug 25, 2024
ee8aae8
Handle optional in Orchestra
tokou Aug 25, 2024
1a2d833
Add optional cases in tests
tokou Aug 25, 2024
416f7a7
Add warned state to command status
tokou Aug 31, 2024
27d7d1b
Merge branch 'main' into add-optional-to-commands
bartekpacia Sep 2, 2024
8105b12
remove YamlScrollUntilVisible.speedToDuration
bartekpacia Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions maestro-cli/src/main/java/maestro/cli/report/TestDebugReporter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ object TestDebugReporter {
val status = when (it.status) {
CommandStatus.COMPLETED -> "✅"
CommandStatus.FAILED -> "❌"
CommandStatus.WARNED -> "⚠️"
else -> "﹖"
}
val filename = "screenshot-$status-${it.timestamp}-(${flowName}).png"
Expand Down
1 change: 1 addition & 0 deletions maestro-cli/src/main/java/maestro/cli/runner/CommandStatus.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ enum class CommandStatus {
RUNNING,
COMPLETED,
FAILED,
WARNED,
SKIPPED,
}
11 changes: 11 additions & 0 deletions maestro-cli/src/main/java/maestro/cli/runner/MaestroCommandRunner.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,17 @@ object MaestroCommandRunner {
}
refreshUi()
},
onCommandWarned = { _, command ->
logger.info("${command.description()} WARNED")
commandStatuses[command] = CommandStatus.WARNED
debugOutput.commands[command]?.apply {
status = CommandStatus.WARNED
}

takeDebugScreenshot(CommandStatus.WARNED)

refreshUi()
},
onCommandReset = { command ->
logger.info("${command.description()} PENDING")
commandStatuses[command] = CommandStatus.PENDING
Expand Down
6 changes: 6 additions & 0 deletions maestro-cli/src/main/java/maestro/cli/runner/TestSuiteInteractor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,12 @@ class TestSuiteInteractor(
it.status = CommandStatus.SKIPPED
}
},
onCommandWarned = { _, command ->
logger.info("${command.description()} WARNED")
debugOutput.commands[command]?.apply {
status = CommandStatus.WARNED
}
},
onCommandReset = { command ->
logger.info("${command.description()} PENDING")
debugOutput.commands[command]?.let {
Expand Down
3 changes: 3 additions & 0 deletions maestro-cli/src/main/java/maestro/cli/runner/resultview/AnsiResultView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ class AnsiResultView(

if (commandState.status == CommandStatus.SKIPPED) {
render(" (skipped)")
} else if (commandState.status == CommandStatus.WARNED) {
render(" (warned)")
} else if (commandState.numberOfRuns != null) {
val timesWord = if (commandState.numberOfRuns == 1) "time" else "times"
render(" (completed ${commandState.numberOfRuns} $timesWord)")
Expand Down Expand Up @@ -204,6 +206,7 @@ class AnsiResultView(
CommandStatus.FAILED -> "❌"
CommandStatus.RUNNING -> "⏳"
CommandStatus.PENDING -> "\uD83D\uDD32 " // 🔲
CommandStatus.WARNED -> "⚠️"
CommandStatus.SKIPPED -> "⚪️"
}
}
Expand Down
3 changes: 2 additions & 1 deletion maestro-cli/src/main/java/maestro/cli/runner/resultview/PlainTextResultView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class PlainTextResultView: ResultView {
}
}

CommandStatus.COMPLETED, CommandStatus.FAILED, CommandStatus.SKIPPED -> {
CommandStatus.COMPLETED, CommandStatus.FAILED, CommandStatus.SKIPPED, CommandStatus.WARNED -> {
registerStep()
if (shouldPrintStep()) {
println(" " + status(command.status))
Expand Down Expand Up @@ -148,6 +148,7 @@ class PlainTextResultView: ResultView {
CommandStatus.RUNNING -> "RUNNING"
CommandStatus.PENDING -> "PENDING"
CommandStatus.SKIPPED -> "SKIPPED"
CommandStatus.WARNED -> "WARNED"
}
}
}
Loading
Loading