Merge branch 'master' of github.com:jupiterjs/funcunit

bitovi · Jul 25, 2012 · a64aeaf · a64aeaf
2 parents 6ee9397 + 571c0fd
commit a64aeaf
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/browser/events.js b/browser/events.js
@@ -1,6 +1,6 @@
 (function(){
 
-	if(steal.options.instrument){
+	if(steal.instrument){
 		QUnit.done(function(){
 			// send to console
 			if(steal.options.browser){

diff --git a/browser/resources/json.js b/browser/resources/json.js
@@ -15,7 +15,7 @@
  */
 //
 
- steal('funcunit/browser/resources/jquery.js',function($){
+ steal('jquery', function($) {
     /**
      * @page jQuery.toJSON jQuery.toJSON
      * @parent jquerymx.lang

diff --git a/coverage/coverage.js b/coverage/coverage.js
@@ -156,9 +156,13 @@ steal('./coverage.css').then(function(){
 
 		var buildIgnoresForm = function(){
 			var ignoresHTML = ""; 
-			for(var i=0;i<steal.instrument.ignores.length; i++){
-				ignoresHTML += "<label class='ignore'><input id='newignore' type='checkbox' checked='checked' value='"+steal.instrument.ignores[i]+"' /> " +steal.instrument.ignores[i]+"</label>"
+
+			if(steal.instrument.ignores){
+				for(var i=0;i<steal.instrument.ignores.length; i++){
+					ignoresHTML += "<label class='ignore'><input id='newignore' type='checkbox' checked='checked' value='"+steal.instrument.ignores[i]+"' /> " +steal.instrument.ignores[i]+"</label>"
+				}
 			}
+
 			$("ignores").innerHTML = "<input id='newignore' type='text' />" + ignoresHTML;
 		}
 

diff --git a/open/selenium b/open/selenium
@@ -26,4 +26,6 @@
 				FuncUnit.browser.open(opts.page)
 			})
 
+	java.lang.System.exit(0);
+
 })()
diff --git a/qunit/qunit.js b/qunit/qunit.js
@@ -1630,10 +1630,11 @@ QUnit.diff = (function() {
 if(QUnit.urlParams["coverage"]){
 	steal("steal/instrument", function(){
 		// default ignores
-		var ignores = ["jquery","funcunit","steal","documentjs","*/test","*_test.js","mxui","*funcunit.js"] 
-		if(typeof FuncUnit !== "undefined"){
-			ignores = FuncUnit.coverageIgnore ;
+		var ignores = ["jquery","funcunit","steal","documentjs","*/test","*_test.js","*funcunit.js"] 
+		if(typeof FuncUnit !== "undefined" && FuncUnit.coverageIgnore){
+			ignores = FuncUnit.coverageIgnore;
 		}
+
 		// overwrite with our own ignores
 		steal.instrument.ignores = ignores;
 		steal("funcunit/coverage", function(){