Register new handler for render with each page navigation

This commit is contained in:
Tim Schaub
2018-11-09 09:01:10 -07:00
parent 67ee32fdea
commit 1253558006
5 changed files with 71 additions and 9 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

View File

@@ -0,0 +1,22 @@
<!DOCTYPE html>
<html>
<head>
<style>
html, body {
margin: 0;
padding: 0;
width: 100%;
height: 100%;
}
#map {
width: 100%;
height: 100%;
}
</style>
</head>
<body>
<div id="map"></div>
<script src="main.js"></script>
</body>
</script>
</html>

View File

@@ -0,0 +1,33 @@
import Map from '../../../src/ol/Map.js';
import View from '../../../src/ol/View.js';
import {Vector as VectorLayer, Tile as TileLayer} from '../../../src/ol/layer.js';
import {Vector as VectorSource, OSM} from '../../../src/ol/source.js';
import Point from '../../../src/ol/geom/Point.js';
import Feature from '../../../src/ol/Feature.js';
import {fromLonLat} from '../../../src/ol/proj.js';
const center = fromLonLat([-111, 45.7]);
new Map({
layers: [
new TileLayer({
source: new OSM()
}),
new VectorLayer({
source: new VectorSource({
features: [
new Feature(
new Point(center)
)
]
})
})
],
target: 'map',
view: new View({
center: center,
zoom: 4
})
});
render();

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

View File

@@ -109,19 +109,25 @@ async function assertScreenshotsMatch(entry) {
}
}
function exposeRender(page) {
return new Promise((resolve, reject) => {
const innerPromise = new Promise(innerResolve => {
page.exposeFunction('render', innerResolve).then(() => resolve(() => innerPromise), reject);
});
let handleRender;
async function exposeRender(page) {
await page.exposeFunction('render', () => {
if (!handleRender) {
throw new Error('No render handler set for current page');
}
handleRender();
});
}
async function renderPage(page, entry, options) {
const href = getHref(entry);
const renderCalled = await exposeRender(page);
await page.goto(`http://localhost:${options.port}${href}`, {waitUntil: 'networkidle2'});
await renderCalled();
const renderCalled = new Promise(resolve => {
handleRender = () => {
handleRender = null;
resolve();
};
});
await page.goto(`http://localhost:${options.port}${getHref(entry)}`, {waitUntil: 'networkidle0'});
await renderCalled;
await page.screenshot({path: getActualScreenshotPath(entry)});
}
@@ -154,6 +160,7 @@ async function render(entries, options) {
try {
const page = await browser.newPage();
await exposeRender(page);
await page.setViewport({width: 256, height: 256});
fail = await renderEach(page, entries, options);
} finally {