|
1 | | -/* |
| 1 | +/** |
2 | 2 | * QUnit - A JavaScript Unit Testing Framework |
3 | 3 | * |
4 | 4 | * http://docs.jquery.com/QUnit |
@@ -154,9 +154,9 @@ Test.prototype = { |
154 | 154 | // store result when possible |
155 | 155 | if ( QUnit.config.reorder && defined.sessionStorage ) { |
156 | 156 | if (bad) { |
157 | | - sessionStorage.setItem("qunit-" + this.module + "-" + this.testName, bad) |
| 157 | + sessionStorage.setItem("qunit-" + this.module + "-" + this.testName, bad); |
158 | 158 | } else { |
159 | | - sessionStorage.removeItem("qunit-" + this.testName); |
| 159 | + sessionStorage.removeItem("qunit-" + this.module + "-" + this.testName); |
160 | 160 | } |
161 | 161 | } |
162 | 162 |
|
@@ -536,9 +536,9 @@ extend(QUnit, { |
536 | 536 | */ |
537 | 537 | reset: function() { |
538 | 538 | if ( window.jQuery ) { |
539 | | - jQuery( "#main, #qunit-fixture" ).html( config.fixture ); |
| 539 | + jQuery( "#qunit-fixture" ).html( config.fixture ); |
540 | 540 | } else { |
541 | | - var main = id( 'main' ) || id( 'qunit-fixture' ); |
| 541 | + var main = id( 'qunit-fixture' ); |
542 | 542 | if ( main ) { |
543 | 543 | main.innerHTML = config.fixture; |
544 | 544 | } |
@@ -730,7 +730,7 @@ addEvent(window, "load", function() { |
730 | 730 | toolbar.appendChild( label ); |
731 | 731 | } |
732 | 732 |
|
733 | | - var main = id('main') || id('qunit-fixture'); |
| 733 | + var main = id('qunit-fixture'); |
734 | 734 | if ( main ) { |
735 | 735 | config.fixture = main.innerHTML; |
736 | 736 | } |
@@ -778,6 +778,11 @@ function done() { |
778 | 778 | id( "qunit-testresult" ).innerHTML = html; |
779 | 779 | } |
780 | 780 |
|
| 781 | + if ( typeof document !== "undefined" && document.title ) { |
| 782 | + // TODO what are the unicode codes for these? as-is fails if qunit.js isn't served with the right mimetype/charset |
| 783 | + document.title = (config.stats.bad ? "✖" : "✔") + " " + document.title; |
| 784 | + } |
| 785 | + |
781 | 786 | QUnit.done( { |
782 | 787 | failed: config.stats.bad, |
783 | 788 | passed: passed, |
@@ -881,16 +886,14 @@ function checkPollution( name ) { |
881 | 886 | var old = config.pollution; |
882 | 887 | saveGlobal(); |
883 | 888 |
|
884 | | - var newGlobals = diff( old, config.pollution ); |
| 889 | + var newGlobals = diff( config.pollution, old ); |
885 | 890 | if ( newGlobals.length > 0 ) { |
886 | 891 | ok( false, "Introduced global variable(s): " + newGlobals.join(", ") ); |
887 | | - config.current.expected++; |
888 | 892 | } |
889 | 893 |
|
890 | | - var deletedGlobals = diff( config.pollution, old ); |
| 894 | + var deletedGlobals = diff( old, config.pollution ); |
891 | 895 | if ( deletedGlobals.length > 0 ) { |
892 | 896 | ok( false, "Deleted global variable(s): " + deletedGlobals.join(", ") ); |
893 | | - config.current.expected++; |
894 | 897 | } |
895 | 898 | } |
896 | 899 |
|
|
0 commit comments