Bläddra i källkod

Merge pull request #20125 from munrocket/cleanup

E2E: minor cleanup
Mr.doob 5 år sedan
förälder
incheckning
d290ea2f43
2 ändrade filer med 21 tillägg och 16 borttagningar
  1. 14 9
      test/e2e/deterministic-injection.js
  2. 7 7
      test/e2e/puppeteer.js

+ 14 - 9
test/e2e/deterministic-injection.js

@@ -16,23 +16,25 @@
 
 	/* Deterministic timer */
 
+	window.performance._now = performance.now;
+
 	let frameId = 0;
 	const now = () => frameId * 16;
 	window.Date.now = now;
 	window.Date.prototype.getTime = now;
-	window.performance.wow = performance.now;
 	window.performance.now = now;
 
 
 	/* Deterministic RAF */
 
-	window.chromeMaxFrameId = 2;
-	window.chromeRenderStarted = false;
-	window.chromeRenderFinished = false;
 	const RAF = window.requestAnimationFrame;
+	window._renderStarted = false;
+	window._renderFinished = false;
+
+	const maxFrameId = 2;
 	window.requestAnimationFrame = function ( cb ) {
 
-		if ( ! chromeRenderStarted ) {
+		if ( ! _renderStarted ) {
 
 			setTimeout( function () {
 
@@ -44,13 +46,13 @@
 
 			RAF( function () {
 
-				if ( frameId ++ < chromeMaxFrameId ) {
+				if ( frameId ++ < maxFrameId ) {
 
 					cb( now() );
 
 				} else {
 
-					chromeRenderFinished = true;
+					_renderFinished = true;
 
 				}
 
@@ -63,7 +65,8 @@
 
 	/* Semi-determitistic video */
 
-	let play = HTMLVideoElement.prototype.play;
+	const play = HTMLVideoElement.prototype.play;
+
 	HTMLVideoElement.prototype.play = async function () {
 
 		play.call( this );
@@ -81,6 +84,8 @@
 
 	};
 
-	TESTING = true;
+	/* Additional variable for ~5 examples */
+
+	window.TESTING = true;
 
 }() );

+ 7 - 7
test/e2e/puppeteer.js

@@ -194,16 +194,16 @@ const pup = puppeteer.launch( {
 
 					/* Resolve render promise */
 
-					window.chromeRenderStarted = true;
+					window._renderStarted = true;
 					await new Promise( function ( resolve ) {
 
-						performance.wow = performance.wow || performance.now;
-						let renderStart = performance.wow();
+						performance._now = performance._now || performance.now;
+						let renderStart = performance._now();
 
 						let waitingLoop = setInterval( function () {
 
-							let renderEcceded = ( performance.wow() - renderStart > renderTimeout * attemptProgress );
-							if ( window.chromeRenderFinished || renderEcceded ) {
+							let renderEcceded = ( performance._now() - renderStart > renderTimeout * attemptProgress );
+							if ( window._renderFinished || renderEcceded ) {
 
 								if ( renderEcceded ) {
 
@@ -226,7 +226,7 @@ const pup = puppeteer.launch( {
 
 				if ( ++ attemptId === maxAttemptId ) {
 
-					console.red( `WTF? 'Network timeout' is small for your machine. file: ${ file } \n${ e }` );
+					console.red( `Something completely wrong. 'Network timeout' is small for your machine. file: ${ file } \n${ e }` );
 					failedScreenshots.push( file );
 					continue;
 
@@ -276,7 +276,7 @@ const pup = puppeteer.launch( {
 				} catch {
 
 					attemptId = maxAttemptId;
-					console.red( `ERROR! Image sizes does not match in file: ${ file }` );
+					console.red( `Something completely wrong. Image sizes does not match in file: ${ file }` );
 					failedScreenshots.push( file );
 					continue;