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.

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

Jump to bottom

Fix eval functions, allow them to take args #21

Merged
merged 6 commits into from Mar 8, 2018
Merged

Fix eval functions, allow them to take args #21

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c48423c
Fix eval functions, allow them to take args
zploskey Mar 6, 2018
ade48d6
Generic eval functions with or without returning promises
zploskey Mar 8, 2018
e7df1b3
test evaluate() with 2 arguments
zploskey Mar 8, 2018
4d69119
Remove unnecessary uncurrying
zploskey Mar 8, 2018
c001d64
Test evaluate1 with curried function
zploskey Mar 8, 2018
466c9ac
test evalPromise2 with curried fn
zploskey Mar 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
98 changes: 71 additions & 27 deletions __tests__/puppeteer_test.re
View file
Open in desktop
Expand Up @@ -4,18 +4,22 @@ open BsPuppeteer;

open Expect;

let getElementValueJs = [%raw
let getElementValueJs: Dom.element => string = [%raw
{| function (element) { return element.value; } |}
];

let getLengthOfElementsJs = [%raw
{| function (elements) { return elements.length; } |}
];

let getElementOuterHTMLJs = [%raw
let getElementOuterHTMLJs: Dom.element => string = [%raw
{| function (element) { return element.outerHTML; } |}
];

let getElementOuterHTMLJsPromise: Dom.element => Js.Promise.t(string) = [%raw
{| function (element) { return Promise.resolve(element.outerHTML); } |}
];

let fixturesPath =
Node.Path.resolve(
[%bs.node __dirname] |> Js.Option.getWithDefault(""),
Expand Down Expand Up @@ -137,20 +141,50 @@ describe("Page", () => {
Js.Promise.(
page^
|> Page.selectAllEval("html,body", getLengthOfElementsJs)
|> then_(serializable => serializable |> expect |> toBe(2) |> resolve)
|> then_(length => length |> expect |> toBe(2.0) |> resolve)
)
);
testPromise("$eval()", () =>
testPromise("$eval() with 0 args", () =>
Js.Promise.(
page^
|> Page.selectOneEval("html", getElementOuterHTMLJs)
|> then_(serializable =>
expect(serializable)
|> then_(html =>
html
|> expect
|> toBe("<html><head></head><body></body></html>")
|> resolve
)
)
);
testPromise("$eval() with 0 args returning a promise", () =>
Js.Promise.(
page^
|> Page.selectOneEvalPromise("html", getElementOuterHTMLJsPromise)
|> then_(h =>
h
|> expect
|> toBe("<html><head></head><body></body></html>")
|> resolve
)
)
);
testPromise("$eval() with 1 arg", () =>
Js.Promise.(
page^
|> Page.setContent(testPageContent)
|> then_(() =>
page^
|> Page.selectOneEval1(
"input",
[%raw
{| function (el, prop) { return el.getAttribute(prop); } |}
],
"id"
)
)
|> then_(id => id |> expect |> toBe("input") |> resolve)
)
);
testPromise("click()", () =>
Js.Promise.(
page^ |> Page.click("body", ()) |> then_(() => pass |> resolve)
Expand Down Expand Up @@ -220,16 +254,12 @@ describe("Page", () => {
browser^
|> Browser.newPage
|> then_(page =>
all2((resolve(page), page |> Page.setContent(testPageContent)))
)
|> then_(((page, _)) =>
all2((
resolve(page),
page |> Page.type_("#input", "hello world", ())
))
)
|> then_(((page, _)) =>
page |> Page.selectOneEval("#input", getElementValueJs)
page
|> Page.setContent(testPageContent)
|> then_(() => page |> Page.type_("#input", "hello world", ()))
|> then_(() =>
page |> Page.selectOneEval("#input", getElementValueJs)
)
)
|> then_(value => value |> expect |> toBe("hello world") |> resolve)
)
Expand Down Expand Up @@ -380,26 +410,40 @@ describe("Page", () => {
testPromise("evaluate()", () =>
Js.Promise.(
{
let eval = [%raw {| function () { return Promise.resolve("ok"); } |}];
page^ |> Page.evaluate(eval, [||]);
let eval = () => "ok";
page^ |> Page.evaluate(eval);
}
|> then_(serializable =>
serializable
|> Js.Json.decodeString
|> Js.Option.getWithDefault("")
|> expect
|> toBe("ok")
|> resolve
)
|> then_(res => res |> expect |> toBe("ok") |> resolve)
)
);
testPromise("evaluate() with 1 arg", () =>
Js.Promise.(
{
let eval = arg => arg ++ "iedoke";
page^ |> Page.evaluate1(eval, "ok");
}
|> then_(res => res |> expect |> toBe("okiedoke") |> resolve)
)
);
testPromise("evaluateString()", () => {
let getTitleStr = {| document.getElementsByTagName("title")[0].innerHTML; |};
page^
|> Page.setContent(testPageContent)
|> Js.Promise.then_(() =>
page^
|> Page.evaluateString(getTitleStr)
|> Js.Promise.then_(title =>
title |> expect |> toBe("Test Page") |> Js.Promise.resolve
)
);
});
testPromise("evaluateHandle()", () =>
Js.Promise.(
{
let eval = [%raw
{| function () { return Promise.resolve(document); } |}
];
page^ |> Page.evaluateHandle(eval, [||]);
page^ |> Page.evaluateHandle(eval);
}
|> then_(jsHandler =>
jsHandler |> expect |> ExpectJs.toBeTruthy |> Js.Promise.resolve
Expand Down