jyapayne/webdriver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small refactoring.

Browse source
This commit is contained in:
Dominik Picheta 2017-10-15 13:49:41 +01:00
commit 879ba8aabc
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/webdriver.nim
View file

@ -29,6 +29,11 @@ proc toKeyword(strategy: LocationStrategy): string =
of TagNameSelector: "tag name" of TagNameSelector: "tag name"
of XPathSelector: "xpath" of XPathSelector: "xpath"
proc checkResponse(resp: string): JsonNode =
result = parseJson(resp)
if result{"value"}.isNil:
raise newException(WebDriverException, $result)
proc newWebDriver*(url: string = "http://localhost:4444"): WebDriver = proc newWebDriver*(url: string = "http://localhost:4444"): WebDriver =
WebDriver(url: url.parseUri, client: newHttpClient()) WebDriver(url: url.parseUri, client: newHttpClient())
@ -43,7 +48,7 @@ proc createSession*(self: WebDriver): Session =
let msg = "Readiness message does not follow spec" let msg = "Readiness message does not follow spec"
raise newException(ProtocolException, msg) raise newException(ProtocolException, msg)
if not obj{"value", "ready"}.getBVal(): if not obj{"value", "ready"}.getBool():
raise newException(WebDriverException, "WebDriver is not ready") raise newException(WebDriverException, "WebDriver is not ready")
# Create our session. # Create our session.
@ -71,9 +76,7 @@ proc getPageSource*(self: Session): string =
let reqUrl = $(self.driver.url / "session" / self.id / "source") let reqUrl = $(self.driver.url / "session" / self.id / "source")
let resp = self.driver.client.getContent(reqUrl) let resp = self.driver.client.getContent(reqUrl)
let respObj = parseJson(resp) let respObj = checkResponse(resp)
if respObj{"value"}.isNil:
raise newException(WebDriverException, $respObj)
return respObj{"value"}.getStr() return respObj{"value"}.getStr()
@ -83,9 +86,7 @@ proc findElement*(self: Session, selector: string,
let reqObj = %*{"using": toKeyword(strategy), "value": selector} let reqObj = %*{"using": toKeyword(strategy), "value": selector}
let resp = self.driver.client.postContent(reqUrl, $reqObj) let resp = self.driver.client.postContent(reqUrl, $reqObj)
let respObj = parseJson(resp) let respObj = checkResponse(resp)
if respObj{"value"}.isNil:
raise newException(WebDriverException, $respObj)
for key, value in respObj["value"].getFields().pairs(): for key, value in respObj["value"].getFields().pairs():
return Element(id: value.getStr(), session: self) return Element(id: value.getStr(), session: self)
@ -94,9 +95,7 @@ proc getText*(self: Element): string =
let reqUrl = $(self.session.driver.url / "session" / self.session.id / let reqUrl = $(self.session.driver.url / "session" / self.session.id /
"element" / self.id / "text") "element" / self.id / "text")
let resp = self.session.driver.client.getContent(reqUrl) let resp = self.session.driver.client.getContent(reqUrl)
let respObj = parseJson(resp) let respObj = checkResponse(resp)
if respObj{"value"}.isNil:
raise newException(WebDriverException, $respObj)
return respObj["value"].getStr() return respObj["value"].getStr()