<!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>[213993] 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/213993">213993</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-15 11:15:33 -0700 (Wed, 15 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make unit tests return a promise instead of manually calling done
https://bugs.webkit.org/show_bug.cgi?id=169663
Reviewed by Antti Koivisto.
Make the existing unit tests always reutrn a promise instead of manually calling "done" callback as done
in <a href="http://trac.webkit.org/projects/webkit/changeset/213969">r213969</a>. The promise tests are a lot more stable and less error prone.
Also use MockRemoteAPI.waitForRequest() instead of chaining two resolved promises where appropriate.
* unit-tests/analysis-task-tests.js:
* unit-tests/buildbot-syncer-tests.js:
* unit-tests/checkconfig.js:
* unit-tests/privileged-api-tests.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesperfwebkitorgunittestsanalysistasktestsjs">trunk/Websites/perf.webkit.org/unit-tests/analysis-task-tests.js</a></li>
<li><a href="#trunkWebsitesperfwebkitorgunittestsbuildbotsyncertestsjs">trunk/Websites/perf.webkit.org/unit-tests/buildbot-syncer-tests.js</a></li>
<li><a href="#trunkWebsitesperfwebkitorgunittestscheckconfigjs">trunk/Websites/perf.webkit.org/unit-tests/checkconfig.js</a></li>
<li><a href="#trunkWebsitesperfwebkitorgunittestsprivilegedapitestsjs">trunk/Websites/perf.webkit.org/unit-tests/privileged-api-tests.js</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 (213992 => 213993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog 2017-03-15 18:15:31 UTC (rev 213992)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2017-03-15 18:15:33 UTC (rev 213993)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-03-15 Ryosuke Niwa <rniwa@webkit.org>
+
+ Make unit tests return a promise instead of manually calling done
+ https://bugs.webkit.org/show_bug.cgi?id=169663
+
+ Reviewed by Antti Koivisto.
+
+ Make the existing unit tests always reutrn a promise instead of manually calling "done" callback as done
+ in r213969. The promise tests are a lot more stable and less error prone.
+
+ Also use MockRemoteAPI.waitForRequest() instead of chaining two resolved promises where appropriate.
+
+ * unit-tests/analysis-task-tests.js:
+ * unit-tests/buildbot-syncer-tests.js:
+ * unit-tests/checkconfig.js:
+ * unit-tests/privileged-api-tests.js:
+
</ins><span class="cx"> 2017-03-15 Dewei Zhu <dewei_zhu@apple.com>
</span><span class="cx">
</span><span class="cx"> Rewrite 'pull-os-versions' script in Javascript to add support for reporting os revisions with sub commits.
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgunittestsanalysistasktestsjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/unit-tests/analysis-task-tests.js (213992 => 213993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/unit-tests/analysis-task-tests.js 2017-03-15 18:15:31 UTC (rev 213992)
+++ trunk/Websites/perf.webkit.org/unit-tests/analysis-task-tests.js 2017-03-15 18:15:33 UTC (rev 213993)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> 'use strict';
</span><span class="cx">
</span><del>-var assert = require('assert');
</del><ins>+const assert = require('assert');
</ins><span class="cx">
</span><span class="cx"> require('../tools/js/v3-models.js');
</span><span class="cx"> let MockModels = require('./resources/mock-v3-models.js').MockModels;
</span><span class="lines">@@ -116,34 +116,34 @@
</span><span class="cx"> };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-describe('AnalysisTask', function () {
</del><ins>+describe('AnalysisTask', () => {
</ins><span class="cx"> MockModels.inject();
</span><span class="cx"> let requests = MockRemoteAPI.inject();
</span><span class="cx">
</span><del>- describe('fetchAll', function () {
- it('should request all analysis tasks', function () {
- var callCount = 0;
- AnalysisTask.fetchAll().then(function () { callCount++; });
</del><ins>+ describe('fetchAll', () => {
+ it('should request all analysis tasks', () => {
+ let callCount = 0;
+ AnalysisTask.fetchAll().then(() => { callCount++; });
</ins><span class="cx"> assert.equal(callCount, 0);
</span><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> assert.equal(requests[0].url, '../api/analysis-tasks');
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should not request all analysis tasks multiple times', function () {
- var callCount = 0;
- AnalysisTask.fetchAll().then(function () { callCount++; });
</del><ins>+ it('should not request all analysis tasks multiple times', () => {
+ let callCount = 0;
+ AnalysisTask.fetchAll().then(() => { callCount++; });
</ins><span class="cx"> assert.equal(callCount, 0);
</span><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> assert.equal(requests[0].url, '../api/analysis-tasks');
</span><span class="cx">
</span><del>- AnalysisTask.fetchAll().then(function () { callCount++; });
</del><ins>+ AnalysisTask.fetchAll().then(() => { callCount++; });
</ins><span class="cx"> assert.equal(callCount, 0);
</span><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should resolve the promise when the request is fullfilled', function (done) {
- var callCount = 0;
- var promise = AnalysisTask.fetchAll().then(function () { callCount++; });
</del><ins>+ it('should resolve the promise when the request is fullfilled', () => {
+ let callCount = 0;
+ const promise = AnalysisTask.fetchAll().then(() => { callCount++; });
</ins><span class="cx"> assert.equal(callCount, 0);
</span><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> assert.equal(requests[0].url, '../api/analysis-tasks');
</span><span class="lines">@@ -150,23 +150,22 @@
</span><span class="cx">
</span><span class="cx"> requests[0].resolve(sampleAnalysisTask());
</span><span class="cx">
</span><del>- var anotherCallCount = 0;
- promise.then(function () {
</del><ins>+ let anotherCallCount = 0;
+ return promise.then(() => {
</ins><span class="cx"> assert.equal(callCount, 1);
</span><del>- AnalysisTask.fetchAll().then(function () { anotherCallCount++; });
- }).then(function () {
</del><ins>+ AnalysisTask.fetchAll().then(() => { anotherCallCount++; });
+ }).then(() => {
</ins><span class="cx"> assert.equal(callCount, 1);
</span><span class="cx"> assert.equal(anotherCallCount, 1);
</span><span class="cx"> assert.equal(requests.length, 1);
</span><del>- done();
- }).catch(function (error) { done(error); });
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should create AnalysisTask objects', function (done) {
- var promise = AnalysisTask.fetchAll();
</del><ins>+ it('should create AnalysisTask objects', () => {
+ const promise = AnalysisTask.fetchAll();
</ins><span class="cx"> requests[0].resolve(sampleAnalysisTask());
</span><span class="cx">
</span><del>- promise.then(function () {
</del><ins>+ return promise.then(() => {
</ins><span class="cx"> assert.equal(AnalysisTask.all().length, 1);
</span><span class="cx"> var task = AnalysisTask.all()[0];
</span><span class="cx"> assert.equal(task.id(), 1082);
</span><span class="lines">@@ -181,15 +180,14 @@
</span><span class="cx"> assert.equal(task.startTime(), 1454444458791);
</span><span class="cx"> assert.equal(task.endMeasurementId(), 37253448);
</span><span class="cx"> assert.equal(task.endTime(), 1454515020303);
</span><del>- done();
- }).catch(function (error) { done(error); });
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should create CommitLog objects for `causes`', function (done) {
- var promise = AnalysisTask.fetchAll();
</del><ins>+ it('should create CommitLog objects for `causes`', () => {
+ const promise = AnalysisTask.fetchAll();
</ins><span class="cx"> requests[0].resolve(sampleAnalysisTask());
</span><span class="cx">
</span><del>- promise.then(function () {
</del><ins>+ return promise.then(() => {
</ins><span class="cx"> assert.equal(AnalysisTask.all().length, 1);
</span><span class="cx"> var task = AnalysisTask.all()[0];
</span><span class="cx">
</span><span class="lines">@@ -199,20 +197,19 @@
</span><span class="cx"> assert.equal(commit.revision(), '196051');
</span><span class="cx"> assert.equal(commit.repository(), MockModels.webkit);
</span><span class="cx"> assert.equal(+commit.time(), 1454481246108);
</span><del>- done();
- }).catch(function (error) { done(error); });
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should find CommitLog objects for `causes` when MeasurementAdaptor created matching objects', function (done) {
- var adaptor = new MeasurementAdaptor(measurementCluster().formatMap);
- var adaptedMeasurement = adaptor.applyTo(measurementCluster().configurations.current[0]);
</del><ins>+ it('should find CommitLog objects for `causes` when MeasurementAdaptor created matching objects', () => {
+ const adaptor = new MeasurementAdaptor(measurementCluster().formatMap);
+ const adaptedMeasurement = adaptor.applyTo(measurementCluster().configurations.current[0]);
</ins><span class="cx"> assert.equal(adaptedMeasurement.id, 37188161);
</span><span class="cx"> assert.equal(adaptedMeasurement.commitSet().commitForRepository(MockModels.webkit).revision(), '196051');
</span><span class="cx">
</span><del>- var promise = AnalysisTask.fetchAll();
</del><ins>+ const promise = AnalysisTask.fetchAll();
</ins><span class="cx"> requests[0].resolve(sampleAnalysisTask());
</span><span class="cx">
</span><del>- promise.then(function () {
</del><ins>+ return promise.then(() => {
</ins><span class="cx"> assert.equal(AnalysisTask.all().length, 1);
</span><span class="cx"> var task = AnalysisTask.all()[0];
</span><span class="cx">
</span><span class="lines">@@ -221,8 +218,7 @@
</span><span class="cx"> assert.equal(commit.revision(), '196051');
</span><span class="cx"> assert.equal(commit.repository(), MockModels.webkit);
</span><span class="cx"> assert.equal(+commit.time(), 1454481246108);
</span><del>- done();
- }).catch(function (error) { done(error); });
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgunittestsbuildbotsyncertestsjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/unit-tests/buildbot-syncer-tests.js (213992 => 213993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/unit-tests/buildbot-syncer-tests.js 2017-03-15 18:15:31 UTC (rev 213992)
+++ trunk/Websites/perf.webkit.org/unit-tests/buildbot-syncer-tests.js 2017-03-15 18:15:33 UTC (rev 213993)
</span><span class="lines">@@ -416,39 +416,39 @@
</span><span class="cx"> };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-describe('BuildbotSyncer', function () {
</del><ins>+describe('BuildbotSyncer', () => {
</ins><span class="cx"> MockModels.inject();
</span><span class="cx"> let requests = MockRemoteAPI.inject('http://build.webkit.org');
</span><span class="cx">
</span><del>- describe('_loadConfig', function () {
</del><ins>+ describe('_loadConfig', () => {
</ins><span class="cx">
</span><del>- it('should create BuildbotSyncer objects for a configuration that specify all required options', function () {
</del><ins>+ it('should create BuildbotSyncer objects for a configuration that specify all required options', () => {
</ins><span class="cx"> let syncers = BuildbotSyncer._loadConfig(MockRemoteAPI, {'configurations': [smallConfiguration()]});
</span><span class="cx"> assert.equal(syncers.length, 1);
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should throw when some required options are missing', function () {
- assert.throws(function () {
</del><ins>+ it('should throw when some required options are missing', () => {
+ assert.throws(() => {
</ins><span class="cx"> let config = smallConfiguration();
</span><span class="cx"> delete config['builder'];
</span><span class="cx"> BuildbotSyncer._loadConfig(MockRemoteAPI, {'configurations': [config]});
</span><span class="cx"> }, 'builder should be a required option');
</span><del>- assert.throws(function () {
</del><ins>+ assert.throws(() => {
</ins><span class="cx"> let config = smallConfiguration();
</span><span class="cx"> delete config['platform'];
</span><span class="cx"> BuildbotSyncer._loadConfig(MockRemoteAPI, {'configurations': [config]});
</span><span class="cx"> }, 'platform should be a required option');
</span><del>- assert.throws(function () {
</del><ins>+ assert.throws(() => {
</ins><span class="cx"> let config = smallConfiguration();
</span><span class="cx"> delete config['test'];
</span><span class="cx"> BuildbotSyncer._loadConfig(MockRemoteAPI, {'configurations': [config]});
</span><span class="cx"> }, 'test should be a required option');
</span><del>- assert.throws(function () {
</del><ins>+ assert.throws(() => {
</ins><span class="cx"> let config = smallConfiguration();
</span><span class="cx"> delete config['arguments'];
</span><span class="cx"> BuildbotSyncer._loadConfig(MockRemoteAPI, {'configurations': [config]});
</span><span class="cx"> });
</span><del>- assert.throws(function () {
</del><ins>+ assert.throws(() => {
</ins><span class="cx"> let config = smallConfiguration();
</span><span class="cx"> delete config['buildRequestArgument'];
</span><span class="cx"> BuildbotSyncer._loadConfig(MockRemoteAPI, {'configurations': [config]});
</span><span class="lines">@@ -455,13 +455,13 @@
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should throw when a test name is not an array of strings', function () {
- assert.throws(function () {
</del><ins>+ it('should throw when a test name is not an array of strings', () => {
+ assert.throws(() => {
</ins><span class="cx"> let config = smallConfiguration();
</span><span class="cx"> config.test = 'some test';
</span><span class="cx"> BuildbotSyncer._loadConfig(MockRemoteAPI, {'configurations': [config]});
</span><span class="cx"> });
</span><del>- assert.throws(function () {
</del><ins>+ assert.throws(() => {
</ins><span class="cx"> let config = smallConfiguration();
</span><span class="cx"> config.test = [1];
</span><span class="cx"> BuildbotSyncer._loadConfig(MockRemoteAPI, {'configurations': [config]});
</span><span class="lines">@@ -468,8 +468,8 @@
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should throw when arguments is not an object', function () {
- assert.throws(function () {
</del><ins>+ it('should throw when arguments is not an object', () => {
+ assert.throws(() => {
</ins><span class="cx"> let config = smallConfiguration();
</span><span class="cx"> config.arguments = 'hello';
</span><span class="cx"> BuildbotSyncer._loadConfig(MockRemoteAPI, {'configurations': [config]});
</span><span class="lines">@@ -476,33 +476,33 @@
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should throw when arguments\'s values are malformed', function () {
- assert.throws(function () {
</del><ins>+ it('should throw when arguments\'s values are malformed', () => {
+ assert.throws(() => {
</ins><span class="cx"> let config = smallConfiguration();
</span><span class="cx"> config.arguments = {'some': {'root': 'some root', 'rootsExcluding': ['other root']}};
</span><span class="cx"> BuildbotSyncer._loadConfig(RemoteAPI, {'configurations': [config]});
</span><span class="cx"> });
</span><del>- assert.throws(function () {
</del><ins>+ assert.throws(() => {
</ins><span class="cx"> let config = smallConfiguration();
</span><span class="cx"> config.arguments = {'some': {'otherKey': 'some root'}};
</span><span class="cx"> BuildbotSyncer._loadConfig(RemoteAPI, {'configurations': [config]});
</span><span class="cx"> });
</span><del>- assert.throws(function () {
</del><ins>+ assert.throws(() => {
</ins><span class="cx"> let config = smallConfiguration();
</span><span class="cx"> config.arguments = {'some': {'root': ['a', 'b']}};
</span><span class="cx"> BuildbotSyncer._loadConfig(RemoteAPI, {'configurations': [config]});
</span><span class="cx"> });
</span><del>- assert.throws(function () {
</del><ins>+ assert.throws(() => {
</ins><span class="cx"> let config = smallConfiguration();
</span><span class="cx"> config.arguments = {'some': {'root': 1}};
</span><span class="cx"> BuildbotSyncer._loadConfig(RemoteAPI, {'configurations': [config]});
</span><span class="cx"> });
</span><del>- assert.throws(function () {
</del><ins>+ assert.throws(() => {
</ins><span class="cx"> let config = smallConfiguration();
</span><span class="cx"> config.arguments = {'some': {'rootsExcluding': 'a'}};
</span><span class="cx"> BuildbotSyncer._loadConfig(RemoteAPI, {'configurations': [config]});
</span><span class="cx"> });
</span><del>- assert.throws(function () {
</del><ins>+ assert.throws(() => {
</ins><span class="cx"> let config = smallConfiguration();
</span><span class="cx"> config.arguments = {'some': {'rootsExcluding': [1]}};
</span><span class="cx"> BuildbotSyncer._loadConfig(RemoteAPI, {'configurations': [config]});
</span><span class="lines">@@ -509,7 +509,7 @@
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should create BuildbotSyncer objects for valid configurations', function () {
</del><ins>+ it('should create BuildbotSyncer objects for valid configurations', () => {
</ins><span class="cx"> let syncers = BuildbotSyncer._loadConfig(RemoteAPI, sampleiOSConfig());
</span><span class="cx"> assert.equal(syncers.length, 2);
</span><span class="cx"> assert.ok(syncers[0] instanceof BuildbotSyncer);
</span><span class="lines">@@ -516,13 +516,13 @@
</span><span class="cx"> assert.ok(syncers[1] instanceof BuildbotSyncer);
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should parse builder names correctly', function () {
</del><ins>+ it('should parse builder names correctly', () => {
</ins><span class="cx"> let syncers = BuildbotSyncer._loadConfig(RemoteAPI, sampleiOSConfig());
</span><span class="cx"> assert.equal(syncers[0].builderName(), 'ABTest-iPhone-RunBenchmark-Tests');
</span><span class="cx"> assert.equal(syncers[1].builderName(), 'ABTest-iPad-RunBenchmark-Tests');
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should parse test configurations correctly', function () {
</del><ins>+ it('should parse test configurations correctly', () => {
</ins><span class="cx"> let syncers = BuildbotSyncer._loadConfig(RemoteAPI, sampleiOSConfig());
</span><span class="cx">
</span><span class="cx"> let configurations = syncers[0].testConfigurations();
</span><span class="lines">@@ -542,7 +542,7 @@
</span><span class="cx"> assert.equal(configurations[1].test, MockModels.jetstream);
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should parse test configurations with types and platforms expansions correctly', function () {
</del><ins>+ it('should parse test configurations with types and platforms expansions correctly', () => {
</ins><span class="cx"> let syncers = BuildbotSyncer._loadConfig(RemoteAPI, sampleiOSConfigWithExpansions());
</span><span class="cx">
</span><span class="cx"> assert.equal(syncers.length, 2);
</span><span class="lines">@@ -567,14 +567,14 @@
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><del>- describe('_propertiesForBuildRequest', function () {
- it('should include all properties specified in a given configuration', function () {
</del><ins>+ describe('_propertiesForBuildRequest', () => {
+ it('should include all properties specified in a given configuration', () => {
</ins><span class="cx"> let syncers = BuildbotSyncer._loadConfig(RemoteAPI, sampleiOSConfig());
</span><span class="cx"> let properties = syncers[0]._propertiesForBuildRequest(createSampleBuildRequest(MockModels.iphone, MockModels.speedometer));
</span><span class="cx"> assert.deepEqual(Object.keys(properties), ['desired_image', 'opensource', 'roots_dict', 'test_name', 'forcescheduler', 'build_request_id']);
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should preserve non-parametric property values', function () {
</del><ins>+ it('should preserve non-parametric property values', () => {
</ins><span class="cx"> let syncers = BuildbotSyncer._loadConfig(RemoteAPI, sampleiOSConfig());
</span><span class="cx"> let properties = syncers[0]._propertiesForBuildRequest(createSampleBuildRequest(MockModels.iphone, MockModels.speedometer));
</span><span class="cx"> assert.equal(properties['test_name'], 'speedometer');
</span><span class="lines">@@ -585,25 +585,25 @@
</span><span class="cx"> assert.equal(properties['forcescheduler'], 'ABTest-iPad-RunBenchmark-Tests-ForceScheduler');
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should resolve "root"', function () {
</del><ins>+ it('should resolve "root"', () => {
</ins><span class="cx"> let syncers = BuildbotSyncer._loadConfig(RemoteAPI, sampleiOSConfig());
</span><span class="cx"> let properties = syncers[0]._propertiesForBuildRequest(createSampleBuildRequest(MockModels.iphone, MockModels.speedometer));
</span><span class="cx"> assert.equal(properties['desired_image'], '13A452');
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should resolve "rootOptions"', function () {
</del><ins>+ it('should resolve "rootOptions"', () => {
</ins><span class="cx"> let syncers = BuildbotSyncer._loadConfig(RemoteAPI, sampleiOSConfig());
</span><span class="cx"> let properties = syncers[0]._propertiesForBuildRequest(createSampleBuildRequest(MockModels.iphone, MockModels.speedometer));
</span><span class="cx"> assert.equal(properties['roots_dict'], JSON.stringify(sampleCommitSetData));
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should resolve "rootsExcluding"', function () {
</del><ins>+ it('should resolve "rootsExcluding"', () => {
</ins><span class="cx"> let syncers = BuildbotSyncer._loadConfig(RemoteAPI, sampleiOSConfig());
</span><span class="cx"> let properties = syncers[0]._propertiesForBuildRequest(createSampleBuildRequest(MockModels.iphone, MockModels.speedometer));
</span><span class="cx"> assert.equal(properties['roots_dict'], JSON.stringify(sampleCommitSetData));
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should set the property for the build request id', function () {
</del><ins>+ it('should set the property for the build request id', () => {
</ins><span class="cx"> let syncers = BuildbotSyncer._loadConfig(RemoteAPI, sampleiOSConfig());
</span><span class="cx"> let request = createSampleBuildRequest(MockModels.iphone, MockModels.speedometer);
</span><span class="cx"> let properties = syncers[0]._propertiesForBuildRequest(request);
</span><span class="lines">@@ -611,8 +611,8 @@
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><del>- describe('pullBuildbot', function () {
- it('should fetch pending builds from the right URL', function () {
</del><ins>+ describe('pullBuildbot', () => {
+ it('should fetch pending builds from the right URL', () => {
</ins><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[1];
</span><span class="cx"> assert.equal(syncer.builderName(), 'ABTest-iPad-RunBenchmark-Tests');
</span><span class="cx"> let expectedURL = '/json/builders/ABTest-iPad-RunBenchmark-Tests/pendingBuilds';
</span><span class="lines">@@ -622,7 +622,7 @@
</span><span class="cx"> assert.equal(requests[0].url, expectedURL);
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should fetch recent builds once pending builds have been fetched', function (done) {
</del><ins>+ it('should fetch recent builds once pending builds have been fetched', () => {
</ins><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[1];
</span><span class="cx"> assert.equal(syncer.builderName(), 'ABTest-iPad-RunBenchmark-Tests');
</span><span class="cx">
</span><span class="lines">@@ -630,14 +630,13 @@
</span><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> assert.equal(requests[0].url, '/json/builders/ABTest-iPad-RunBenchmark-Tests/pendingBuilds');
</span><span class="cx"> requests[0].resolve([]);
</span><del>- Promise.resolve().then(function () {
</del><ins>+ return MockRemoteAPI.waitForRequest().then(() => {
</ins><span class="cx"> assert.equal(requests.length, 2);
</span><span class="cx"> assert.equal(requests[1].url, '/json/builders/ABTest-iPad-RunBenchmark-Tests/builds/?select=-1');
</span><del>- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should fetch the right number of recent builds', function (done) {
</del><ins>+ it('should fetch the right number of recent builds', () => {
</ins><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[1];
</span><span class="cx">
</span><span class="cx"> syncer.pullBuildbot(3);
</span><span class="lines">@@ -644,18 +643,17 @@
</span><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> assert.equal(requests[0].url, '/json/builders/ABTest-iPad-RunBenchmark-Tests/pendingBuilds');
</span><span class="cx"> requests[0].resolve([]);
</span><del>- Promise.resolve().then(function () {
</del><ins>+ return MockRemoteAPI.waitForRequest().then(() => {
</ins><span class="cx"> assert.equal(requests.length, 2);
</span><span class="cx"> assert.equal(requests[1].url, '/json/builders/ABTest-iPad-RunBenchmark-Tests/builds/?select=-1&select=-2&select=-3');
</span><del>- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should create BuildbotBuildEntry for pending builds', function (done) {
</del><ins>+ it('should create BuildbotBuildEntry for pending builds', () => {
</ins><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[1];
</span><span class="cx"> let promise = syncer.pullBuildbot();
</span><span class="cx"> requests[0].resolve([samplePendingBuild()]);
</span><del>- promise.then(function (entries) {
</del><ins>+ return promise.then((entries) => {
</ins><span class="cx"> assert.equal(entries.length, 1);
</span><span class="cx"> let entry = entries[0];
</span><span class="cx"> assert.ok(entry instanceof BuildbotBuildEntry);
</span><span class="lines">@@ -666,22 +664,20 @@
</span><span class="cx"> assert.ok(!entry.isInProgress());
</span><span class="cx"> assert.ok(!entry.hasFinished());
</span><span class="cx"> assert.equal(entry.url(), 'http://build.webkit.org/builders/ABTest-iPad-RunBenchmark-Tests/');
</span><del>- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should create BuildbotBuildEntry for in-progress builds', function (done) {
</del><ins>+ it('should create BuildbotBuildEntry for in-progress builds', () => {
</ins><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[1];
</span><span class="cx">
</span><span class="cx"> let promise = syncer.pullBuildbot(1);
</span><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> requests[0].resolve([]);
</span><del>- Promise.resolve().then(function () {
</del><ins>+ return MockRemoteAPI.waitForRequest().then(() => {
</ins><span class="cx"> assert.equal(requests.length, 2);
</span><span class="cx"> requests[1].resolve({[-1]: sampleInProgressBuild()});
</span><del>- }).catch(done);
-
- promise.then(function (entries) {
</del><ins>+ return promise;
+ }).then((entries) => {
</ins><span class="cx"> assert.equal(entries.length, 1);
</span><span class="cx"> let entry = entries[0];
</span><span class="cx"> assert.ok(entry instanceof BuildbotBuildEntry);
</span><span class="lines">@@ -692,22 +688,20 @@
</span><span class="cx"> assert.ok(entry.isInProgress());
</span><span class="cx"> assert.ok(!entry.hasFinished());
</span><span class="cx"> assert.equal(entry.url(), 'http://build.webkit.org/builders/ABTest-iPad-RunBenchmark-Tests/builds/614');
</span><del>- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should create BuildbotBuildEntry for finished builds', function (done) {
</del><ins>+ it('should create BuildbotBuildEntry for finished builds', () => {
</ins><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[1];
</span><span class="cx">
</span><span class="cx"> let promise = syncer.pullBuildbot(1);
</span><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> requests[0].resolve([]);
</span><del>- Promise.resolve().then(function () {
</del><ins>+ return MockRemoteAPI.waitForRequest().then(() => {
</ins><span class="cx"> assert.equal(requests.length, 2);
</span><span class="cx"> requests[1].resolve({[-1]: sampleFinishedBuild()});
</span><del>- }).catch(done);
-
- promise.then(function (entries) {
</del><ins>+ return promise;
+ }).then((entries) => {
</ins><span class="cx"> assert.deepEqual(entries.length, 1);
</span><span class="cx"> let entry = entries[0];
</span><span class="cx"> assert.ok(entry instanceof BuildbotBuildEntry);
</span><span class="lines">@@ -718,11 +712,10 @@
</span><span class="cx"> assert.ok(!entry.isInProgress());
</span><span class="cx"> assert.ok(entry.hasFinished());
</span><span class="cx"> assert.equal(entry.url(), 'http://build.webkit.org/builders/ABTest-iPad-RunBenchmark-Tests/builds/1755');
</span><del>- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should create BuildbotBuildEntry for mixed pending, in-progress, finished, and missing builds', function (done) {
</del><ins>+ it('should create BuildbotBuildEntry for mixed pending, in-progress, finished, and missing builds', () => {
</ins><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[1];
</span><span class="cx">
</span><span class="cx"> let promise = syncer.pullBuildbot(5);
</span><span class="lines">@@ -730,12 +723,11 @@
</span><span class="cx">
</span><span class="cx"> requests[0].resolve([samplePendingBuild(123)]);
</span><span class="cx">
</span><del>- Promise.resolve().then(function () {
</del><ins>+ return MockRemoteAPI.waitForRequest().then(() => {
</ins><span class="cx"> assert.equal(requests.length, 2);
</span><span class="cx"> requests[1].resolve({[-1]: sampleFinishedBuild(), [-2]: {'error': 'Not available'}, [-4]: sampleInProgressBuild()});
</span><del>- }).catch(done);
-
- promise.then(function (entries) {
</del><ins>+ return promise;
+ }).then((entries) => {
</ins><span class="cx"> assert.deepEqual(entries.length, 3);
</span><span class="cx">
</span><span class="cx"> let entry = entries[0];
</span><span class="lines">@@ -767,12 +759,10 @@
</span><span class="cx"> assert.ok(!entry.isInProgress());
</span><span class="cx"> assert.ok(entry.hasFinished());
</span><span class="cx"> assert.equal(entry.url(), 'http://build.webkit.org/builders/ABTest-iPad-RunBenchmark-Tests/builds/1755');
</span><del>-
- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should sort BuildbotBuildEntry by order', function (done) {
</del><ins>+ it('should sort BuildbotBuildEntry by order', () => {
</ins><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[1];
</span><span class="cx">
</span><span class="cx"> let promise = syncer.pullBuildbot(5);
</span><span class="lines">@@ -780,12 +770,11 @@
</span><span class="cx">
</span><span class="cx"> requests[0].resolve([samplePendingBuild(456, 2), samplePendingBuild(123, 1)]);
</span><span class="cx">
</span><del>- Promise.resolve().then(function () {
</del><ins>+ return MockRemoteAPI.waitForRequest().then(() => {
</ins><span class="cx"> assert.equal(requests.length, 2);
</span><span class="cx"> requests[1].resolve({[-3]: sampleFinishedBuild(), [-1]: {'error': 'Not available'}, [-2]: sampleInProgressBuild()});
</span><del>- }).catch(done);
-
- promise.then(function (entries) {
</del><ins>+ return promise;
+ }).then((entries) => {
</ins><span class="cx"> assert.deepEqual(entries.length, 4);
</span><span class="cx">
</span><span class="cx"> let entry = entries[0];
</span><span class="lines">@@ -827,12 +816,10 @@
</span><span class="cx"> assert.ok(!entry.isInProgress());
</span><span class="cx"> assert.ok(entry.hasFinished());
</span><span class="cx"> assert.equal(entry.url(), 'http://build.webkit.org/builders/ABTest-iPad-RunBenchmark-Tests/builds/1755');
</span><del>-
- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should override BuildbotBuildEntry for pending builds by in-progress builds', function (done) {
</del><ins>+ it('should override BuildbotBuildEntry for pending builds by in-progress builds', () => {
</ins><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[1];
</span><span class="cx">
</span><span class="cx"> let promise = syncer.pullBuildbot(5);
</span><span class="lines">@@ -840,12 +827,11 @@
</span><span class="cx">
</span><span class="cx"> requests[0].resolve([samplePendingBuild()]);
</span><span class="cx">
</span><del>- Promise.resolve().then(function () {
</del><ins>+ return MockRemoteAPI.waitForRequest().then(() => {
</ins><span class="cx"> assert.equal(requests.length, 2);
</span><span class="cx"> requests[1].resolve({[-1]: sampleInProgressBuild()});
</span><del>- }).catch(done);
-
- promise.then(function (entries) {
</del><ins>+ return promise;
+ }).then((entries) => {
</ins><span class="cx"> assert.equal(entries.length, 1);
</span><span class="cx">
</span><span class="cx"> let entry = entries[0];
</span><span class="lines">@@ -857,12 +843,10 @@
</span><span class="cx"> assert.ok(entry.isInProgress());
</span><span class="cx"> assert.ok(!entry.hasFinished());
</span><span class="cx"> assert.equal(entry.url(), 'http://build.webkit.org/builders/ABTest-iPad-RunBenchmark-Tests/builds/614');
</span><del>-
- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should override BuildbotBuildEntry for pending builds by finished builds', function (done) {
</del><ins>+ it('should override BuildbotBuildEntry for pending builds by finished builds', () => {
</ins><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[1];
</span><span class="cx">
</span><span class="cx"> let promise = syncer.pullBuildbot(5);
</span><span class="lines">@@ -870,12 +854,11 @@
</span><span class="cx">
</span><span class="cx"> requests[0].resolve([samplePendingBuild()]);
</span><span class="cx">
</span><del>- Promise.resolve().then(function () {
</del><ins>+ return MockRemoteAPI.waitForRequest().then(() => {
</ins><span class="cx"> assert.equal(requests.length, 2);
</span><span class="cx"> requests[1].resolve({[-1]: sampleFinishedBuild(16733)});
</span><del>- }).catch(done);
-
- promise.then(function (entries) {
</del><ins>+ return promise;
+ }).then((entries) => {
</ins><span class="cx"> assert.equal(entries.length, 1);
</span><span class="cx">
</span><span class="cx"> let entry = entries[0];
</span><span class="lines">@@ -887,18 +870,17 @@
</span><span class="cx"> assert.ok(!entry.isInProgress());
</span><span class="cx"> assert.ok(entry.hasFinished());
</span><span class="cx"> assert.equal(entry.url(), 'http://build.webkit.org/builders/ABTest-iPad-RunBenchmark-Tests/builds/1755');
</span><del>-
- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><del>- describe('scheduleRequest', function () {
- it('should schedule a build request on a specified slave', function (done) {
</del><ins>+ describe('scheduleRequest', () => {
+ it('should schedule a build request on a specified slave', () => {
</ins><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[0];
</span><span class="cx">
</span><ins>+ const waitForRequest = MockRemoteAPI.waitForRequest();
</ins><span class="cx"> syncer.scheduleRequest(createSampleBuildRequest(MockModels.iphone, MockModels.speedometer), 'some-slave');
</span><del>- Promise.resolve().then(function () {
</del><ins>+ return waitForRequest.then(() => {
</ins><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> assert.equal(requests[0].url, '/builders/ABTest-iPhone-RunBenchmark-Tests/force');
</span><span class="cx"> assert.equal(requests[0].method, 'POST');
</span><span class="lines">@@ -913,188 +895,160 @@
</span><span class="cx"> 'slavename': 'some-slave',
</span><span class="cx"> 'test_name': 'speedometer'
</span><span class="cx"> });
</span><del>- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><del>- describe('scheduleRequestInGroupIfAvailable', function () {
</del><ins>+ describe('scheduleRequestInGroupIfAvailable', () => {
</ins><span class="cx">
</span><span class="cx"> function pullBuildbotWithAssertion(syncer, pendingBuilds, inProgressAndFinishedBuilds)
</span><span class="cx"> {
</span><del>- let promise = syncer.pullBuildbot(5);
</del><ins>+ const promise = syncer.pullBuildbot(5);
</ins><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> requests[0].resolve(pendingBuilds);
</span><del>- return Promise.resolve().then(function () {
</del><ins>+ return MockRemoteAPI.waitForRequest().then(() => {
</ins><span class="cx"> assert.equal(requests.length, 2);
</span><span class="cx"> requests[1].resolve(inProgressAndFinishedBuilds);
</span><span class="cx"> requests.length = 0;
</span><del>- }).then(function () {
</del><span class="cx"> return promise;
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- it('should schedule a build if builder has no builds if slaveList is not specified', function (done) {
</del><ins>+ it('should schedule a build if builder has no builds if slaveList is not specified', () => {
</ins><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, {'configurations': [smallConfiguration()]})[0];
</span><span class="cx">
</span><del>- pullBuildbotWithAssertion(syncer, [], {}).then(function () {
</del><ins>+ return pullBuildbotWithAssertion(syncer, [], {}).then(() => {
</ins><span class="cx"> syncer.scheduleRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.somePlatform, MockModels.someTest));
</span><del>- }).then(function () {
</del><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> assert.equal(requests[0].url, '/builders/some%20builder/force');
</span><span class="cx"> assert.equal(requests[0].method, 'POST');
</span><span class="cx"> assert.deepEqual(requests[0].data, {id: '16733-' + MockModels.somePlatform.id()});
</span><del>- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should schedule a build if builder only has finished builds if slaveList is not specified', function (done) {
</del><ins>+ it('should schedule a build if builder only has finished builds if slaveList is not specified', () => {
</ins><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, {'configurations': [smallConfiguration()]})[0];
</span><span class="cx">
</span><del>- pullBuildbotWithAssertion(syncer, [], {[-1]: smallFinishedBuild()}).then(function () {
</del><ins>+ return pullBuildbotWithAssertion(syncer, [], {[-1]: smallFinishedBuild()}).then(() => {
</ins><span class="cx"> syncer.scheduleRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.somePlatform, MockModels.someTest));
</span><del>- }).then(function () {
</del><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> assert.equal(requests[0].url, '/builders/some%20builder/force');
</span><span class="cx"> assert.equal(requests[0].method, 'POST');
</span><span class="cx"> assert.deepEqual(requests[0].data, {id: '16733-' + MockModels.somePlatform.id()});
</span><del>- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should not schedule a build if builder has a pending build if slaveList is not specified', function (done) {
</del><ins>+ it('should not schedule a build if builder has a pending build if slaveList is not specified', () => {
</ins><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, {'configurations': [smallConfiguration()]})[0];
</span><span class="cx">
</span><del>- pullBuildbotWithAssertion(syncer, [smallPendingBuild()], {}).then(function () {
</del><ins>+ return pullBuildbotWithAssertion(syncer, [smallPendingBuild()], {}).then(() => {
</ins><span class="cx"> syncer.scheduleRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.somePlatform, MockModels.someTest));
</span><del>- }).then(function () {
</del><span class="cx"> assert.equal(requests.length, 0);
</span><del>- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should schedule a build if builder does not have pending or completed builds on the matching slave', function (done) {
</del><ins>+ it('should schedule a build if builder does not have pending or completed builds on the matching slave', () => {
</ins><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[0];
</span><span class="cx">
</span><del>- pullBuildbotWithAssertion(syncer, [], {}).then(function () {
</del><ins>+ return pullBuildbotWithAssertion(syncer, [], {}).then(() => {
</ins><span class="cx"> syncer.scheduleRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.iphone, MockModels.speedometer));
</span><del>- }).then(function () {
</del><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> assert.equal(requests[0].url, '/builders/ABTest-iPhone-RunBenchmark-Tests/force');
</span><span class="cx"> assert.equal(requests[0].method, 'POST');
</span><del>- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should schedule a build if builder only has finished builds on the matching slave', function (done) {
</del><ins>+ it('should schedule a build if builder only has finished builds on the matching slave', () => {
</ins><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[1];
</span><span class="cx">
</span><del>- pullBuildbotWithAssertion(syncer, [], {[-1]: sampleFinishedBuild()}).then(function () {
</del><ins>+ pullBuildbotWithAssertion(syncer, [], {[-1]: sampleFinishedBuild()}).then(() => {
</ins><span class="cx"> syncer.scheduleRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer));
</span><del>- }).then(function () {
</del><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> assert.equal(requests[0].url, '/builders/ABTest-iPad-RunBenchmark-Tests/force');
</span><span class="cx"> assert.equal(requests[0].method, 'POST');
</span><del>- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should not schedule a build if builder has a pending build on the maching slave', function (done) {
</del><ins>+ it('should not schedule a build if builder has a pending build on the maching slave', () => {
</ins><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[1];
</span><span class="cx">
</span><del>- pullBuildbotWithAssertion(syncer, [samplePendingBuild()], {}).then(function () {
</del><ins>+ pullBuildbotWithAssertion(syncer, [samplePendingBuild()], {}).then(() => {
</ins><span class="cx"> syncer.scheduleRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer));
</span><del>- }).then(function () {
</del><span class="cx"> assert.equal(requests.length, 0);
</span><del>- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should schedule a build if builder only has a pending build on a non-maching slave', function (done) {
</del><ins>+ it('should schedule a build if builder only has a pending build on a non-maching slave', () => {
</ins><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[1];
</span><span class="cx">
</span><del>- pullBuildbotWithAssertion(syncer, [samplePendingBuild(1, 1, 'another-slave')], {}).then(function () {
</del><ins>+ return pullBuildbotWithAssertion(syncer, [samplePendingBuild(1, 1, 'another-slave')], {}).then(() => {
</ins><span class="cx"> syncer.scheduleRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer));
</span><del>- }).then(function () {
</del><span class="cx"> assert.equal(requests.length, 1);
</span><del>- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should schedule a build if builder only has an in-progress build on the matching slave', function (done) {
</del><ins>+ it('should schedule a build if builder only has an in-progress build on the matching slave', () => {
</ins><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[1];
</span><span class="cx">
</span><del>- pullBuildbotWithAssertion(syncer, [], {[-1]: sampleInProgressBuild()}).then(function () {
</del><ins>+ return pullBuildbotWithAssertion(syncer, [], {[-1]: sampleInProgressBuild()}).then(() => {
</ins><span class="cx"> syncer.scheduleRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer));
</span><del>- }).then(function () {
</del><span class="cx"> assert.equal(requests.length, 1);
</span><del>- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should schedule a build if builder has an in-progress build on another slave', function (done) {
</del><ins>+ it('should schedule a build if builder has an in-progress build on another slave', () => {
</ins><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[1];
</span><span class="cx">
</span><del>- pullBuildbotWithAssertion(syncer, [], {[-1]: sampleInProgressBuild('other-slave')}).then(function () {
</del><ins>+ return pullBuildbotWithAssertion(syncer, [], {[-1]: sampleInProgressBuild('other-slave')}).then(() => {
</ins><span class="cx"> syncer.scheduleRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer));
</span><del>- }).then(function () {
</del><span class="cx"> assert.equal(requests.length, 1);
</span><del>- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should not schedule a build if the request does not match any configuration', function (done) {
</del><ins>+ it('should not schedule a build if the request does not match any configuration', () => {
</ins><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[0];
</span><span class="cx">
</span><del>- pullBuildbotWithAssertion(syncer, [], {}).then(function () {
</del><ins>+ return pullBuildbotWithAssertion(syncer, [], {}).then(() => {
</ins><span class="cx"> syncer.scheduleRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer));
</span><del>- }).then(function () {
</del><span class="cx"> assert.equal(requests.length, 0);
</span><del>- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should not schedule a build if a new request had been submitted to the same slave', function (done) {
</del><ins>+ it('should not schedule a build if a new request had been submitted to the same slave', (done) => {
</ins><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[1];
</span><span class="cx">
</span><del>- pullBuildbotWithAssertion(syncer, [], {}).then(function () {
</del><ins>+ pullBuildbotWithAssertion(syncer, [], {}).then(() => {
</ins><span class="cx"> syncer.scheduleRequest(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer), 'ABTest-iPad-0');
</span><span class="cx"> syncer.scheduleRequest(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer), 'ABTest-iPad-1');
</span><del>- }).then(function () {
</del><ins>+ }).then(() => {
</ins><span class="cx"> assert.equal(requests.length, 2);
</span><span class="cx"> syncer.scheduleRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer));
</span><del>- }).then(function () {
</del><ins>+ }).then(() => {
</ins><span class="cx"> assert.equal(requests.length, 2);
</span><span class="cx"> done();
</span><span class="cx"> }).catch(done);
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should schedule a build if a new request had been submitted to another slave', function (done) {
</del><ins>+ it('should schedule a build if a new request had been submitted to another slave', () => {
</ins><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, sampleiOSConfig())[1];
</span><span class="cx">
</span><del>- pullBuildbotWithAssertion(syncer, [], {}).then(function () {
</del><ins>+ return pullBuildbotWithAssertion(syncer, [], {}).then(() => {
</ins><span class="cx"> syncer.scheduleRequest(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer), 'ABTest-iPad-0');
</span><del>- }).then(function () {
</del><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> syncer.scheduleRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.ipad, MockModels.speedometer), 'ABTest-iPad-1');
</span><del>- }).then(function () {
</del><span class="cx"> assert.equal(requests.length, 2);
</span><del>- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should not schedule a build if a new request had been submitted to the same builder without slaveList', function (done) {
</del><ins>+ it('should not schedule a build if a new request had been submitted to the same builder without slaveList', () => {
</ins><span class="cx"> let syncer = BuildbotSyncer._loadConfig(MockRemoteAPI, {'configurations': [smallConfiguration()]})[0];
</span><span class="cx">
</span><del>- pullBuildbotWithAssertion(syncer, [], {}).then(function () {
</del><ins>+ return pullBuildbotWithAssertion(syncer, [], {}).then(() => {
</ins><span class="cx"> syncer.scheduleRequest(createSampleBuildRequest(MockModels.somePlatform, MockModels.someTest), null);
</span><del>- }).then(function () {
</del><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> syncer.scheduleRequestInGroupIfAvailable(createSampleBuildRequest(MockModels.somePlatform, MockModels.someTest));
</span><del>- }).then(function () {
</del><span class="cx"> assert.equal(requests.length, 1);
</span><del>- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgunittestscheckconfigjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/unit-tests/checkconfig.js (213992 => 213993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/unit-tests/checkconfig.js 2017-03-15 18:15:31 UTC (rev 213992)
+++ trunk/Websites/perf.webkit.org/unit-tests/checkconfig.js 2017-03-15 18:15:33 UTC (rev 213993)
</span><span class="lines">@@ -1,48 +1,48 @@
</span><span class="cx"> 'use strict';
</span><span class="cx">
</span><del>-var assert = require('assert');
-var fs = require('fs');
</del><ins>+const assert = require('assert');
+const fs = require('fs');
</ins><span class="cx">
</span><del>-var Config = require('../tools/js/config.js');
-var Database = require('../tools/js/database.js');
</del><ins>+const Config = require('../tools/js/config.js');
+const Database = require('../tools/js/database.js');
</ins><span class="cx">
</span><del>-describe('config.json', function () {
- it('should be a valid file', function () {
- assert.doesNotThrow(function () {
</del><ins>+describe('config.json', () => {
+ it('should be a valid file', () => {
+ assert.doesNotThrow(() => {
</ins><span class="cx"> fs.readFileSync(Config.configFilePath())
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should be a valid JSON', function () {
- assert.doesNotThrow(function () {
</del><ins>+ it('should be a valid JSON', () => {
+ assert.doesNotThrow(() => {
</ins><span class="cx"> JSON.parse(fs.readFileSync(Config.configFilePath()));
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should define `siteTitle`', function () {
</del><ins>+ it('should define `siteTitle`', () => {
</ins><span class="cx"> assert.equal(typeof Config.value('siteTitle'), 'string');
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should define `dataDirectory`', function () {
</del><ins>+ it('should define `dataDirectory`', () => {
</ins><span class="cx"> assert.ok(Config.value('dataDirectory'));
</span><span class="cx"> assert.ok(fs.existsSync(Config.path('dataDirectory')), 'dataDirectory should exist');
</span><span class="cx"> assert.ok(fs.statSync(Config.path('dataDirectory')).isDirectory(), 'dataDirectory should be a dictionary');
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should define `jsonCacheMaxAge`', function () {
</del><ins>+ it('should define `jsonCacheMaxAge`', () => {
</ins><span class="cx"> assert.equal(typeof Config.value('jsonCacheMaxAge'), 'number');
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should define `jsonCacheMaxAge`', function () {
</del><ins>+ it('should define `jsonCacheMaxAge`', () => {
</ins><span class="cx"> assert.equal(typeof Config.value('jsonCacheMaxAge'), 'number');
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should define `clusterStart`', function () {
- var clusterStart = Config.value('clusterStart');
</del><ins>+ it('should define `clusterStart`', () => {
+ const clusterStart = Config.value('clusterStart');
</ins><span class="cx"> assert.ok(clusterStart instanceof Array);
</span><span class="cx"> assert.equal(clusterStart.length, [2000, 1, 1, 0, 0].length,
</span><span class="cx"> 'Must specify year, month, date, hour, and minute');
</span><del>- var maxYear = (new Date).getFullYear() + 1;
</del><ins>+ const maxYear = (new Date).getFullYear() + 1;
</ins><span class="cx"> assert.ok(clusterStart[0] >= 1970 && clusterStart[0] <= maxYear, `year must be between 1970 and ${maxYear}`);
</span><span class="cx"> assert.ok(clusterStart[1] >= 1 && clusterStart[1] <= 12, 'month must be between 1 and 12');
</span><span class="cx"> assert.ok(clusterStart[2] >= 1 && clusterStart[2] <= 31, 'date must be between 1 and 31');
</span><span class="lines">@@ -50,8 +50,8 @@
</span><span class="cx"> assert.ok(clusterStart[4] >= 0 && clusterStart[4] <= 60, 'minute must be between 0 and 60');
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should define `clusterSize`', function () {
- var clusterSize = Config.value('clusterSize');
</del><ins>+ it('should define `clusterSize`', () => {
+ const clusterSize = Config.value('clusterSize');
</ins><span class="cx"> assert.ok(clusterSize instanceof Array);
</span><span class="cx"> assert.equal(clusterSize.length, [0, 2, 0].length,
</span><span class="cx"> 'Must specify the number of years, months, and days');
</span><span class="lines">@@ -60,35 +60,34 @@
</span><span class="cx"> assert.equal(typeof clusterSize[2], 'number', 'the number of days must be a number');
</span><span class="cx"> });
</span><span class="cx">
</span><del>- describe('`dashboards`', function () {
- var dashboards = Config.value('dashboards');
</del><ins>+ describe('`dashboards`', () => {
+ const dashboards = Config.value('dashboards');
</ins><span class="cx">
</span><del>- it('should exist for v2 and v3 UI', function () {
</del><ins>+ it('should exist for v2 and v3 UI', () => {
</ins><span class="cx"> assert.equal(typeof dashboards, 'object');
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('dashboard names that do not contain /', function () {
- for (var name in dashboards)
</del><ins>+ it('dashboard names that do not contain /', () => {
+ for (let name in dashboards)
</ins><span class="cx"> assert.ok(name.indexOf('/') < 0, 'Dashboard name "${name}" should not contain "/"');
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('each dashboard must be an array', function () {
- for (var name in dashboards)
</del><ins>+ it('each dashboard must be an array', () => {
+ for (let name in dashboards)
</ins><span class="cx"> assert.ok(dashboards[name] instanceof Array);
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('each row in a dashboard must be an array', function () {
- for (var name in dashboards) {
- for (var row of dashboards[name]) {
</del><ins>+ it('each row in a dashboard must be an array', () => {
+ for (let name in dashboards) {
+ for (let row of dashboards[name])
</ins><span class="cx"> console.assert(row instanceof Array);
</span><del>- }
</del><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('each cell in a dashboard must be an array or a string', function () {
- for (var name in dashboards) {
- for (var row of dashboards[name]) {
- for (var cell of row) {
</del><ins>+ it('each cell in a dashboard must be an array or a string', () => {
+ for (let name in dashboards) {
+ for (let row of dashboards[name]) {
+ for (let cell of row) {
</ins><span class="cx"> if (cell instanceof Array)
</span><span class="cx"> assert.ok(cell.length == 0 || cell.length == 2,
</span><span class="cx"> 'Each cell must be empty or specify [platform, metric] pair');
</span><span class="lines">@@ -101,67 +100,66 @@
</span><span class="cx">
</span><span class="cx"> });
</span><span class="cx">
</span><del>- describe('`database`', function () {
- it('should exist', function () {
</del><ins>+ describe('`database`', () => {
+ it('should exist', () => {
</ins><span class="cx"> assert.ok(Config.value('database'));
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should define `database.host`', function () {
</del><ins>+ it('should define `database.host`', () => {
</ins><span class="cx"> assert.equal(typeof Config.value('database.host'), 'string');
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should define `database.port`', function () {
</del><ins>+ it('should define `database.port`', () => {
</ins><span class="cx"> assert.equal(typeof Config.value('database.port'), 'string');
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should define `database.username`', function () {
</del><ins>+ it('should define `database.username`', () => {
</ins><span class="cx"> assert.equal(typeof Config.value('database.username'), 'string');
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should define `database.password`', function () {
</del><ins>+ it('should define `database.password`', () => {
</ins><span class="cx"> assert.equal(typeof Config.value('database.password'), 'string');
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should define `database.name`', function () {
</del><ins>+ it('should define `database.name`', () => {
</ins><span class="cx"> assert.equal(typeof Config.value('database.name'), 'string');
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should be able to connect to the database', function (done) {
</del><ins>+ it('should be able to connect to the database', () => {
</ins><span class="cx"> let database = new Database;
</span><del>- database.connect().then(function () {
</del><ins>+ database.connect().then(() => {
</ins><span class="cx"> database.disconnect();
</span><del>- done();
- }, function (error) {
</del><ins>+ }, (error) => {
</ins><span class="cx"> database.disconnect();
</span><del>- done(error);
</del><ins>+ throw error;
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><del>- describe('optional configurations', function () {
</del><ins>+ describe('optional configurations', () => {
</ins><span class="cx"> function assertNullOrType(value, type) {
</span><span class="cx"> if (value !== null)
</span><span class="cx"> assert.equal(typeof value, type);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- it('`debug` should be `null` or a boolean', function () {
</del><ins>+ it('`debug` should be `null` or a boolean', () => {
</ins><span class="cx"> assertNullOrType(Config.value('debug'), 'boolean');
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('`maintenanceMode` should be `null` or a boolean', function () {
</del><ins>+ it('`maintenanceMode` should be `null` or a boolean', () => {
</ins><span class="cx"> assertNullOrType(Config.value('maintenanceMode'), 'boolean');
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('`maintenanceDirectory` should be `null` or a string', function () {
</del><ins>+ it('`maintenanceDirectory` should be `null` or a string', () => {
</ins><span class="cx"> assertNullOrType(Config.value('maintenanceDirectory'), 'string');
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('`maintenanceDirectory` should be a string if `maintenanceMode` is true', function () {
</del><ins>+ it('`maintenanceDirectory` should be a string if `maintenanceMode` is true', () => {
</ins><span class="cx"> if (Config.value('maintenanceMode'))
</span><span class="cx"> assert.equal(Config.value('maintenanceDirectory'), 'string');
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('`universalSlavePassword` should be `null` or a string', function () {
</del><ins>+ it('`universalSlavePassword` should be `null` or a string', () => {
</ins><span class="cx"> assertNullOrType(Config.value('universalSlavePassword'), 'string');
</span><span class="cx"> });
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgunittestsprivilegedapitestsjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/unit-tests/privileged-api-tests.js (213992 => 213993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/unit-tests/privileged-api-tests.js 2017-03-15 18:15:31 UTC (rev 213992)
+++ trunk/Websites/perf.webkit.org/unit-tests/privileged-api-tests.js 2017-03-15 18:15:33 UTC (rev 213993)
</span><span class="lines">@@ -2,24 +2,24 @@
</span><span class="cx">
</span><span class="cx"> const assert = require('assert');
</span><span class="cx">
</span><del>-let MockRemoteAPI = require('./resources/mock-remote-api.js').MockRemoteAPI;
</del><ins>+const MockRemoteAPI = require('./resources/mock-remote-api.js').MockRemoteAPI;
</ins><span class="cx"> require('../tools/js/v3-models.js');
</span><span class="cx">
</span><del>-describe('PrivilegedAPI', function () {
</del><ins>+describe('PrivilegedAPI', () => {
</ins><span class="cx"> let requests = MockRemoteAPI.inject();
</span><span class="cx">
</span><del>- beforeEach(function () {
</del><ins>+ beforeEach(() => {
</ins><span class="cx"> PrivilegedAPI._token = null;
</span><del>- })
</del><ins>+ });
</ins><span class="cx">
</span><del>- describe('requestCSRFToken', function () {
- it('should generate a new token', function () {
</del><ins>+ describe('requestCSRFToken', () => {
+ it('should generate a new token', () => {
</ins><span class="cx"> PrivilegedAPI.requestCSRFToken();
</span><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> assert.equal(requests[0].url, '/privileged-api/generate-csrf-token');
</span><span class="cx"> });
</span><span class="cx">
</span><del>- it('should not generate a new token if the existing token had not expired', function (done) {
</del><ins>+ it('should not generate a new token if the existing token had not expired', () => {
</ins><span class="cx"> const tokenRequest = PrivilegedAPI.requestCSRFToken();
</span><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> assert.equal(requests[0].url, '/privileged-api/generate-csrf-token');
</span><span class="lines">@@ -27,15 +27,14 @@
</span><span class="cx"> token: 'abc',
</span><span class="cx"> expiration: Date.now() + 3600 * 1000,
</span><span class="cx"> });
</span><del>- tokenRequest.then(function (token) {
</del><ins>+ return tokenRequest.then((token) => {
</ins><span class="cx"> assert.equal(token, 'abc');
</span><span class="cx"> PrivilegedAPI.requestCSRFToken();
</span><span class="cx"> assert.equal(requests.length, 1);
</span><del>- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should generate a new token if the existing token had already expired', function (done) {
</del><ins>+ it('should generate a new token if the existing token had already expired', () => {
</ins><span class="cx"> const tokenRequest = PrivilegedAPI.requestCSRFToken();
</span><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> assert.equal(requests[0].url, '/privileged-api/generate-csrf-token');
</span><span class="lines">@@ -43,20 +42,19 @@
</span><span class="cx"> token: 'abc',
</span><span class="cx"> expiration: Date.now() - 1,
</span><span class="cx"> });
</span><del>- tokenRequest.then(function (token) {
</del><ins>+ return tokenRequest.then((token) => {
</ins><span class="cx"> assert.equal(token, 'abc');
</span><span class="cx"> PrivilegedAPI.requestCSRFToken();
</span><span class="cx"> assert.equal(requests.length, 2);
</span><span class="cx"> assert.equal(requests[1].url, '/privileged-api/generate-csrf-token');
</span><del>- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><del>- describe('sendRequest', function () {
</del><ins>+ describe('sendRequest', () => {
</ins><span class="cx">
</span><del>- it('should generate a new token if no token had been fetched', function (done) {
- PrivilegedAPI.sendRequest('test', {});
</del><ins>+ it('should generate a new token if no token had been fetched', () => {
+ const promise = PrivilegedAPI.sendRequest('test', {});
</ins><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> assert.equal(requests[0].url, '/privileged-api/generate-csrf-token');
</span><span class="cx"> requests[0].resolve({
</span><span class="lines">@@ -63,16 +61,13 @@
</span><span class="cx"> token: 'abc',
</span><span class="cx"> expiration: Date.now() + 100 * 1000,
</span><span class="cx"> });
</span><del>- Promise.resolve().then(function () {
- return Promise.resolve();
- }).then(function () {
</del><ins>+ return MockRemoteAPI.waitForRequest().then(() => {
</ins><span class="cx"> assert.equal(requests.length, 2);
</span><span class="cx"> assert.equal(requests[1].url, '/privileged-api/test');
</span><del>- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should not generate a new token if the existing token had not been expired', function (done) {
</del><ins>+ it('should not generate a new token if the existing token had not been expired', () => {
</ins><span class="cx"> PrivilegedAPI.sendRequest('test', {});
</span><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> assert.equal(requests[0].url, '/privileged-api/generate-csrf-token');
</span><span class="lines">@@ -80,37 +75,31 @@
</span><span class="cx"> token: 'abc',
</span><span class="cx"> expiration: Date.now() + 3600 * 1000,
</span><span class="cx"> });
</span><del>- Promise.resolve().then(function () {
- return Promise.resolve();
- }).then(function () {
</del><ins>+ return MockRemoteAPI.waitForRequest().then(() => {
</ins><span class="cx"> assert.equal(requests.length, 2);
</span><span class="cx"> assert.equal(requests[1].url, '/privileged-api/test');
</span><span class="cx"> PrivilegedAPI.sendRequest('test2', {});
</span><del>- return Promise.resolve();
- }).then(function () {
</del><ins>+ return MockRemoteAPI.waitForRequest();
+ }).then(() => {
</ins><span class="cx"> assert.equal(requests.length, 3);
</span><span class="cx"> assert.equal(requests[2].url, '/privileged-api/test2');
</span><del>- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should reject immediately when a token generation had failed', function (done) {
</del><ins>+ it('should reject immediately when a token generation had failed', () => {
</ins><span class="cx"> const request = PrivilegedAPI.sendRequest('test', {});
</span><span class="cx"> let caught = false;
</span><del>- request.catch(function () { caught = true; });
</del><ins>+ request.catch(() => { caught = true; });
</ins><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> assert.equal(requests[0].url, '/privileged-api/generate-csrf-token');
</span><span class="cx"> requests[0].reject({status: 'FailedToGenerateToken'});
</span><del>- Promise.resolve().then(function () {
- return Promise.resolve();
- }).then(function () {
</del><ins>+ return new Promise((resolve) => setTimeout(resolve, 0)).then(() => {
</ins><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> assert(caught);
</span><del>- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should re-generate token when it had become invalid', function (done) {
</del><ins>+ it('should re-generate token when it had become invalid', () => {
</ins><span class="cx"> PrivilegedAPI.sendRequest('test', {});
</span><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> assert.equal(requests[0].url, '/privileged-api/generate-csrf-token');
</span><span class="lines">@@ -118,15 +107,13 @@
</span><span class="cx"> token: 'abc',
</span><span class="cx"> expiration: Date.now() + 3600 * 1000,
</span><span class="cx"> });
</span><del>- Promise.resolve().then(function () {
- return Promise.resolve();
- }).then(function () {
</del><ins>+ return MockRemoteAPI.waitForRequest().then(() => {
</ins><span class="cx"> assert.equal(requests.length, 2);
</span><span class="cx"> assert.equal(requests[1].data.token, 'abc');
</span><span class="cx"> assert.equal(requests[1].url, '/privileged-api/test');
</span><span class="cx"> requests[1].reject('InvalidToken');
</span><del>- return Promise.resolve();
- }).then(function () {
</del><ins>+ return MockRemoteAPI.waitForRequest();
+ }).then(() => {
</ins><span class="cx"> assert.equal(requests.length, 3);
</span><span class="cx"> assert.equal(requests[2].url, '/privileged-api/generate-csrf-token');
</span><span class="cx"> requests[2].resolve({
</span><span class="lines">@@ -133,17 +120,18 @@
</span><span class="cx"> token: 'def',
</span><span class="cx"> expiration: Date.now() + 3600 * 1000,
</span><span class="cx"> });
</span><del>- return Promise.resolve();
- }).then(function () {
</del><ins>+ return MockRemoteAPI.waitForRequest();
+ }).then(() => {
</ins><span class="cx"> assert.equal(requests.length, 4);
</span><span class="cx"> assert.equal(requests[3].data.token, 'def');
</span><span class="cx"> assert.equal(requests[3].url, '/privileged-api/test');
</span><del>- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- it('should not re-generate token when the re-fetched token was invalid', function (done) {
- PrivilegedAPI.sendRequest('test', {});
</del><ins>+ it('should not re-generate token when the re-fetched token was invalid', () => {
+ const request = PrivilegedAPI.sendRequest('test', {});
+ let caught = false;
+ request.catch(() => caught = true);
</ins><span class="cx"> assert.equal(requests.length, 1);
</span><span class="cx"> assert.equal(requests[0].url, '/privileged-api/generate-csrf-token');
</span><span class="cx"> requests[0].resolve({
</span><span class="lines">@@ -150,15 +138,13 @@
</span><span class="cx"> token: 'abc',
</span><span class="cx"> expiration: Date.now() + 3600 * 1000,
</span><span class="cx"> });
</span><del>- Promise.resolve().then(function () {
- return Promise.resolve();
- }).then(function () {
</del><ins>+ return MockRemoteAPI.waitForRequest().then(() => {
</ins><span class="cx"> assert.equal(requests.length, 2);
</span><span class="cx"> assert.equal(requests[1].data.token, 'abc');
</span><span class="cx"> assert.equal(requests[1].url, '/privileged-api/test');
</span><span class="cx"> requests[1].reject('InvalidToken');
</span><del>- return Promise.resolve();
- }).then(function () {
</del><ins>+ return MockRemoteAPI.waitForRequest();
+ }).then(() => {
</ins><span class="cx"> assert.equal(requests.length, 3);
</span><span class="cx"> assert.equal(requests[2].url, '/privileged-api/generate-csrf-token');
</span><span class="cx"> requests[2].resolve({
</span><span class="lines">@@ -165,16 +151,17 @@
</span><span class="cx"> token: 'def',
</span><span class="cx"> expiration: Date.now() + 3600 * 1000,
</span><span class="cx"> });
</span><del>- return Promise.resolve();
- }).then(function () {
</del><ins>+ return MockRemoteAPI.waitForRequest();
+ }).then(() => {
</ins><span class="cx"> assert.equal(requests.length, 4);
</span><span class="cx"> assert.equal(requests[3].data.token, 'def');
</span><span class="cx"> assert.equal(requests[3].url, '/privileged-api/test');
</span><span class="cx"> requests[3].reject('InvalidToken');
</span><del>- }).then(function () {
</del><ins>+ return new Promise((resolve) => setTimeout(resolve, 0));
+ }).then(() => {
+ assert(caught);
</ins><span class="cx"> assert.equal(requests.length, 4);
</span><del>- done();
- }).catch(done);
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> });
</span></span></pre>
</div>
</div>
</body>
</html>