diff --git a/tests/browsertests/categories.nim b/tests/browsertests/categories.nim index 9954877..3980146 100644 --- a/tests/browsertests/categories.nim +++ b/tests/browsertests/categories.nim @@ -1,4 +1,4 @@ -import unittest, options, common, os +import unittest, common import webdriver import karaxutils diff --git a/tests/browsertests/common.nim b/tests/browsertests/common.nim index 09e0999..e266ed6 100644 --- a/tests/browsertests/common.nim +++ b/tests/browsertests/common.nim @@ -32,19 +32,19 @@ proc elementIsNone(element: Option[Element]): bool = proc waitForElement*(session: Session, selector: string, strategy=CssSelector, timeout=20000, pollTime=50, waitCondition=elementIsSome): Option[Element] -template click*(session: Session, element: string, strategy=CssSelector) = +proc click*(session: Session, element: string, strategy=CssSelector) = let el = session.waitForElement(element, strategy) el.get().click() -template sendKeys*(session: Session, element, keys: string) = +proc sendKeys*(session: Session, element, keys: string) = let el = session.waitForElement(element) el.get().sendKeys(keys) -template clear*(session: Session, element: string) = +proc clear*(session: Session, element: string) = let el = session.waitForElement(element) el.get().clear() -template sendKeys*(session: Session, element: string, keys: varargs[Key]) = +proc sendKeys*(session: Session, element: string, keys: varargs[Key]) = let el = session.waitForElement(element) # focus @@ -52,7 +52,7 @@ template sendKeys*(session: Session, element: string, keys: varargs[Key]) = for key in keys: session.press(key) -template ensureExists*(session: Session, element: string, strategy=CssSelector) = +proc ensureExists*(session: Session, element: string, strategy=CssSelector) = discard session.waitForElement(element, strategy) template check*(session: Session, element: string, function: untyped) = @@ -68,10 +68,10 @@ proc setColor*(session: Session, element, color: string, strategy=CssSelector) = let el = session.waitForElement(element, strategy) discard session.execute("arguments[0].setAttribute('value', '" & color & "')", el.get()) -template checkIsNone*(session: Session, element: string, strategy=CssSelector) = +proc checkIsNone*(session: Session, element: string, strategy=CssSelector) = discard session.waitForElement(element, strategy, waitCondition=elementIsNone) -template checkText*(session: Session, element, expectedValue: string) = +proc checkText*(session: Session, element, expectedValue: string) = let el = session.waitForElement(element) check el.get().getText() == expectedValue diff --git a/tests/browsertests/issue181.nim b/tests/browsertests/issue181.nim index f48929f..031cd92 100644 --- a/tests/browsertests/issue181.nim +++ b/tests/browsertests/issue181.nim @@ -1,4 +1,4 @@ -import unittest, options, common +import unittest, common import webdriver diff --git a/tests/browsertests/scenario1.nim b/tests/browsertests/scenario1.nim index 9237c2e..6e10e4c 100644 --- a/tests/browsertests/scenario1.nim +++ b/tests/browsertests/scenario1.nim @@ -1,4 +1,4 @@ -import unittest, options, common +import unittest, common import webdriver diff --git a/tests/browsertests/threads.nim b/tests/browsertests/threads.nim index 53fbb23..b79d93a 100644 --- a/tests/browsertests/threads.nim +++ b/tests/browsertests/threads.nim @@ -1,4 +1,4 @@ -import unittest, options, common +import unittest, common import webdriver