Skip to content

Commit e095e1a

Browse files
committed
Revert to simple test runner
1 parent 5032bfb commit e095e1a

File tree

5 files changed

+20
-72
lines changed

5 files changed

+20
-72
lines changed

Gruntfile.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,7 @@ module.exports = function(grunt) {
8686
grunt.task.registerMultiTask('gentest', 'Generate test/runner-<target>.html', function() {
8787
var template = grunt.file.read('templates/runner.html')
8888
var filename = 'test/runner' + (this.target === targetConfig.defaultTarget ? '' : '-' + this.target) + '.html';
89-
var config = targetConfig[this.target];
90-
var contents = grunt.template.process(template, {data: {
91-
src: config.src,
92-
test: config.test,
93-
}});
89+
var contents = grunt.template.process(template, {data: {target: this.target}});
9490
grunt.file.write(filename, contents);
9591
grunt.log.writeln('File ' + filename + ' created');
9692
});

templates/runner.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<link rel="stylesheet" href="../node_modules/mocha/mocha.css">
1919
<script src="../node_modules/mocha/mocha.js"></script>
2020
<script src="../node_modules/chai/chai.js"></script>
21+
<script src="../target-config.js"></script>
2122
<script src="runner.js"></script>
22-
<% _.forEach(src, function(src) { %><script src="../<%= src %>"></script>
23-
<% }); %>
24-
<% _.forEach(test, function(test) { %><script src="../<%= test %>"></script>
25-
<% }); %>
23+
<script>
24+
loadWebAnimationsBuildTarget('<%= target %>');
25+
</script>
2626
<div id="mocha"></div>

test/runner-minifill.html

+4-28
Original file line numberDiff line numberDiff line change
@@ -18,33 +18,9 @@
1818
<link rel="stylesheet" href="../node_modules/mocha/mocha.css">
1919
<script src="../node_modules/mocha/mocha.js"></script>
2020
<script src="../node_modules/chai/chai.js"></script>
21+
<script src="../target-config.js"></script>
2122
<script src="runner.js"></script>
22-
<script src="../src/scope.js"></script>
23-
<script src="../src/animation-node.js"></script>
24-
<script src="../src/animation.js"></script>
25-
<script src="../src/apply.js"></script>
26-
<script src="../src/property-interpolation.js"></script>
27-
<script src="../src/color-handler.js"></script>
28-
<script src="../src/dimension-handler.js"></script>
29-
<script src="../src/effect.js"></script>
30-
<script src="../src/element-animate.js"></script>
31-
<script src="../src/interpolation.js"></script>
32-
<script src="../src/number-handler.js"></script>
33-
<script src="../src/player.js"></script>
34-
<script src="../src/timeline.js"></script>
35-
<script src="../src/transform-handler.js"></script>
36-
37-
<script src="../test/js/animation-node.js"></script>
38-
<script src="../test/js/color-handler.js"></script>
39-
<script src="../test/js/dimension-handler.js"></script>
40-
<script src="../test/js/effect.js"></script>
41-
<script src="../test/js/element-animate.js"></script>
42-
<script src="../test/js/interpolation.js"></script>
43-
<script src="../test/js/number-handler.js"></script>
44-
<script src="../test/js/player-finish-event.js"></script>
45-
<script src="../test/js/player.js"></script>
46-
<script src="../test/js/property-interpolation.js"></script>
47-
<script src="../test/js/transform-handler.js"></script>
48-
<script src="../test/js/timeline.js"></script>
49-
23+
<script>
24+
loadWebAnimationsBuildTarget('minifill');
25+
</script>
5026
<div id="mocha"></div>

test/runner.html

+4-35
Original file line numberDiff line numberDiff line change
@@ -18,40 +18,9 @@
1818
<link rel="stylesheet" href="../node_modules/mocha/mocha.css">
1919
<script src="../node_modules/mocha/mocha.js"></script>
2020
<script src="../node_modules/chai/chai.js"></script>
21+
<script src="../target-config.js"></script>
2122
<script src="runner.js"></script>
22-
<script src="../src/scope.js"></script>
23-
<script src="../src/animation-node.js"></script>
24-
<script src="../src/animation.js"></script>
25-
<script src="../src/apply.js"></script>
26-
<script src="../src/property-interpolation.js"></script>
27-
<script src="../src/color-handler.js"></script>
28-
<script src="../src/dimension-handler.js"></script>
29-
<script src="../src/effect.js"></script>
30-
<script src="../src/element-animate.js"></script>
31-
<script src="../src/interpolation.js"></script>
32-
<script src="../src/number-handler.js"></script>
33-
<script src="../src/player.js"></script>
34-
<script src="../src/timeline.js"></script>
35-
<script src="../src/transform-handler.js"></script>
36-
<script src="../src/animation-constructor.js"></script>
37-
<script src="../src/group-constructors.js"></script>
38-
<script src="../src/effect-callback.js"></script>
39-
40-
<script src="../test/js/group-constructors.js"></script>
41-
<script src="../test/js/group-player.js"></script>
42-
<script src="../test/js/group-player-finish-event.js"></script>
43-
<script src="../test/js/effect-callback.js"></script>
44-
<script src="../test/js/animation-node.js"></script>
45-
<script src="../test/js/color-handler.js"></script>
46-
<script src="../test/js/dimension-handler.js"></script>
47-
<script src="../test/js/effect.js"></script>
48-
<script src="../test/js/element-animate.js"></script>
49-
<script src="../test/js/interpolation.js"></script>
50-
<script src="../test/js/number-handler.js"></script>
51-
<script src="../test/js/player-finish-event.js"></script>
52-
<script src="../test/js/player.js"></script>
53-
<script src="../test/js/property-interpolation.js"></script>
54-
<script src="../test/js/transform-handler.js"></script>
55-
<script src="../test/js/timeline.js"></script>
56-
23+
<script>
24+
loadWebAnimationsBuildTarget('maxifill');
25+
</script>
5726
<div id="mocha"></div>

test/runner.js

+7
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@ var webAnimationsTesting = window;
33
var assert = chai.assert;
44
mocha.setup({ ui: 'tdd' });
55

6+
function loadWebAnimationsBuildTarget(target) {
7+
var config = webAnimationsTargetConfig[target];
8+
config.src.concat(config.test).forEach(function(file) {
9+
document.write('<script src="../' + file + '"></script>\n');
10+
});
11+
}
12+
613
(function() {
714

815
var pageError = null;

0 commit comments

Comments
 (0)