Skip to content
This repository was archived by the owner on Sep 22, 2022. It is now read-only.

Commit 6eb80be

Browse files
committed
fix await command
1 parent 6c3ff6b commit 6eb80be

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

exam-core/src/main/java/io/github/adven27/concordion/extensions/exam/core/commands/ExamCommand.kt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,13 @@ open class ExamAssertEqualsCommand(
102102
fun CommandCall?.awaitConfig(): AwaitConfig? = html().awaitConfig()
103103

104104
fun Html.awaitConfig(prefix: String = "await") = AwaitConfig.build(
105-
takeAwayAttr("${prefix}AtMostSec")?.toLong(),
106-
takeAwayAttr("${prefix}PollDelayMillis")?.toLong(),
107-
takeAwayAttr("${prefix}PollIntervalMillis")?.toLong()
105+
takeAwayAttr("${prefix}AtMostSec".decap())?.toLong(),
106+
takeAwayAttr("${prefix}PollDelayMillis".decap())?.toLong(),
107+
takeAwayAttr("${prefix}PollIntervalMillis".decap())?.toLong()
108108
)
109109

110+
fun String.decap() = replaceFirstChar { it.lowercase() }
111+
110112
data class AwaitConfig(
111113
val atMostSec: Long = DEFAULT_AT_MOST_SEC,
112114
val pollDelay: Long = DEFAULT_POLL_DELAY,
@@ -126,13 +128,13 @@ data class AwaitConfig(
126128
var DEFAULT_POLL_INTERVAL = 1000L
127129

128130
fun build(atMostSec: Long?, pollDelay: Long?, pollInterval: Long?): AwaitConfig? =
129-
if (enabled(atMostSec, pollDelay, pollInterval))
131+
if (enabled(atMostSec, pollDelay, pollInterval)) {
130132
AwaitConfig(
131133
atMostSec ?: DEFAULT_AT_MOST_SEC,
132134
pollDelay ?: DEFAULT_POLL_DELAY,
133135
pollInterval ?: DEFAULT_POLL_INTERVAL
134136
)
135-
else null
137+
} else null
136138

137139
private fun enabled(atMostSec: Long?, pollDelay: Long?, pollInterval: Long?) =
138140
!(atMostSec == null && pollDelay == null && pollInterval == null)

exam-core/src/main/java/io/github/adven27/concordion/extensions/exam/core/commands/UtilCommands.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class WaitCommand(tag: String) : ExamCommand("await", tag) {
9191
el.removeChildren()
9292

9393
Thread.sleep(1000L * eval.resolve(el.takeAwayAttr("seconds", "0")).toInt())
94-
(cmd.awaitConfig() ?: AwaitConfig()).await().let { await ->
94+
(cmd.html().awaitConfig("") ?: AwaitConfig()).await().let { await ->
9595
when {
9696
untilTrue != null -> await.alias(untilTrue).until { eval.evaluate(untilTrue) == true }
9797
untilGet.isNotEmpty() -> await.get(eval, untilGet, hasBody, hasStatus)

exam-core/src/main/java/io/github/adven27/concordion/extensions/exam/core/html/Html.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ class Html(val el: Element) {
110110
var attr = attr(name)
111111
if (attr != null) {
112112
attr = eval?.resolve(attr) ?: attr
113-
el.removeAttribute(name)
113+
// el.removeAttribute(name)
114114
}
115115
return attr
116116
}

0 commit comments

Comments
 (0)