github/puppeteer
0
0
Fork 0
mirror of https://github.com/puppeteer/puppeteer synced 2024-06-14 14:02:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert var's to let's

Browse Source 
This patch:
- converts all var's to let's throughout the codebase
- enforces the let's over var's via the eslint rule
This commit is contained in:
Andrey Lushnikov
2017-06-22 13:38:10 -07:00
parent 78e879925f
commit 819fa355f4
20 changed files with 344 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/StaticServer.js
View File

@@ -14,11 +14,11 @@
* limitations under the License.
*/
var http = require('http');
var url = require('url');
var fs = require('fs');
var path = require('path');
var mime = require('mime');
let http = require('http');
let url = require('url');
let fs = require('fs');
let path = require('path');
let mime = require('mime');
class StaticServer {
/**
@@ -36,7 +36,7 @@ class StaticServer {
}
_onRequest(request, response) {
var pathName = url.parse(request.url).path;
let pathName = url.parse(request.url).path;
if (pathName === '/')
pathName = '/index.html';
pathName = path.join(this._dirPath, pathName.substring(1));

12
test/frame-utils.js
View File

@@ -1,4 +1,4 @@
var utils = module.exports = {
const utils = module.exports = {
/**
* @param {!Page} page
* @param {string} frameId
@@ -9,7 +9,7 @@ var utils = module.exports = {
await page.evaluate(attachFrame, frameId, url);
function attachFrame(frameId, url) {
var frame = document.createElement('iframe');
let frame = document.createElement('iframe');
frame.src = url;
frame.id = frameId;
document.body.appendChild(frame);
@@ -26,7 +26,7 @@ var utils = module.exports = {
await page.evaluate(detachFrame, frameId);
function detachFrame(frameId) {
var frame = document.getElementById(frameId);
let frame = document.getElementById(frameId);
frame.remove();
}
},
@@ -41,7 +41,7 @@ var utils = module.exports = {
await page.evaluate(navigateFrame, frameId, url);
function navigateFrame(frameId, url) {
var frame = document.getElementById(frameId);
let frame = document.getElementById(frameId);
frame.src = url;
return new Promise(x => frame.onload = x);
}
@@ -54,8 +54,8 @@ var utils = module.exports = {
*/
dumpFrames: function(frame, indentation) {
indentation = indentation || '';
var result = indentation + frame.url();
for (var child of frame.childFrames())
let result = indentation + frame.url();
for (let child of frame.childFrames())
result += '\n' + utils.dumpFrames(child, ' ' + indentation);
return result;
},

62
test/golden-utils.js
View File

@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
var path = require('path');
var fs = require('fs');
var Diff = require('text-diff');
var mime = require('mime');
var PNG = require('pngjs').PNG;
var pixelmatch = require('pixelmatch');
var rm = require('rimraf').sync;
let path = require('path');
let fs = require('fs');
let Diff = require('text-diff');
let mime = require('mime');
let PNG = require('pngjs').PNG;
let pixelmatch = require('pixelmatch');
let rm = require('rimraf').sync;
var GOLDEN_DIR = path.join(__dirname, 'golden');
var OUTPUT_DIR = path.join(__dirname, 'output');
let GOLDEN_DIR = path.join(__dirname, 'golden');
let OUTPUT_DIR = path.join(__dirname, 'output');
module.exports = {
addMatchers: function(jasmine) {
@@ -35,7 +35,7 @@ module.exports = {
},
};
var GoldenComparators = {
let GoldenComparators = {
'image/png': compareImages,
'text/plain': compareText
};
@@ -49,15 +49,15 @@ function compareImages(actualBuffer, expectedBuffer) {
if (!actualBuffer || !(actualBuffer instanceof Buffer))
return { errorMessage: 'Actual result should be Buffer.' };
var actual = PNG.sync.read(actualBuffer);
var expected = PNG.sync.read(expectedBuffer);
let actual = PNG.sync.read(actualBuffer);
let expected = PNG.sync.read(expectedBuffer);
if (expected.width !== actual.width || expected.height !== actual.height) {
return {
errorMessage: `Sizes differ: expected image ${expected.width}px X ${expected.height}px, but got ${actual.width}px X ${actual.height}px. `
};
}
var diff = new PNG({width: expected.width, height: expected.height});
var count = pixelmatch(expected.data, actual.data, diff.data, expected.width, expected.height, {threshold: 0.1});
let diff = new PNG({width: expected.width, height: expected.height});
let count = pixelmatch(expected.data, actual.data, diff.data, expected.width, expected.height, {threshold: 0.1});
return count > 0 ? { diff: PNG.sync.write(diff) } : null;
}
@@ -69,14 +69,14 @@ function compareImages(actualBuffer, expectedBuffer) {
function compareText(actual, expectedBuffer) {
if (typeof actual !== 'string')
return { errorMessage: 'Actual result should be string' };
var expected = expectedBuffer.toString('utf-8');
let expected = expectedBuffer.toString('utf-8');
if (expected === actual)
return null;
var diff = new Diff();
var result = diff.main(expected, actual);
let diff = new Diff();
let result = diff.main(expected, actual);
diff.cleanupSemantic(result);
var html = diff.prettyHtml(result);
var diffStylePath = path.join(__dirname, 'diffstyle.css');
let html = diff.prettyHtml(result);
let diffStylePath = path.join(__dirname, 'diffstyle.css');
html = `<link rel="stylesheet" href="file://${diffStylePath}">` + html;
return {
diff: html,
@@ -84,7 +84,7 @@ function compareText(actual, expectedBuffer) {
};
}
var customMatchers = {
let customMatchers = {
toBeGolden: function(util, customEqualityTesters) {
return {
/**
@@ -93,10 +93,10 @@ var customMatchers = {
* @return {!{pass: boolean, message: (undefined|string)}}
*/
compare: function(actual, goldenName) {
var expectedPath = path.join(GOLDEN_DIR, goldenName);
var actualPath = path.join(OUTPUT_DIR, goldenName);
let expectedPath = path.join(GOLDEN_DIR, goldenName);
let actualPath = path.join(OUTPUT_DIR, goldenName);
var messageSuffix = 'Output is saved in "' + path.basename(OUTPUT_DIR + '" directory');
let messageSuffix = 'Output is saved in "' + path.basename(OUTPUT_DIR + '" directory');
if (!fs.existsSync(expectedPath)) {
ensureOutputDir();
@@ -106,15 +106,15 @@ var customMatchers = {
message: goldenName + ' is missing in golden results. ' + messageSuffix
};
}
var expected = fs.readFileSync(expectedPath);
var comparator = GoldenComparators[mime.lookup(goldenName)];
let expected = fs.readFileSync(expectedPath);
let comparator = GoldenComparators[mime.lookup(goldenName)];
if (!comparator) {
return {
pass: false,
message: 'Failed to find comparator with type ' + mime.lookup(goldenName) + ': ' + goldenName
};
}
var result = comparator(actual, expected);
let result = comparator(actual, expected);
if (!result)
return { pass: true };
ensureOutputDir();
@@ -122,11 +122,11 @@ var customMatchers = {
// Copy expected to the output/ folder for convenience.
fs.writeFileSync(addSuffix(actualPath, '-expected'), expected);
if (result.diff) {
var diffPath = addSuffix(actualPath, '-diff', result.diffExtension);
let diffPath = addSuffix(actualPath, '-diff', result.diffExtension);
fs.writeFileSync(diffPath, result.diff);
}
var message = goldenName + ' mismatch!';
let message = goldenName + ' mismatch!';
if (result.errorMessage)
message += ' ' + result.errorMessage;
return {
@@ -150,8 +150,8 @@ var customMatchers = {
* @return {string}
*/
function addSuffix(filePath, suffix, customExtension) {
var dirname = path.dirname(filePath);
var ext = path.extname(filePath);
var name = path.basename(filePath, ext);
let dirname = path.dirname(filePath);
let ext = path.extname(filePath);
let name = path.basename(filePath, ext);
return path.join(dirname, name + suffix + (customExtension || ext));
}

88
test/test.js
View File

@@ -14,21 +14,21 @@
* limitations under the License.
*/
var path = require('path');
var Browser = require('../lib/Browser');
var StaticServer = require('./StaticServer');
var GoldenUtils = require('./golden-utils');
let path = require('path');
let Browser = require('../lib/Browser');
let StaticServer = require('./StaticServer');
let GoldenUtils = require('./golden-utils');
var PORT = 8907;
var STATIC_PREFIX = 'http://localhost:' + PORT;
var EMPTY_PAGE = STATIC_PREFIX + '/empty.html';
let PORT = 8907;
let STATIC_PREFIX = 'http://localhost:' + PORT;
let EMPTY_PAGE = STATIC_PREFIX + '/empty.html';
jasmine.DEFAULT_TIMEOUT_INTERVAL = 10 * 1000;
describe('Puppeteer', function() {
var browser;
var staticServer;
var page;
let browser;
let staticServer;
let page;
beforeAll(function() {
browser = new Browser({args: ['--no-sandbox']});
@@ -52,11 +52,11 @@ describe('Puppeteer', function() {
describe('Page.evaluate', function() {
it('should work', SX(async function() {
var result = await page.evaluate(() => 7 * 3);
let result = await page.evaluate(() => 7 * 3);
expect(result).toBe(21);
}));
it('should await promise', SX(async function() {
var result = await page.evaluate(() => Promise.resolve(8 * 7));
let result = await page.evaluate(() => Promise.resolve(8 * 7));
expect(result).toBe(56);
}));
it('should work from-inside inPageCallback', SX(async function() {
@@ -64,13 +64,13 @@ describe('Puppeteer', function() {
await page.setInPageCallback('callController', async function(a, b) {
return await page.evaluate((a, b) => a * b, a, b);
});
var result = await page.evaluate(async function() {
let result = await page.evaluate(async function() {
return await callController(9, 3);
});
expect(result).toBe(27);
}));
it('should reject promise with exception', SX(async function() {
var error = null;
let error = null;
try {
await page.evaluate(() => not.existing.object.property);
} catch (e) {
@@ -82,7 +82,7 @@ describe('Puppeteer', function() {
});
it('Page Events: ConsoleMessage', SX(async function() {
var msgs = [];
let msgs = [];
page.on('consolemessage', msg => msgs.push(msg));
await page.evaluate(() => console.log('Message!'));
expect(msgs).toEqual(['Message!']);
@@ -90,11 +90,11 @@ describe('Puppeteer', function() {
describe('Page.navigate', function() {
it('should fail when navigating to bad url', SX(async function() {
var success = await page.navigate('asdfasdf');
let success = await page.navigate('asdfasdf');
expect(success).toBe(false);
}));
it('should succeed when navigating to good url', SX(async function() {
var success = await page.navigate(EMPTY_PAGE);
let success = await page.navigate(EMPTY_PAGE);
expect(success).toBe(true);
}));
});
@@ -104,7 +104,7 @@ describe('Puppeteer', function() {
await page.setInPageCallback('callController', function(a, b) {
return a * b;
});
var result = await page.evaluate(async function() {
let result = await page.evaluate(async function() {
return await callController(9, 4);
});
expect(result).toBe(36);
@@ -115,7 +115,7 @@ describe('Puppeteer', function() {
});
await page.navigate(EMPTY_PAGE);
var result = await page.evaluate(async function() {
let result = await page.evaluate(async function() {
return await callController(9, 4);
});
expect(result).toBe(36);
@@ -125,7 +125,7 @@ describe('Puppeteer', function() {
return Promise.resolve(a * b);
});
var result = await page.evaluate(async function() {
let result = await page.evaluate(async function() {
return await callController(3, 5);
});
expect(result).toBe(15);
@@ -141,7 +141,7 @@ describe('Puppeteer', function() {
expect(request.postData()).toBe(undefined);
request.continue();
});
var success = await page.navigate(EMPTY_PAGE);
let success = await page.navigate(EMPTY_PAGE);
expect(success).toBe(true);
}));
it('should show extraHTTPHeaders', SX(async function() {
@@ -152,7 +152,7 @@ describe('Puppeteer', function() {
expect(request.headers()['foo']).toBe('bar');
request.continue();
});
var success = await page.navigate(EMPTY_PAGE);
let success = await page.navigate(EMPTY_PAGE);
expect(success).toBe(true);
}));
it('should be abortable', SX(async function() {
@@ -162,9 +162,9 @@ describe('Puppeteer', function() {
else
request.continue();
});
var failedResources = 0;
let failedResources = 0;
page.on('resourceloadingfailed', event => ++failedResources);
var success = await page.navigate(STATIC_PREFIX + '/one-style.html');
let success = await page.navigate(STATIC_PREFIX + '/one-style.html');
expect(success).toBe(true);
expect(failedResources).toBe(1);
}));
@@ -186,7 +186,7 @@ describe('Puppeteer', function() {
expect(dialog.message()).toBe('question?');
dialog.accept('answer!');
});
var result = await page.evaluate(() => prompt('question?'));
let result = await page.evaluate(() => prompt('question?'));
expect(result).toBe('answer!');
}));
});
@@ -205,13 +205,13 @@ describe('Puppeteer', function() {
it('should work', SX(async function() {
await page.setViewportSize({width: 500, height: 500});
await page.navigate(STATIC_PREFIX + '/grid.html');
var screenshot = await page.screenshot();
let screenshot = await page.screenshot();
expect(screenshot).toBeGolden('screenshot-sanity.png');
}));
it('should clip rect', SX(async function() {
await page.setViewportSize({width: 500, height: 500});
await page.navigate(STATIC_PREFIX + '/grid.html');
var screenshot = await page.screenshot({
let screenshot = await page.screenshot({
clip: {
x: 50,
y: 100,
@@ -224,7 +224,7 @@ describe('Puppeteer', function() {
it('should work for offscreen clip', SX(async function() {
await page.setViewportSize({width: 500, height: 500});
await page.navigate(STATIC_PREFIX + '/grid.html');
var screenshot = await page.screenshot({
let screenshot = await page.screenshot({
clip: {
x: 50,
y: 600,
@@ -237,8 +237,8 @@ describe('Puppeteer', function() {
it('should run in parallel', SX(async function() {
await page.setViewportSize({width: 500, height: 500});
await page.navigate(STATIC_PREFIX + '/grid.html');
var promises = [];
for (var i = 0; i < 3; ++i) {
let promises = [];
for (let i = 0; i < 3; ++i) {
promises.push(page.screenshot({
clip: {
x: 50 * i,
@@ -248,13 +248,13 @@ describe('Puppeteer', function() {
}
}));
}
var screenshot = await promises[1];
let screenshot = await promises[1];
expect(screenshot).toBeGolden('screenshot-parallel-calls.png');
}));
it('should take fullPage screenshots', SX(async function() {
await page.setViewportSize({width: 500, height: 500});
await page.navigate(STATIC_PREFIX + '/grid.html');
var screenshot = await page.screenshot({
let screenshot = await page.screenshot({
fullPage: true
});
expect(screenshot).toBeGolden('screenshot-grid-fullpage.png');
@@ -262,7 +262,7 @@ describe('Puppeteer', function() {
});
describe('Frame Management', function() {
var FrameUtils = require('./frame-utils');
let FrameUtils = require('./frame-utils');
it('should handle nested frames', SX(async function() {
await page.navigate(STATIC_PREFIX + '/frames/nested-frames.html');
expect(FrameUtils.dumpFrames(page.mainFrame())).toBeGolden('nested-frames.txt');
@@ -270,21 +270,21 @@ describe('Puppeteer', function() {
it('should send events when frames are manipulated dynamically', SX(async function() {
await page.navigate(EMPTY_PAGE);
// validate frameattached events
var attachedFrames = [];
let attachedFrames = [];
page.on('frameattached', frame => attachedFrames.push(frame));
await FrameUtils.attachFrame(page, 'frame1', './assets/frame.html');
expect(attachedFrames.length).toBe(1);
expect(attachedFrames[0].url()).toContain('/assets/frame.html');
// validate framenavigated events
var navigatedFrames = [];
let navigatedFrames = [];
page.on('framenavigated', frame => navigatedFrames.push(frame));
await FrameUtils.navigateFrame(page, 'frame1', './empty.html');
expect(navigatedFrames.length).toBe(1);
expect(navigatedFrames[0].url()).toContain('/empty.html');
// validate framedetached events
var detachedFrames = [];
let detachedFrames = [];
page.on('framedetached', frame => detachedFrames.push(frame));
await FrameUtils.detachFrame(page, 'frame1');
expect(detachedFrames.length).toBe(1);
@@ -292,21 +292,21 @@ describe('Puppeteer', function() {
}));
it('should persist mainFrame on cross-process navigation', SX(async function() {
await page.navigate(EMPTY_PAGE);
var mainFrame = page.mainFrame();
let mainFrame = page.mainFrame();
await page.navigate('http://127.0.0.1:' + PORT + '/empty.html');
expect(page.mainFrame() === mainFrame).toBeTruthy();
}));
it('should not send attach/detach events for main frame', SX(async function() {
var hasEvents = false;
let hasEvents = false;
page.on('frameattached', frame => hasEvents = true);
page.on('framedetached', frame => hasEvents = true);
await page.navigate(EMPTY_PAGE);
expect(hasEvents).toBe(false);
}));
it('should detach child frames on navigation', SX(async function() {
var attachedFrames = [];
var detachedFrames = [];
var navigatedFrames = [];
let attachedFrames = [];
let detachedFrames = [];
let navigatedFrames = [];
page.on('frameattached', frame => attachedFrames.push(frame));
page.on('framedetached', frame => detachedFrames.push(frame));
page.on('framenavigated', frame => navigatedFrames.push(frame));
@@ -315,9 +315,9 @@ describe('Puppeteer', function() {
expect(detachedFrames.length).toBe(0);
expect(navigatedFrames.length).toBe(5);
var attachedFrames = [];
var detachedFrames = [];
var navigatedFrames = [];
attachedFrames = [];
detachedFrames = [];
navigatedFrames = [];
await page.navigate(EMPTY_PAGE);
expect(attachedFrames.length).toBe(0);
expect(detachedFrames.length).toBe(4);