Home page Forum Wiki Mail Jabber Devel NIX-FILES

AltLUG Git

Git-repositories of Altai Linux User Group

Merge remote branch 'wwalser/recursionBug'
authorJörn Zaefferer <joern.zaefferer@gmail.com>
Mon, 10 Oct 2011 14:35:06 +0000 (16:35 +0200)
committerJörn Zaefferer <joern.zaefferer@gmail.com>
Mon, 10 Oct 2011 14:35:06 +0000 (16:35 +0200)
Conflicts:
qunit/qunit.js

1  2 
qunit/qunit.js
test/test.js

diff --cc qunit/qunit.js
@@@ -124,7 -124,8 +126,8 @@@ Test.prototype = 
                }
        },
        finish: function() {
 -              if ( this.expected && this.expected != this.assertions.length ) {
+               config.current = this;
 +              if ( this.expected != null && this.expected != this.assertions.length ) {
                        QUnit.ok( false, "Expected " + this.expected + " assertions, but " + this.assertions.length + " were run" );
                }
  
diff --cc test/test.js
Simple merge

Hosting is provided AltSPAHow to use Git
Please direct any questions on jabber alex.wolf@jabber.ru

Valid HTML 4.0 Transitional Valid CSS!

Designer Alexander Wolf