<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[212533] trunk/Websites/perf.webkit.org</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/212533">212533</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-16 21:36:05 -0800 (Thu, 16 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use expect.js instead of expect in browser tests
https://bugs.webkit.org/show_bug.cgi?id=168492
Reviewed by Joseph Pecoraro.
Use expect.js (https://github.com/Automattic/expect.js) instead of expect (https://github.com/mjackson/expect).
* browser-tests/close-button-tests.js:
* browser-tests/component-base-tests.js:
* browser-tests/editable-text-tests.js:
* browser-tests/index.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesperfwebkitorgbrowsertestsclosebuttontestsjs">trunk/Websites/perf.webkit.org/browser-tests/close-button-tests.js</a></li>
<li><a href="#trunkWebsitesperfwebkitorgbrowsertestscomponentbasetestsjs">trunk/Websites/perf.webkit.org/browser-tests/component-base-tests.js</a></li>
<li><a href="#trunkWebsitesperfwebkitorgbrowsertestseditabletexttestsjs">trunk/Websites/perf.webkit.org/browser-tests/editable-text-tests.js</a></li>
<li><a href="#trunkWebsitesperfwebkitorgbrowsertestsindexhtml">trunk/Websites/perf.webkit.org/browser-tests/index.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebsitesperfwebkitorgChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/ChangeLog (212532 => 212533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog 2017-02-17 05:28:26 UTC (rev 212532)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2017-02-17 05:36:05 UTC (rev 212533)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2017-02-16 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><ins>+ Use expect.js instead of expect in browser tests
+ https://bugs.webkit.org/show_bug.cgi?id=168492
+
+ Reviewed by Joseph Pecoraro.
+
+ Use expect.js (https://github.com/Automattic/expect.js) instead of expect (https://github.com/mjackson/expect).
+
+ * browser-tests/close-button-tests.js:
+ * browser-tests/component-base-tests.js:
+ * browser-tests/editable-text-tests.js:
+ * browser-tests/index.html:
+
+2017-02-16 Ryosuke Niwa <rniwa@webkit.org>
+
</ins><span class="cx"> Modernize and fix measurement-set tests
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=168484
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgbrowsertestsclosebuttontestsjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/browser-tests/close-button-tests.js (212532 => 212533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/browser-tests/close-button-tests.js 2017-02-17 05:28:26 UTC (rev 212532)
+++ trunk/Websites/perf.webkit.org/browser-tests/close-button-tests.js 2017-02-17 05:36:05 UTC (rev 212533)
</span><span class="lines">@@ -14,11 +14,11 @@
</span><span class="cx"> closeButton.listenToAction('activate', () => {
</span><span class="cx"> activateCount++;
</span><span class="cx"> });
</span><del>- expect(activateCount).toBe(0);
</del><ins>+ expect(activateCount).to.be(0);
</ins><span class="cx"> closeButton.content().querySelector('a').click();
</span><del>- expect(activateCount).toBe(1);
</del><ins>+ expect(activateCount).to.be(1);
</ins><span class="cx"> closeButton.content().querySelector('a').click();
</span><del>- expect(activateCount).toBe(2);
</del><ins>+ expect(activateCount).to.be(2);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgbrowsertestscomponentbasetestsjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/browser-tests/component-base-tests.js (212532 => 212533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/browser-tests/component-base-tests.js 2017-02-17 05:28:26 UTC (rev 212532)
+++ trunk/Websites/perf.webkit.org/browser-tests/component-base-tests.js 2017-02-17 05:36:05 UTC (rev 212533)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> describe('constructor', () => {
</span><span class="cx"> it('is a function', () => {
</span><span class="cx"> return new BrowsingContext().importScript('components/base.js', 'ComponentBase').then((ComponentBase) => {
</span><del>- expect(ComponentBase).toBeA('function');
</del><ins>+ expect(ComponentBase).to.be.a('function');
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -35,15 +35,15 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> let instance = new SomeComponent;
</span><del>- expect(instance).toBeA(ComponentBase);
- expect(instance).toBeA(SomeComponent);
- expect(callCount).toBe(1);
</del><ins>+ expect(instance).to.be.a(ComponentBase);
+ expect(instance).to.be.a(SomeComponent);
+ expect(callCount).to.be(1);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> it('must not create shadow tree eagerly', () => {
</span><span class="cx"> return createTestToCheckExistenceOfShadowTree((instance, hasShadowTree) => {
</span><del>- expect(hasShadowTree()).toBe(false);
</del><ins>+ expect(hasShadowTree()).to.be(false);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> return context.importScript('components/base.js', 'ComponentBase').then((ComponentBase) => {
</span><span class="cx"> class SomeComponent extends ComponentBase { }
</span><span class="cx"> let instance = new SomeComponent('some-component');
</span><del>- expect(instance.element()).toBeA(context.global.HTMLElement);
</del><ins>+ expect(instance.element()).to.be.a(context.global.HTMLElement);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> return new BrowsingContext().importScript('components/base.js', 'ComponentBase').then((ComponentBase) => {
</span><span class="cx"> class SomeComponent extends ComponentBase { }
</span><span class="cx"> let instance = new SomeComponent('some-component');
</span><del>- expect(instance.element().component()).toBe(instance);
</del><ins>+ expect(instance.element().component()).to.be(instance);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> it('must not create shadow tree eagerly', () => {
</span><span class="cx"> return createTestToCheckExistenceOfShadowTree((instance, hasShadowTree) => {
</span><span class="cx"> instance.element();
</span><del>- expect(hasShadowTree()).toBe(false);
</del><ins>+ expect(hasShadowTree()).to.be(false);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="lines">@@ -78,13 +78,13 @@
</span><span class="cx"> it('must create shadow tree', () => {
</span><span class="cx"> return createTestToCheckExistenceOfShadowTree((instance, hasShadowTree) => {
</span><span class="cx"> instance.content();
</span><del>- expect(hasShadowTree()).toBe(true);
</del><ins>+ expect(hasShadowTree()).to.be(true);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> it('must return the same shadow tree each time it is called', () => {
</span><span class="cx"> return createTestToCheckExistenceOfShadowTree((instance, hasShadowTree) => {
</span><del>- expect(instance.content()).toBe(instance.content());
</del><ins>+ expect(instance.content()).to.be(instance.content());
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -97,9 +97,9 @@
</span><span class="cx">
</span><span class="cx"> const instance = new SomeComponent;
</span><span class="cx"> const part1 = instance.content('part1');
</span><del>- expect(part1.localName).toBe('div');
- expect(part1.title).toBe('foo');
- expect(instance.content('part2')).toBe(null);
</del><ins>+ expect(part1.localName).to.be('div');
+ expect(part1.title).to.be('foo');
+ expect(instance.content('part2')).to.be(null);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> it('must create shadow tree', () => {
</span><span class="cx"> return createTestToCheckExistenceOfShadowTree((instance, hasShadowTree) => {
</span><span class="cx"> instance.part('foo');
</span><del>- expect(hasShadowTree()).toBe(true);
</del><ins>+ expect(hasShadowTree()).to.be(true);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -124,10 +124,10 @@
</span><span class="cx">
</span><span class="cx"> const otherComponent = new OtherComponent;
</span><span class="cx"> const someComponent = otherComponent.part('foo');
</span><del>- expect(someComponent).toBeA(SomeComponent);
- expect(someComponent.element().id).toBe('foo');
- expect(otherComponent.part('foo')).toBe(someComponent);
- expect(otherComponent.part('bar')).toBe(null);
</del><ins>+ expect(someComponent).to.be.a(SomeComponent);
+ expect(someComponent.element().id).to.be('foo');
+ expect(otherComponent.part('foo')).to.be(someComponent);
+ expect(otherComponent.part('bar')).to.be(null);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="lines">@@ -147,10 +147,10 @@
</span><span class="cx"> const object = {'foo': 1};
</span><span class="cx"> instance.dispatchAction('action', 'bar', object, 5);
</span><span class="cx">
</span><del>- expect(calls.length).toBe(1);
- expect(calls[0][0]).toBe('bar');
- expect(calls[0][1]).toBe(object);
- expect(calls[0][2]).toBe(5);
</del><ins>+ expect(calls.length).to.be(1);
+ expect(calls[0][0]).to.be('bar');
+ expect(calls[0][1]).to.be(object);
+ expect(calls[0][2]).to.be(5);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -178,10 +178,10 @@
</span><span class="cx"> ComponentBase.defineElement('some-component', SomeComponent);
</span><span class="cx">
</span><span class="cx"> (new SomeComponent).enqueueToRender();
</span><del>- expect(renderCallCount).toBe(0);
</del><ins>+ expect(renderCallCount).to.be(0);
</ins><span class="cx">
</span><span class="cx"> (new SomeComponent).enqueueToRender();
</span><del>- expect(renderCallCount).toBe(0);
</del><ins>+ expect(renderCallCount).to.be(0);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -194,21 +194,21 @@
</span><span class="cx"> const SomeComponent = class extends ComponentBase { }
</span><span class="cx"> ComponentBase.defineElement('some-component', SomeComponent);
</span><span class="cx">
</span><del>- expect(requestAnimationFrameCount).toBe(0);
</del><ins>+ expect(requestAnimationFrameCount).to.be(0);
</ins><span class="cx"> let instance = new SomeComponent;
</span><span class="cx"> instance.enqueueToRender();
</span><del>- expect(requestAnimationFrameCount).toBe(1);
</del><ins>+ expect(requestAnimationFrameCount).to.be(1);
</ins><span class="cx">
</span><span class="cx"> instance.enqueueToRender();
</span><del>- expect(requestAnimationFrameCount).toBe(1);
</del><ins>+ expect(requestAnimationFrameCount).to.be(1);
</ins><span class="cx">
</span><span class="cx"> (new SomeComponent).enqueueToRender();
</span><del>- expect(requestAnimationFrameCount).toBe(1);
</del><ins>+ expect(requestAnimationFrameCount).to.be(1);
</ins><span class="cx">
</span><span class="cx"> const AnotherComponent = class extends ComponentBase { }
</span><span class="cx"> ComponentBase.defineElement('another-component', AnotherComponent);
</span><span class="cx"> (new AnotherComponent).enqueueToRender();
</span><del>- expect(requestAnimationFrameCount).toBe(1);
</del><ins>+ expect(requestAnimationFrameCount).to.be(1);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -217,8 +217,8 @@
</span><span class="cx"> return context.importScripts(['instrumentation.js', 'components/base.js'], 'ComponentBase').then((ComponentBase) => {
</span><span class="cx"> let callback = null;
</span><span class="cx"> context.global.requestAnimationFrame = (newCallback) => {
</span><del>- expect(callback).toBe(null);
- expect(newCallback).toNotBe(null);
</del><ins>+ expect(callback).to.be(null);
+ expect(newCallback).to.not.be(null);
</ins><span class="cx"> callback = newCallback;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> }
</span><span class="cx"> ComponentBase.defineElement('some-component', SomeComponent);
</span><span class="cx">
</span><del>- expect(renderCalls.length).toBe(0);
</del><ins>+ expect(renderCalls.length).to.be(0);
</ins><span class="cx"> const instance = new SomeComponent;
</span><span class="cx"> instance.enqueueToRender();
</span><span class="cx"> instance.enqueueToRender();
</span><span class="lines">@@ -237,13 +237,13 @@
</span><span class="cx">
</span><span class="cx"> const anotherInstance = new SomeComponent;
</span><span class="cx"> anotherInstance.enqueueToRender();
</span><del>- expect(renderCalls.length).toBe(0);
</del><ins>+ expect(renderCalls.length).to.be(0);
</ins><span class="cx">
</span><span class="cx"> callback();
</span><span class="cx">
</span><del>- expect(renderCalls.length).toBe(2);
- expect(renderCalls[0]).toBe(instance);
- expect(renderCalls[1]).toBe(anotherInstance);
</del><ins>+ expect(renderCalls.length).to.be(2);
+ expect(renderCalls[0]).to.be(instance);
+ expect(renderCalls[1]).to.be(anotherInstance);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -252,8 +252,8 @@
</span><span class="cx"> return context.importScripts(['instrumentation.js', 'components/base.js'], 'ComponentBase').then((ComponentBase) => {
</span><span class="cx"> let callback = null;
</span><span class="cx"> context.global.requestAnimationFrame = (newCallback) => {
</span><del>- expect(callback).toBe(null);
- expect(newCallback).toNotBe(null);
</del><ins>+ expect(callback).to.be(null);
+ expect(newCallback).to.not.be(null);
</ins><span class="cx"> callback = newCallback;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -269,7 +269,7 @@
</span><span class="cx"> }
</span><span class="cx"> ComponentBase.defineElement('some-component', SomeComponent);
</span><span class="cx">
</span><del>- expect(renderCalls.length).toBe(0);
</del><ins>+ expect(renderCalls.length).to.be(0);
</ins><span class="cx"> const instance = new SomeComponent;
</span><span class="cx"> const anotherInstance = new SomeComponent;
</span><span class="cx"> instance.enqueueToRender();
</span><span class="lines">@@ -276,9 +276,9 @@
</span><span class="cx"> instanceToEnqueue = anotherInstance;
</span><span class="cx"> callback();
</span><span class="cx"> callback = null;
</span><del>- expect(renderCalls.length).toBe(2);
- expect(renderCalls[0]).toBe(instance);
- expect(renderCalls[1]).toBe(anotherInstance);
</del><ins>+ expect(renderCalls.length).to.be(2);
+ expect(renderCalls[0]).to.be(instance);
+ expect(renderCalls[1]).to.be(anotherInstance);
</ins><span class="cx"> renderCalls = [];
</span><span class="cx">
</span><span class="cx"> instance.enqueueToRender();
</span><span class="lines">@@ -285,10 +285,10 @@
</span><span class="cx"> anotherInstance.enqueueToRender();
</span><span class="cx"> instanceToEnqueue = instance;
</span><span class="cx"> callback();
</span><del>- expect(renderCalls.length).toBe(3);
- expect(renderCalls[0]).toBe(instance);
- expect(renderCalls[1]).toBe(anotherInstance);
- expect(renderCalls[2]).toBe(instance);
</del><ins>+ expect(renderCalls.length).to.be(3);
+ expect(renderCalls[0]).to.be(instance);
+ expect(renderCalls[1]).to.be(anotherInstance);
+ expect(renderCalls[2]).to.be(instance);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -298,8 +298,8 @@
</span><span class="cx"> let requestAnimationFrameCount = 0;
</span><span class="cx"> let callback = null;
</span><span class="cx"> context.global.requestAnimationFrame = (newCallback) => {
</span><del>- expect(callback).toBe(null);
- expect(newCallback).toNotBe(null);
</del><ins>+ expect(callback).to.be(null);
+ expect(newCallback).to.not.be(null);
</ins><span class="cx"> callback = newCallback;
</span><span class="cx"> requestAnimationFrameCount++;
</span><span class="cx"> }
</span><span class="lines">@@ -312,35 +312,35 @@
</span><span class="cx">
</span><span class="cx"> const instance = new SomeComponent;
</span><span class="cx"> const anotherInstance = new SomeComponent;
</span><del>- expect(requestAnimationFrameCount).toBe(0);
</del><ins>+ expect(requestAnimationFrameCount).to.be(0);
</ins><span class="cx">
</span><span class="cx"> instance.enqueueToRender();
</span><del>- expect(requestAnimationFrameCount).toBe(1);
</del><ins>+ expect(requestAnimationFrameCount).to.be(1);
</ins><span class="cx"> anotherInstance.enqueueToRender();
</span><del>- expect(requestAnimationFrameCount).toBe(1);
</del><ins>+ expect(requestAnimationFrameCount).to.be(1);
</ins><span class="cx">
</span><del>- expect(renderCalls.length).toBe(0);
</del><ins>+ expect(renderCalls.length).to.be(0);
</ins><span class="cx"> callback();
</span><span class="cx"> callback = null;
</span><del>- expect(renderCalls.length).toBe(2);
- expect(renderCalls[0]).toBe(instance);
- expect(renderCalls[1]).toBe(anotherInstance);
- expect(requestAnimationFrameCount).toBe(1);
</del><ins>+ expect(renderCalls.length).to.be(2);
+ expect(renderCalls[0]).to.be(instance);
+ expect(renderCalls[1]).to.be(anotherInstance);
+ expect(requestAnimationFrameCount).to.be(1);
</ins><span class="cx">
</span><span class="cx"> anotherInstance.enqueueToRender();
</span><del>- expect(requestAnimationFrameCount).toBe(2);
</del><ins>+ expect(requestAnimationFrameCount).to.be(2);
</ins><span class="cx"> instance.enqueueToRender();
</span><del>- expect(requestAnimationFrameCount).toBe(2);
</del><ins>+ expect(requestAnimationFrameCount).to.be(2);
</ins><span class="cx">
</span><del>- expect(renderCalls.length).toBe(2);
</del><ins>+ expect(renderCalls.length).to.be(2);
</ins><span class="cx"> callback();
</span><span class="cx"> callback = null;
</span><del>- expect(renderCalls.length).toBe(4);
- expect(renderCalls[0]).toBe(instance);
- expect(renderCalls[1]).toBe(anotherInstance);
- expect(renderCalls[2]).toBe(anotherInstance);
- expect(renderCalls[3]).toBe(instance);
- expect(requestAnimationFrameCount).toBe(2);
</del><ins>+ expect(renderCalls.length).to.be(4);
+ expect(renderCalls[0]).to.be(instance);
+ expect(renderCalls[1]).to.be(anotherInstance);
+ expect(renderCalls[2]).to.be(anotherInstance);
+ expect(renderCalls[3]).to.be(instance);
+ expect(requestAnimationFrameCount).to.be(2);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -350,7 +350,7 @@
</span><span class="cx"> it('must create shadow tree', () => {
</span><span class="cx"> return createTestToCheckExistenceOfShadowTree((instance, hasShadowTree) => {
</span><span class="cx"> instance.render();
</span><del>- expect(hasShadowTree()).toBe(true);
</del><ins>+ expect(hasShadowTree()).to.be(true);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx"> it('must not create shadow tree when neither htmlTemplate nor cssTemplate are present', () => {
</span><span class="cx"> return createTestToCheckExistenceOfShadowTree((instance, hasShadowTree) => {
</span><span class="cx"> instance.render();
</span><del>- expect(hasShadowTree()).toBe(false);
</del><ins>+ expect(hasShadowTree()).to.be(false);
</ins><span class="cx"> }, {htmlTemplate: false, cssTemplate: false});
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -364,7 +364,7 @@
</span><span class="cx"> it('must create shadow tree when htmlTemplate is present and cssTemplate is not', () => {
</span><span class="cx"> return createTestToCheckExistenceOfShadowTree((instance, hasShadowTree) => {
</span><span class="cx"> instance.render();
</span><del>- expect(hasShadowTree()).toBe(true);
</del><ins>+ expect(hasShadowTree()).to.be(true);
</ins><span class="cx"> }, {htmlTemplate: true, cssTemplate: false});
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -371,7 +371,7 @@
</span><span class="cx"> it('must create shadow tree when cssTemplate is present and htmlTemplate is not', () => {
</span><span class="cx"> return createTestToCheckExistenceOfShadowTree((instance, hasShadowTree) => {
</span><span class="cx"> instance.render();
</span><del>- expect(hasShadowTree()).toBe(true);
</del><ins>+ expect(hasShadowTree()).to.be(true);
</ins><span class="cx"> }, {htmlTemplate: false, cssTemplate: true});
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx"> class SomeComponent extends ComponentBase {
</span><span class="cx"> didConstructShadowTree()
</span><span class="cx"> {
</span><del>- expect(this.content()).toBeA(context.global.ShadowRoot);
</del><ins>+ expect(this.content()).to.be.a(context.global.ShadowRoot);
</ins><span class="cx"> didConstructShadowTreeCount++;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -397,11 +397,11 @@
</span><span class="cx"> ComponentBase.defineElement('some-component', SomeComponent);
</span><span class="cx">
</span><span class="cx"> const instance = new SomeComponent;
</span><del>- expect(didConstructShadowTreeCount).toBe(0);
- expect(htmlTemplateCount).toBe(0);
</del><ins>+ expect(didConstructShadowTreeCount).to.be(0);
+ expect(htmlTemplateCount).to.be(0);
</ins><span class="cx"> instance.render();
</span><del>- expect(didConstructShadowTreeCount).toBe(1);
- expect(htmlTemplateCount).toBe(1);
</del><ins>+ expect(didConstructShadowTreeCount).to.be(1);
+ expect(htmlTemplateCount).to.be(1);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="lines">@@ -415,8 +415,8 @@
</span><span class="cx"> ComponentBase.defineElement('some-component', SomeComponent);
</span><span class="cx">
</span><span class="cx"> let elementClass = context.global.customElements.get('some-component');
</span><del>- expect(elementClass).toBeA('function');
- expect(elementClass.name).toBe('SomeComponentElement');
</del><ins>+ expect(elementClass).to.be.a('function');
+ expect(elementClass.name).to.be('SomeComponentElement');
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -432,14 +432,14 @@
</span><span class="cx"> }
</span><span class="cx"> ComponentBase.defineElement('some-component', SomeComponent);
</span><span class="cx">
</span><del>- expect(instances.length).toBe(0);
</del><ins>+ expect(instances.length).to.be(0);
</ins><span class="cx"> let element = context.document.createElement('some-component');
</span><del>- expect(instances.length).toBe(1);
</del><ins>+ expect(instances.length).to.be(1);
</ins><span class="cx">
</span><del>- expect(element).toBeA(context.global.HTMLElement);
- expect(element.component()).toBe(instances[0]);
- expect(instances[0].element()).toBe(element);
- expect(instances.length).toBe(1);
</del><ins>+ expect(element).to.be.a(context.global.HTMLElement);
+ expect(element.component()).to.be(instances[0]);
+ expect(instances[0].element()).to.be(element);
+ expect(instances.length).to.be(1);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -455,14 +455,14 @@
</span><span class="cx"> }
</span><span class="cx"> ComponentBase.defineElement('some-component', SomeComponent);
</span><span class="cx">
</span><del>- expect(instances.length).toBe(0);
</del><ins>+ expect(instances.length).to.be(0);
</ins><span class="cx"> let component = new SomeComponent;
</span><del>- expect(instances.length).toBe(1);
</del><ins>+ expect(instances.length).to.be(1);
</ins><span class="cx">
</span><del>- expect(component).toBe(instances[0]);
- expect(component.element()).toBeA(context.global.HTMLElement);
- expect(component.element().component()).toBe(component);
- expect(instances.length).toBe(1);
</del><ins>+ expect(component).to.be(instances[0]);
+ expect(component.element()).to.be.a(context.global.HTMLElement);
+ expect(component.element().component()).to.be(component);
+ expect(instances.length).to.be(1);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -481,12 +481,12 @@
</span><span class="cx"> requestAnimationFrameCount++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- expect(requestAnimationFrameCount).toBe(0);
</del><ins>+ expect(requestAnimationFrameCount).to.be(0);
</ins><span class="cx"> const instance = new SomeComponent;
</span><span class="cx"> context.global.dispatchEvent(new Event('resize'));
</span><span class="cx"> context.document.body.appendChild(instance.element());
</span><span class="cx"> context.global.dispatchEvent(new Event('resize'));
</span><del>- expect(requestAnimationFrameCount).toBe(1);
</del><ins>+ expect(requestAnimationFrameCount).to.be(1);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -506,9 +506,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const instance = new SomeComponent;
</span><del>- expect(requestAnimationFrameCount).toBe(0);
</del><ins>+ expect(requestAnimationFrameCount).to.be(0);
</ins><span class="cx"> context.global.dispatchEvent(new Event('resize'));
</span><del>- expect(requestAnimationFrameCount).toBe(0);
</del><ins>+ expect(requestAnimationFrameCount).to.be(0);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgbrowsertestseditabletexttestsjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/browser-tests/editable-text-tests.js (212532 => 212533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/browser-tests/editable-text-tests.js 2017-02-17 05:28:26 UTC (rev 212532)
+++ trunk/Websites/perf.webkit.org/browser-tests/editable-text-tests.js 2017-02-17 05:36:05 UTC (rev 212533)
</span><span class="lines">@@ -31,14 +31,14 @@
</span><span class="cx"> editableText = new EditableText;
</span><span class="cx"> context.document.body.appendChild(editableText.element());
</span><span class="cx"> editableText.enqueueToRender();
</span><del>- return waitToRender(context);
</del><ins>+ return waitForComponentsToRender(context);
</ins><span class="cx"> }).then(() => {
</span><del>- expect(editableText.content().textContent).toNotInclude('hello');
</del><ins>+ expect(editableText.content().textContent).to.not.contain('hello');
</ins><span class="cx"> editableText.setText('hello');
</span><span class="cx"> editableText.enqueueToRender();
</span><del>- return waitToRender(context);
</del><ins>+ return waitForComponentsToRender(context);
</ins><span class="cx"> }).then(() => {
</span><del>- expect(editableText.content().textContent).toInclude('hello');
</del><ins>+ expect(editableText.content().textContent).to.contain('hello');
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -51,18 +51,18 @@
</span><span class="cx"> context.document.body.appendChild(editableText.element());
</span><span class="cx"> editableText.setText('hello');
</span><span class="cx"> editableText.enqueueToRender();
</span><del>- return waitToRender(context);
</del><ins>+ return waitForComponentsToRender(context);
</ins><span class="cx"> }).then(() => {
</span><del>- expect(editableText.content().querySelector('input').offsetHeight).toBe(0);
- expect(editableText.content().textContent).toInclude('hello');
- expect(editableText.content().querySelector('a').textContent).toInclude('Edit');
- expect(editableText.content().querySelector('a').textContent).toNotInclude('Save');
</del><ins>+ expect(editableText.content().querySelector('input').offsetHeight).to.be(0);
+ expect(editableText.content().textContent).to.contain('hello');
+ expect(editableText.content().querySelector('a').textContent).to.contain('Edit');
+ expect(editableText.content().querySelector('a').textContent).to.not.contain('Save');
</ins><span class="cx"> editableText.content().querySelector('a').click();
</span><del>- return waitToRender(context);
</del><ins>+ return waitForComponentsToRender(context);
</ins><span class="cx"> }).then(() => {
</span><del>- expect(editableText.content().querySelector('input').offsetHeight).toNotBe(0);
- expect(editableText.content().querySelector('a').textContent).toNotInclude('Edit');
- expect(editableText.content().querySelector('a').textContent).toInclude('Save');
</del><ins>+ expect(editableText.content().querySelector('input').offsetHeight).to.not.be(0);
+ expect(editableText.content().querySelector('a').textContent).to.not.contain('Edit');
+ expect(editableText.content().querySelector('a').textContent).to.contain('Save');
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -77,21 +77,21 @@
</span><span class="cx"> editableText.setText('hello');
</span><span class="cx"> editableText.enqueueToRender();
</span><span class="cx"> editableText.listenToAction('update', () => updateCount++);
</span><del>- return waitToRender(context);
</del><ins>+ return waitForComponentsToRender(context);
</ins><span class="cx"> }).then(() => {
</span><span class="cx"> editableText.content().querySelector('a').click();
</span><del>- return waitToRender(context);
</del><ins>+ return waitForComponentsToRender(context);
</ins><span class="cx"> }).then(() => {
</span><span class="cx"> const input = editableText.content().querySelector('input');
</span><del>- expect(input.offsetHeight).toNotBe(0);
- expect(editableText.editedText()).toBe('hello');
</del><ins>+ expect(input.offsetHeight).to.not.be(0);
+ expect(editableText.editedText()).to.be('hello');
</ins><span class="cx"> input.value = 'world';
</span><del>- expect(editableText.editedText()).toBe('world');
- expect(updateCount).toBe(0);
</del><ins>+ expect(editableText.editedText()).to.be('world');
+ expect(updateCount).to.be(0);
</ins><span class="cx"> editableText.content().querySelector('a').click();
</span><del>- expect(updateCount).toBe(1);
- expect(editableText.editedText()).toBe('world');
- expect(editableText.text()).toBe('hello');
</del><ins>+ expect(updateCount).to.be(1);
+ expect(editableText.editedText()).to.be('world');
+ expect(editableText.text()).to.be('hello');
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -106,16 +106,16 @@
</span><span class="cx"> editableText.setText('hello');
</span><span class="cx"> editableText.enqueueToRender();
</span><span class="cx"> editableText.listenToAction('update', () => updateCount++);
</span><del>- return waitToRender(context);
</del><ins>+ return waitForComponentsToRender(context);
</ins><span class="cx"> }).then(() => {
</span><span class="cx"> editableText.content().querySelector('a').click();
</span><del>- return waitToRender(context);
</del><ins>+ return waitForComponentsToRender(context);
</ins><span class="cx"> }).then(() => {
</span><span class="cx"> const input = editableText.content().querySelector('input');
</span><del>- expect(input.offsetHeight).toNotBe(0);
- expect(editableText.editedText()).toBe('hello');
</del><ins>+ expect(input.offsetHeight).to.not.be(0);
+ expect(editableText.editedText()).to.be('hello');
</ins><span class="cx"> input.value = 'world';
</span><del>- expect(updateCount).toBe(0);
</del><ins>+ expect(updateCount).to.be(0);
</ins><span class="cx">
</span><span class="cx"> const focusableElement = document.createElement('div');
</span><span class="cx"> focusableElement.setAttribute('tabindex', 0);
</span><span class="lines">@@ -122,11 +122,11 @@
</span><span class="cx"> document.body.appendChild(focusableElement);
</span><span class="cx"> focusableElement.focus();
</span><span class="cx">
</span><del>- return waitToRender(context);
</del><ins>+ return waitForComponentsToRender(context);
</ins><span class="cx"> }).then(() => {
</span><del>- expect(editableText.content().querySelector('input').offsetHeight).toBe(0);
- expect(editableText.text()).toBe('hello');
- expect(updateCount).toBe(0);
</del><ins>+ expect(editableText.content().querySelector('input').offsetHeight).to.be(0);
+ expect(editableText.text()).to.be('hello');
+ expect(updateCount).to.be(0);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -141,23 +141,23 @@
</span><span class="cx"> editableText.setText('hello');
</span><span class="cx"> editableText.enqueueToRender();
</span><span class="cx"> editableText.listenToAction('update', () => updateCount++);
</span><del>- return waitToRender(context);
</del><ins>+ return waitForComponentsToRender(context);
</ins><span class="cx"> }).then(() => {
</span><span class="cx"> editableText.content().querySelector('a').click();
</span><del>- return waitToRender(context);
</del><ins>+ return waitForComponentsToRender(context);
</ins><span class="cx"> }).then(() => {
</span><span class="cx"> const input = editableText.content().querySelector('input');
</span><del>- expect(input.offsetHeight).toNotBe(0);
- expect(editableText.editedText()).toBe('hello');
</del><ins>+ expect(input.offsetHeight).to.not.be(0);
+ expect(editableText.editedText()).to.be('hello');
</ins><span class="cx"> input.value = 'world';
</span><del>- expect(updateCount).toBe(0);
</del><ins>+ expect(updateCount).to.be(0);
</ins><span class="cx"> editableText.content().querySelector('a').focus();
</span><del>- return waitToRender(context);
</del><ins>+ return waitForComponentsToRender(context);
</ins><span class="cx"> }).then(() => {
</span><del>- expect(editableText.content().querySelector('input').offsetHeight).toNotBe(0);
</del><ins>+ expect(editableText.content().querySelector('input').offsetHeight).to.not.be(0);
</ins><span class="cx"> editableText.content().querySelector('a').click();
</span><del>- expect(editableText.editedText()).toBe('world');
- expect(updateCount).toBe(1);
</del><ins>+ expect(editableText.editedText()).to.be('world');
+ expect(updateCount).to.be(1);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -172,17 +172,17 @@
</span><span class="cx"> editableText.setText('hello');
</span><span class="cx"> editableText.enqueueToRender();
</span><span class="cx"> editableText.listenToAction('update', () => updateCount++);
</span><del>- return waitToRender(context);
</del><ins>+ return waitForComponentsToRender(context);
</ins><span class="cx"> }).then(() => {
</span><span class="cx"> editableText.content('action-button').click();
</span><del>- return waitToRender(context);
</del><ins>+ return waitForComponentsToRender(context);
</ins><span class="cx"> }).then(() => {
</span><span class="cx"> const input = editableText.content('text-field');
</span><del>- expect(input.offsetHeight).toNotBe(0);
- expect(editableText.editedText()).toBe('hello');
</del><ins>+ expect(input.offsetHeight).to.not.be(0);
+ expect(editableText.editedText()).to.be('hello');
</ins><span class="cx"> input.value = 'world';
</span><del>- expect(updateCount).toBe(0);
- return waitToRender(context);
</del><ins>+ expect(updateCount).to.be(0);
+ return waitForComponentsToRender(context);
</ins><span class="cx"> }).then(() => {
</span><span class="cx"> editableText.content('action-button').dispatchEvent(new MouseEvent('mousedown'));
</span><span class="cx"> return new Promise((resolve) => setTimeout(resolve, 0));
</span><span class="lines">@@ -189,11 +189,11 @@
</span><span class="cx"> }).then(() => {
</span><span class="cx"> editableText.content('text-field').blur();
</span><span class="cx"> editableText.content('action-button').dispatchEvent(new MouseEvent('mouseup'));
</span><del>- return waitToRender(context);
</del><ins>+ return waitForComponentsToRender(context);
</ins><span class="cx"> }).then(() => {
</span><del>- expect(editableText.content('text-field').offsetHeight).toBe(0);
- expect(updateCount).toBe(1);
- expect(editableText.editedText()).toBe('world');
</del><ins>+ expect(editableText.content('text-field').offsetHeight).to.be(0);
+ expect(updateCount).to.be(1);
+ expect(editableText.editedText()).to.be('world');
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgbrowsertestsindexhtml"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/browser-tests/index.html (212532 => 212533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/browser-tests/index.html 2017-02-17 05:28:26 UTC (rev 212532)
+++ trunk/Websites/perf.webkit.org/browser-tests/index.html 2017-02-17 05:36:05 UTC (rev 212533)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> <title>In-Browser Tests for Performance Dashboard</title>
</span><span class="cx"> <link rel="stylesheet" href="https://cdn.rawgit.com/mochajs/mocha/2.2.5/mocha.css">
</span><span class="cx"> <script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/2.2.5/mocha.js"></script>
</span><del>-<script src="https://cdnjs.cloudflare.com/ajax/libs/expect/1.20.2/expect.min.js"></script>
</del><ins>+<script src="https://cdnjs.cloudflare.com/ajax/libs/expect.js/0.2.0/expect.min.js"></script>
</ins><span class="cx"> <script>
</span><span class="cx">
</span><span class="cx"> mocha.setup('bdd');
</span></span></pre>
</div>
</div>
</body>
</html>