Skip to content

Commit d91551f

Browse files
alancutteralancutter
committed
testharnessAdapter
1 parent ac3564e commit d91551f

7 files changed

+1568
-28
lines changed

‎Gruntfile.js

+37-8
Original file line numberDiff line numberDiff line change
@@ -186,17 +186,45 @@ module.exports = function(grunt) {
186186
sauce: testTargets,
187187
});
188188

189+
190+
function runKarma(configCallback) {
191+
return new Promise(function(resolve) {
192+
var karmaConfig = require('karma/lib/config').parseConfig(require('path').resolve('test/karma-config.js'), {});
193+
configCallback(karmaConfig);
194+
var karmaServer = require('karma').server;
195+
karmaServer.start(karmaConfig, function(exitCode) {
196+
resolve(exitCode == 0);
197+
});
198+
});
199+
}
200+
189201
function runTests(task, configCallback) {
190202
var done = task.async();
191-
var karmaConfig = require('karma/lib/config').parseConfig(require('path').resolve('test/karma-config.js'), {});
192203
var config = targetConfig[task.target];
193-
karmaConfig.files = ['test/karma-setup.js'].concat(config.src, config.test);
194-
if (configCallback) {
204+
205+
var mochaSuccess = false;
206+
runKarma(function(karmaConfig) {
195207
configCallback(karmaConfig);
196-
}
197-
var karmaServer = require('karma').server;
198-
karmaServer.start(karmaConfig, function(exitCode) {
199-
done(exitCode === 0);
208+
karmaConfig.plugins.push('karma-mocha', 'karma-chai');
209+
karmaConfig.frameworks.push('mocha', 'chai');
210+
karmaConfig.files = ['test/karma-mocha-setup.js'].concat(config.src, config.polyfillTests);
211+
}).then(function(success) {
212+
if (!config.runWebPlatformTests) {
213+
done(success);
214+
return;
215+
}
216+
mochaSuccess = success;
217+
return runKarma(function(karmaConfig) {
218+
configCallback(karmaConfig);
219+
karmaConfig.client.testList = grunt.file.expand('test/web-platform-tests/web-animations/**/*.html');
220+
karmaConfig.files.push('test/web-platform-tests-expectations.js');
221+
karmaConfig.files.push('test/karma-testharness-adapter.js');
222+
for (var pattern of ['test/web-platform-tests/web-animations/**', 'test/resources/*', 'src/**', '*.js']) {
223+
karmaConfig.files.push({pattern, included: false, served: true});
224+
}
225+
});
226+
}).then(function(testharnessSuccess) {
227+
done(mochaSuccess && testharnessSuccess);
200228
});
201229
}
202230

@@ -218,7 +246,8 @@ module.exports = function(grunt) {
218246
var target = this.target;
219247
runTests(this, function(karmaConfig) {
220248
karmaConfig.singleRun = true;
221-
karmaConfig.sauceLabs.testName = 'web-animation-next ' + target + ' Unit tests';
249+
karmaConfig.plugins.push('karma-saucelabs-launcher');
250+
karmaConfig.sauceLabs = {testName: 'web-animation-next ' + target + ' Unit tests'};
222251
});
223252
});
224253

‎target-config.js

+8-5
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
'src/effect-callback.js',
8282
'src/group-constructors.js'];
8383

84-
var webAnimations1Test = [
84+
var webAnimations1PolyfillTests = [
8585
'test/js/animation-cancel-event.js',
8686
'test/js/animation-finish-event.js',
8787
'test/js/animation.js',
@@ -100,7 +100,7 @@
100100
'test/js/transform-handler.js',
101101
'test/js/visibility-handler.js'];
102102

103-
var webAnimationsNextTest = webAnimations1Test.concat(
103+
var webAnimationsNextPolyfillTests = webAnimations1PolyfillTests.concat(
104104
'test/js/effect-callback.js',
105105
'test/js/group-animation-cancel-event.js',
106106
'test/js/group-animation-finish-event.js',
@@ -119,7 +119,8 @@
119119
webAnimations1BonusSrc: webAnimations1BonusSrc,
120120
webAnimationsNextSrc: [],
121121
src: scopeSrc.concat(sharedSrc).concat(webAnimations1Src).concat(webAnimations1BonusSrc),
122-
test: webAnimations1Test,
122+
polyfillTests: webAnimations1PolyfillTests,
123+
runWebPlatformTests: false,
123124
},
124125
'web-animations-next': {
125126
scopeSrc: scopeSrc,
@@ -128,7 +129,8 @@
128129
webAnimations1BonusSrc: webAnimations1BonusSrc,
129130
webAnimationsNextSrc: webAnimationsNextSrc,
130131
src: scopeSrc.concat(sharedSrc).concat(webAnimations1Src).concat(webAnimations1BonusSrc).concat(webAnimationsNextSrc),
131-
test: webAnimationsNextTest,
132+
polyfillTests: webAnimationsNextPolyfillTests,
133+
runWebPlatformTests: true,
132134
},
133135
'web-animations-next-lite': {
134136
scopeSrc: scopeSrc,
@@ -137,7 +139,8 @@
137139
webAnimations1BonusSrc: webAnimations1BonusSrc,
138140
webAnimationsNextSrc: webAnimationsNextSrc,
139141
src: scopeSrc.concat(sharedSrc).concat(liteWebAnimations1Src).concat(webAnimations1BonusSrc).concat(webAnimationsNextSrc),
140-
test: [],
142+
polyfillTests: [],
143+
runWebPlatformTests: false,
141144
},
142145
};
143146

‎test/karma-config.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
module.exports = function(config) {
22
config.set({
3-
frameworks: ['mocha', 'chai'],
3+
// The following config properties are populated by grunt:
4+
// frameworks, plugins, files.
45
plugins: [
5-
'karma-mocha',
6-
'karma-chai',
76
'karma-firefox-launcher'
87
],
98
browsers: ['Firefox'],
10-
// browsers: ['Safari', 'Chrome', 'ChromeCanary', 'Firefox', 'IE'],
119
basePath: '..',
12-
files: [
13-
// Populated in `grunt test` and `grunt debug` tasks.
14-
],
1510
port: 9876,
1611
reporters: ['dots'],
1712
colors: true,
1813
autoWatch: false,
14+
proxies: {
15+
'/resources/': '/base/test/resources/',
16+
'/test/': '/base/test/',
17+
'/polyfill/': '/base/',
18+
},
1919
});
2020
};

‎test/karma-setup.js ‎test/karma-mocha-setup.js

File renamed without changes.

‎test/karma-testharness-adapter.js

+140
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
(function() {
2+
var karma = window.__karma__;
3+
4+
function checkExpectations(testURL, passes, failures, expectedFailures) {
5+
expectedFailures = expectedFailures || {};
6+
7+
var failedDifferently = false;
8+
var differentFailures = {};
9+
10+
var failedUnexpectedly = false;
11+
var unexpectedFailures = {};
12+
13+
var passedUnexpectedly = false;
14+
var unexpectedPasses = [];
15+
16+
var hasStaleFailureExpectations = false;
17+
var staleFailureExpectations = [];
18+
19+
for (var name in failures) {
20+
var message = failures[name];
21+
if (name in expectedFailures) {
22+
if (expectedFailures[name] !== testharnessFlakyFailure && message != expectedFailures[name]) {
23+
failedDifferently = true;
24+
differentFailures[name] = message;
25+
}
26+
} else {
27+
failedUnexpectedly = true;
28+
unexpectedFailures[name] = message;
29+
}
30+
}
31+
for (var name in expectedFailures) {
32+
if (name in passes) {
33+
passedUnexpectedly = true;
34+
unexpectedPasses.push(name);
35+
} else if (!(name in failures)) {
36+
hasStaleFailureExpectations = true;
37+
staleFailureExpectations.push(name);
38+
}
39+
}
40+
41+
var message = '';
42+
if (hasStaleFailureExpectations) {
43+
message += 'Stale failure expectations, test no longer exists:\n';
44+
message += staleFailureExpectations.map(function(name) { return ' ' + name + '\n'; }).join('');
45+
message += '\n';
46+
}
47+
if (passedUnexpectedly) {
48+
message += 'Passed unexpectedly:\n';
49+
message += unexpectedPasses.map(function(name) { return ' ' + name + '\n'; }).join('');
50+
message += '\n';
51+
}
52+
if (failedDifferently) {
53+
message += 'Failed differently:\n';
54+
for (var name in differentFailures) {
55+
message += ' Test: ' + JSON.stringify(name) + '\n';
56+
message += ' Expected: ' + JSON.stringify(expectedFailures[name]) + '\n';
57+
message += ' Actual: ' + JSON.stringify(differentFailures[name]) + '\n\n';
58+
}
59+
message += '\n';
60+
}
61+
if (failedUnexpectedly) {
62+
message += 'Failed unexpectedly:\n';
63+
for (var name in unexpectedFailures) {
64+
message += ' Test: ' + JSON.stringify(name) + '\n';
65+
message += ' Failure: ' + JSON.stringify(unexpectedFailures[name]) + '\n\n';
66+
}
67+
message += '\n';
68+
}
69+
70+
return {
71+
suite: [testURL],
72+
description: '',
73+
success: message == '',
74+
log: message ? [message] : [],
75+
};
76+
}
77+
78+
karma.start = function() {
79+
var testURLs = karma.config.testList;
80+
if (!testURLs) {
81+
karma.error('testList not set on karma config.client');
82+
return;
83+
}
84+
if (typeof window.skippedTestharnessTests == 'undefined') {
85+
karma.error('skippedTestharnessTests data not set on window.');
86+
return;
87+
}
88+
if (typeof window.expectedTestharnessFailures == 'undefined') {
89+
karma.error('expectedTestharnessFailures data not set on window.');
90+
return;
91+
}
92+
93+
karma.info({total: testURLs.length});
94+
95+
var iframe = document.createElement('iframe');
96+
document.body.appendChild(iframe);
97+
98+
function runRemainingTests() {
99+
if (testURLs.length == 0) {
100+
karma.complete();
101+
return;
102+
}
103+
104+
var testURL = testURLs.shift();
105+
if (testURL in skippedTestharnessTests) {
106+
console.log('Skipping: ' + testURL + ' because: ' + skippedTestharnessTests[testURL]);
107+
karma.result({
108+
suite: [testURL],
109+
description: '',
110+
skipped: true,
111+
});
112+
runRemainingTests();
113+
return;
114+
}
115+
116+
window.initTestHarness = function(innerWindow) {
117+
innerWindow.add_completion_callback(function(results) {
118+
var failures = {};
119+
var passes = {};
120+
results.forEach(function(result) {
121+
if (result.status == 0) {
122+
passes[result.name] = true;
123+
} else {
124+
if (result.name in failures) {
125+
console.warn(testURL + ' has duplicate test name: ' + result.name);
126+
}
127+
failures[result.name] = result.message;
128+
}
129+
});
130+
131+
karma.result(checkExpectations(testURL, passes, failures, expectedTestharnessFailures[testURL]));
132+
runRemainingTests();
133+
});
134+
}
135+
iframe.src = testURL;
136+
}
137+
138+
runRemainingTests();
139+
};
140+
})();

‎test/resources/testharnessreport.js

+1-8
Original file line numberDiff line numberDiff line change
@@ -406,14 +406,7 @@ function dump_test_results(tests, status) {
406406
}
407407

408408
/* BEGIN WEB ANIMATIONS POLYFILL EXTRAS */
409-
var url = document.URL;
410-
var path = url.slice(0, url.lastIndexOf('/'));
411-
if (path.slice(-13).indexOf('interpolation') != -1) {
412-
document.write('<script src="../../../web-animations-next.dev.js"></script>');
413-
} else {
414-
document.write('<script src="../../web-animations-next.dev.js"></script>');
415-
}
416-
409+
document.write('<script src="/polyfill/web-animations-next.dev.js"></script>');
417410
if (window.parent && parent.window.initTestHarness) {
418411
parent.window.initTestHarness(window);
419412
} else {

0 commit comments

Comments
 (0)