Cleanup test/backbone.html and test/underscore.html.

This commit is contained in:
jdalton
2015-05-13 23:25:31 -07:00
parent 12081c9bd6
commit 4dfcfd2542
2 changed files with 8 additions and 12 deletions

View File

@@ -7,7 +7,7 @@
</head> </head>
<body> <body>
<script> <script>
// avoid reporting tests to Sauce Labs when script errors occur // Avoid reporting tests to Sauce Labs when script errors occur.
if (location.port == '9001') { if (location.port == '9001') {
window.onerror = function(message) { window.onerror = function(message) {
if (window.QUnit) { if (window.QUnit) {
@@ -38,11 +38,7 @@
QUnit.config.asyncRetries = 10; QUnit.config.asyncRetries = 10;
QUnit.config.hidepassed = true; QUnit.config.hidepassed = true;
// load lodash // Load test scripts.
if (!ui.isModularize) {
document.write('<script src="' + ui.buildPath + '"><\/script>');
}
// load test scripts
document.write(ui.urlParams.loader != 'none' document.write(ui.urlParams.loader != 'none'
? '<script data-dojo-config="async:1" src="' + ui.loaderPath + '"><\/script>' ? '<script data-dojo-config="async:1" src="' + ui.loaderPath + '"><\/script>'
: ([ : ([
@@ -90,7 +86,7 @@
'name': 'test', 'name': 'test',
'location': '../vendor/backbone/test', 'location': '../vendor/backbone/test',
'config': { 'config': {
// work around no global being exported // Work around no global being exported.
'exports': 'QUnit', 'exports': 'QUnit',
'loader': 'curl/loader/legacy' 'loader': 'curl/loader/legacy'
} }

View File

@@ -8,7 +8,7 @@
<body> <body>
<div id="qunit"></div> <div id="qunit"></div>
<script> <script>
// avoid reporting tests to Sauce Labs when script errors occur // Avoid reporting tests to Sauce Labs when script errors occur.
if (location.port == '9001') { if (location.port == '9001') {
window.onerror = function(message) { window.onerror = function(message) {
if (window.QUnit) { if (window.QUnit) {
@@ -27,7 +27,7 @@
QUnit.config.asyncRetries = 10; QUnit.config.asyncRetries = 10;
QUnit.config.hidepassed = true; QUnit.config.hidepassed = true;
// excuse tests we intentionally fail or those with problems // Excuse tests we intentionally fail or those with problems.
QUnit.config.excused = { QUnit.config.excused = {
'Arrays': { 'Arrays': {
'drop': [ 'drop': [
@@ -150,7 +150,7 @@
} }
}; };
// only excuse in Sauce Labs (buggy Safari and timers) // Only excuse in Sauce Labs (buggy Safari and timers).
if (!ui.isSauceLabs) { if (!ui.isSauceLabs) {
delete QUnit.config.excused.Functions['throttle repeatedly with results']; delete QUnit.config.excused.Functions['throttle repeatedly with results'];
delete QUnit.config.excused.Functions['more throttle does not trigger leading call when leading is set to false']; delete QUnit.config.excused.Functions['more throttle does not trigger leading call when leading is set to false'];
@@ -158,7 +158,7 @@
delete QUnit.config.excused.Functions['debounce asap']; delete QUnit.config.excused.Functions['debounce asap'];
delete QUnit.config.excused.Utility.now; delete QUnit.config.excused.Utility.now;
} }
// load test scripts // Load test scripts.
document.write(ui.urlParams.loader != 'none' document.write(ui.urlParams.loader != 'none'
? '<script data-dojo-config="async:1" src="' + ui.loaderPath + '"><\/script>' ? '<script data-dojo-config="async:1" src="' + ui.loaderPath + '"><\/script>'
: ([ : ([
@@ -199,7 +199,7 @@
'name': 'test', 'name': 'test',
'location': '../vendor/underscore/test', 'location': '../vendor/underscore/test',
'config': { 'config': {
// work around no global being exported // Work around no global being exported.
'exports': 'QUnit', 'exports': 'QUnit',
'loader': 'curl/loader/legacy' 'loader': 'curl/loader/legacy'
} }