Skip to content

Commit

Permalink
Tests: Run each.js tests in test-on-node and mozjs.js too
Browse files Browse the repository at this point in the history
Ref #1569.
Ref #1511.
  • Loading branch information
Krinkle authored Jun 5, 2021
1 parent 75bbe0e commit 47576c1
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ module.exports = function( grunt ) {
"test/string-filter.html",
"test/module-skip.html",
"test/module-todo.html",
"test/each.html",
"test/only-each.html",

// ensure this is last - it has the potential to drool
Expand All @@ -112,15 +111,19 @@ module.exports = function( grunt ) {
}
}
},

// Sync with test/index.html and test/mozjs.js
"test-on-node": {
files: [
"test/logs.js",
"test/main/test.js",
"test/main/each.js",
"test/main/assert.js",
"test/main/assert/step.js",
"test/main/assert/timeout.js",
"test/main/async.js",
"test/main/promise.js",
"test/main/dump.js",
"test/main/modules.js",
"test/main/deepEqual.js",
"test/main/stack.js",
Expand All @@ -130,7 +133,6 @@ module.exports = function( grunt ) {
"test/onerror/inside-test.js",
"test/onerror/outside-test.js",
"test/setTimeout.js",
"test/main/dump.js",
"test/node/storage-1.js",
"test/node/storage-2.js",

Expand Down
2 changes: 2 additions & 0 deletions test/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
<title>QUnit Main Test Suite</title>
<link rel="stylesheet" href="../qunit/qunit.css">
<script src="../qunit/qunit.js"></script>
<!-- Sync with Gruntfile.js#test-on-node and test/mozjs.js -->
<script src="main/test.js"></script>
<script src="main/each.js"></script>
<script src="main/assert.js"></script>
<script src="main/assert/step.js"></script>
<script src="main/assert/timeout.js"></script>
Expand Down
2 changes: 2 additions & 0 deletions test/mozjs.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ QUnit.on( "runEnd", ( suiteEnd ) => {
}
} );

// Sync with Gruntfile.js#test-on-node and test/index.html
loadRelativeToScript( "../test/main/test.js" );
loadRelativeToScript( "../test/main/each.js" );
loadRelativeToScript( "../test/main/assert.js" );
loadRelativeToScript( "../test/main/assert/step.js" );
// Requires setTimeout, loadRelativeToScript( "../test/main/assert/timeout.js" );
Expand Down

0 comments on commit 47576c1

Please sign in to comment.