zploskey · zploskey · Feb 27, 2018 · Feb 21, 2018 · Feb 24, 2018 · Feb 24, 2018
diff --git a/__tests__/fixtures/testPage.html b/__tests__/fixtures/testPage.html
@@ -0,0 +1,8 @@
+<html>
+  <head>
+    <title>Test Page</title>
+  </head>
+  <body>
+    <input type="text" id="input" />
+  </body>
+</html>
diff --git a/__tests__/puppeteer_test.re b/__tests__/puppeteer_test.re
@@ -0,0 +1,197 @@
+open Jest;
+
+open BsPuppeteer;
+
+open Expect;
+
+let getElementValueJs = [%raw
+  {| function (element) { return element.value; } |}
+];
+
+let testPagePath =
+  Node.Path.resolve(
+    [%bs.node __dirname] |> Js.Option.getWithDefault(""),
+    "../../../__tests__/fixtures/testPage.html"
+  );
+
+let testPageContent = Node.Fs.readFileAsUtf8Sync(testPagePath);
+
+describe("Puppeteer", () =>
+  test("executablePath", () =>
+    Puppeteer.executablePath() |> expect |> toContainString("chromium")
+  )
+);
+
+describe("Browser", () => {
+  let browser = ref(Browser.empty());
+  beforeAllPromise(() =>
+    Js.Promise.(
+      Puppeteer.launch()
+      |> then_(res => {
+           browser := res;
+           resolve();
+         })
+    )
+  );
+  test("wsEndpoint()", () =>
+    Browser.wsEndpoint(browser^)
+    |> expect
+    |> toContainString("ws://127.0.0.1:")
+  );
+  testPromise("userAgent()", () =>
+    Js.Promise.(
+      Browser.userAgent(browser^)
+      |> then_(userAgent =>
+           userAgent |> expect |> toContainString("HeadlessChrome") |> resolve
+         )
+    )
+  );
+  testPromise("version()", () =>
+    Js.Promise.(
+      Browser.version(browser^)
+      |> then_(version =>
+           version
+           |> expect
+           |> toMatchRe([%bs.re "/^HeadlessChrome/"])
+           |> resolve
+         )
+    )
+  );
+  afterAllPromise(() => Browser.close(browser^));
+});
+
+describe("Page", () => {
+  let browser = ref(Browser.empty());
+  let page = ref(Page.empty());
+  beforeAllPromise(() =>
+    Js.Promise.(
+      Puppeteer.launch()
+      |> then_(res => {
+           browser := res;
+           Browser.newPage(browser^);
+         })
+      |> then_(res => {
+           page := res;
+           resolve();
+         })
+    )
+  );
+  testPromise("$()", () =>
+    Js.Promise.(
+      Page.selectOne(page^, ~selector="body")
+      |> then_(elementHandle =>
+           elementHandle |> expect |> ExpectJs.toBeTruthy |> resolve
+         )
+    )
+  );
+  testPromise("content()", () =>
+    Js.Promise.(
+      Page.content(page^)
+      |> then_(content =>
+           expect(content)
+           |> ExpectJs.toBe("<html><head></head><body></body></html>")
+           |> resolve
+         )
+    )
+  );
+  testPromise("$$()", () =>
+    Js.Promise.(
+      Page.selectAll(page^, ~selector="html,body")
+      |> then_(elementHandles =>
+           expect(elementHandles) |> ExpectJs.toHaveLength(2) |> resolve
+         )
+    )
+  );
+  testPromise("$x", () =>
+    Js.Promise.(
+      Page.selectXPath(page^, ~xpath="/html/body")
+      |> then_(elementHandles =>
+           expect(elementHandles) |> ExpectJs.toHaveLength(1) |> resolve
+         )
+    )
+  );
+  testPromise("click()", () =>
+    Js.Promise.(
+      page^ |> Page.click("body", ()) |> then_(() => pass |> resolve)
+    )
+  );
+  testPromise("goto()", () =>
+    Js.Promise.(
+      Browser.newPage(browser^)
+      |> then_(page => {
+           let options = Navigation.makeOptions(~timeout=25000., ());
+           page |> Page.goto("https://google.com", ~options, ());
+         })
+      |> then_(res => res |> Response.text)
+      |> then_(text =>
+           text
+           |> expect
+           |> toContainString("<title>Google</title>")
+           |> resolve
+         )
+    )
+  );
+  testPromise("screenshot()", () =>
+    Js.Promise.(
+      page^
+      |> Page.screenshot()
+      |> then_(buf =>
+           buf
+           |> Js_typed_array.ArrayBuffer.byteLength
+           |> expect
+           |> toBeGreaterThanOrEqual(3236)
+           |> resolve
+         )
+    )
+  );
+  testPromise("waitForSelector()", () =>
+    Js.Promise.(
+      page^ |> Page.waitForSelector("body", ()) |> then_(() => pass |> resolve)
+    )
+  );
+  testPromise("waitForXPath()", () =>
+    Js.Promise.(
+      page^
+      |> Page.waitForXPath(
+           ~xpath="/html/body",
+           ~options=Page.makeSelectorOptions(~timeout=100., ()),
+           ()
+         )
+      |> then_(elementHandle =>
+           elementHandle |> expect |> ExpectJs.toBeTruthy |> resolve
+         )
+    )
+  );
+  testPromise("setExtraHTTPHeaders", () =>
+    Js.Promise.(
+      page^
+      |> Page.setExtraHTTPHeaders(
+           ~headers=Js.Dict.fromList([("extra-http-header", "header01")]),
+           ()
+         )
+      /* TODO: Better way to verify extra HTTP headers */
+      |> then_(() => pass |> resolve)
+    )
+  );
+  testPromise("type()", () =>
+    Js.Promise.(
+      Browser.newPage(browser^)
+      |> 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)
+         )
+      |> then_(value => value |> expect |> toBe("hello world") |> resolve)
+    )
+  );
+  afterAllPromise(() =>
+    Js.Promise.(Page.close(page^) |> then_(() => Browser.close(browser^)))
+  );
+});
diff --git a/bsconfig.json b/bsconfig.json
@@ -7,10 +7,17 @@
       "dir": "examples",
       "public": []
     },
+    {
+      "dir": "__tests__",
+      "type": "dev"
+    }
   ],
   "warnings": {
     "number": "-44",
     "error": ""
   },
+  "bs-dev-dependencies": [
+    "@glennsl/bs-jest"
+  ],
   "refmt": 3,
 }
diff --git a/examples/logHtml.re b/examples/logHtml.re
@@ -7,16 +7,14 @@ Js.log("Executable: " ++ Puppeteer.executablePath());
 
 let logHtml = () =>
   Puppeteer.launch()
-  |> then_((browser) => browser |> Browser.newPage)
-  |> then_(
-       (page) => {
-         let options = Navigation.makeOptions(~timeout=25000., ());
-         page
-         |> Page.goto("https://google.com", ~options, ())
-         |> then_((res) => res |> Response.text)
-       }
-     )
-  |> then_((text) => Js.log(text) |> resolve)
+  |> then_(browser => browser |> Browser.newPage)
+  |> then_(page => {
+       let options = Navigation.makeOptions(~timeout=25000., ());
+       page
+       |> Page.goto("https://google.com", ~options, ())
+       |> then_(res => res |> Response.text);
+     })
+  |> then_(text => Js.log(text) |> resolve)
   |> then_(() => Node.Process.exit(0) |> resolve);
 
 logHtml();
diff --git a/examples/screenshot.re b/examples/screenshot.re
@@ -4,24 +4,21 @@ open Js.Promise;
 
 let takeScreenshot = () =>
   Puppeteer.launch()
-  |> then_(
-       (browser) =>
-         browser
-         |> Browser.newPage
-         |> then_(
-              (page) =>
-                page
-                |> Page.goto("https://google.com", ())
-                |> then_(
-                     (_) => {
-                       Js.log("screenshotting");
-                       let options = Page.makeScreenshotOptions(~path="./screenshot.png", ());
-                       page |> Page.screenshot(~options, ())
-                     }
-                   )
-            )
-         |> then_((_) => Browser.close(browser))
-         |> then_((_) => Node.Process.exit(0) |> resolve)
+  |> then_(browser =>
+       browser
+       |> Browser.newPage
+       |> then_(page =>
+            page
+            |> Page.goto("https://google.com", ())
+            |> then_((_) => {
+                 Js.log("screenshotting");
+                 let options =
+                   Page.makeScreenshotOptions(~path="./screenshot.png", ());
+                 page |> Page.screenshot(~options, ());
+               })
+          )
+       |> then_((_) => Browser.close(browser))
+       |> then_((_) => Node.Process.exit(0) |> resolve)
      );
 
 takeScreenshot();
diff --git a/examples/search.re b/examples/search.re
@@ -6,17 +6,30 @@ Js.log("Executable: " ++ Puppeteer.executablePath());
 
 let search = () =>
   Puppeteer.launch()
-  |> then_((browser) => browser |> Browser.newPage)
-  |> then_(
-       (page) => {
-         let options = Navigation.makeOptions(~timeout=20000., ~waitUntil=`load, ());
-         page
-         |> Page.goto("https://google.com", ~options, ())
-         |> then_((_) => page |> Page.type_("puppeteer", ()))
-         |> then_(() => page |> Page.click("input[type='submit']", ()))
-         |> then_(() => page |> Page.waitForSelector("h3 a", ()))
-       }
+  |> then_(browser =>
+       browser
+       |> Browser.newPage
+       |> then_(page => {
+            let options =
+              Navigation.makeOptions(~timeout=20000., ~waitUntil=`load, ());
+            page
+            |> Page.goto("https://google.com", ~options, ())
+            |> then_((_) => page |> Page.type_("#lst-ib", "puppeteer", ()))
+            |> then_(() => page |> Page.click("input[type='submit']", ()))
+            |> then_(() => page |> Page.waitForSelector("h3 a", ()))
+            |> then_(() =>
+                 page
+                 |> Page.selectOneEval(
+                      "h3 a",
+                      [%raw
+                        {| function (element) { return element.textContent; } |}
+                      ]
+                    )
+               )
+            |> then_(text => Js.log2("Got:", text) |> resolve)
+            |> then_((_) => Browser.close(browser))
+            |> then_((_) => Node.Process.exit(0) |> resolve);
+          })
      );
 
-/* TODO: select elements matching "h3 a" and get their text */
 search();
diff --git a/package.json b/package.json
@@ -5,8 +5,10 @@
   "main": "src/Puppeteer.re",
   "scripts": {
     "build": "bsb -make-world",
+    "clean": "bsb -clean-world",
     "start": "bsb -make-world -w",
-    "clean": "bsb -clean-world"
+    "test": "jest",
+    "test:watch": "jest --watch"
   },
   "repository": {
     "type": "git",
@@ -27,6 +29,7 @@
     "puppeteer": "^1.1.0"
   },
   "devDependencies": {
+    "@glennsl/bs-jest": "^0.4.2",
     "bs-platform": "^2.2.0"
   }
 }
diff --git a/src/Browser.re b/src/Browser.re
@@ -1,9 +1,13 @@
 type t;
 
+external empty : unit => t = "%identity";
+
 [@bs.send.pipe : t] external close : Js.Promise.t(unit) = "";
 
 [@bs.send.pipe : t] external newPage : Js.Promise.t(Page.t) = "";
 
 [@bs.send.pipe : t] external version : Js.Promise.t(string) = "";
 
 [@bs.send.pipe : t] external wsEndpoint : string = "";
+
+[@bs.send.pipe : t] external userAgent : Js.Promise.t(string) = "";
diff --git a/src/ElementHandle.re b/src/ElementHandle.re
@@ -12,3 +12,8 @@ type t;
 [@bs.send.pipe : t] external tap : Js.Promise.t(unit) = "";
 
 [@bs.send.pipe : t] external uploadFile : (~filePaths: array(string)) => Js.Promise.t(unit) = "";
+
+[@bs.send.pipe : t] external toString : string = "";
+
+[@bs.send] external jsonValue : t => Js.Promise.t(Js.t({..})) = "";
+
diff --git a/src/FrameBase.re b/src/FrameBase.re
@@ -47,3 +47,7 @@ external waitForXPath :
   (~xpath: string, ~options: selectorOptions=?, unit) =>
   Js.Promise.t(ElementHandle.t) =
   "";
+
+[@bs.send.pipe : t]
+external selectOneEval : (string, unit => unit) => Js.Promise.t('a) =
+  "$eval";