Change unnecessary templates to procs
This commit is contained in:
parent
31d3b2701d
commit
3b092ae2d1
5 changed files with 11 additions and 11 deletions
|
|
@ -1,4 +1,4 @@
|
||||||
import unittest, options, common, os
|
import unittest, common
|
||||||
import webdriver
|
import webdriver
|
||||||
|
|
||||||
import karaxutils
|
import karaxutils
|
||||||
|
|
|
||||||
|
|
@ -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]
|
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)
|
let el = session.waitForElement(element, strategy)
|
||||||
el.get().click()
|
el.get().click()
|
||||||
|
|
||||||
template sendKeys*(session: Session, element, keys: string) =
|
proc sendKeys*(session: Session, element, keys: string) =
|
||||||
let el = session.waitForElement(element)
|
let el = session.waitForElement(element)
|
||||||
el.get().sendKeys(keys)
|
el.get().sendKeys(keys)
|
||||||
|
|
||||||
template clear*(session: Session, element: string) =
|
proc clear*(session: Session, element: string) =
|
||||||
let el = session.waitForElement(element)
|
let el = session.waitForElement(element)
|
||||||
el.get().clear()
|
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)
|
let el = session.waitForElement(element)
|
||||||
|
|
||||||
# focus
|
# focus
|
||||||
|
|
@ -52,7 +52,7 @@ template sendKeys*(session: Session, element: string, keys: varargs[Key]) =
|
||||||
for key in keys:
|
for key in keys:
|
||||||
session.press(key)
|
session.press(key)
|
||||||
|
|
||||||
template ensureExists*(session: Session, element: string, strategy=CssSelector) =
|
proc ensureExists*(session: Session, element: string, strategy=CssSelector) =
|
||||||
discard session.waitForElement(element, strategy)
|
discard session.waitForElement(element, strategy)
|
||||||
|
|
||||||
template check*(session: Session, element: string, function: untyped) =
|
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)
|
let el = session.waitForElement(element, strategy)
|
||||||
discard session.execute("arguments[0].setAttribute('value', '" & color & "')", el.get())
|
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)
|
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)
|
let el = session.waitForElement(element)
|
||||||
check el.get().getText() == expectedValue
|
check el.get().getText() == expectedValue
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
import unittest, options, common
|
import unittest, common
|
||||||
|
|
||||||
import webdriver
|
import webdriver
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
import unittest, options, common
|
import unittest, common
|
||||||
|
|
||||||
import webdriver
|
import webdriver
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
import unittest, options, common
|
import unittest, common
|
||||||
|
|
||||||
import webdriver
|
import webdriver
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue