Merge pull request #74 from canjs/latest-firefox

using the latest firefox
canjs · Jan 4, 2017 · a8d121b · a8d121b
2 parents 4ef58b4 + 6e9979e
commit a8d121b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,4 +2,6 @@ language: node_js
 node_js: node
 before_install:
   - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
+  - "sh -e /etc/init.d/xvfb start"
+addons:
+  firefox: "latest"
diff --git a/test/component-map-test.js b/test/component-map-test.js
@@ -37,7 +37,7 @@ makeTest("can-component - map - dom", document, MUT_OBS);
 makeTest("can-component - map - vdom", makeDocument(), null);
 
 var innerHTML = function(node){
-	if("innerHTML" in node) {
+	if(node && "innerHTML" in node) {
 		return node.innerHTML;
 	}
 };
@@ -47,12 +47,12 @@ var runTasks = function(tasks){
 		var next = tasks.shift();
 		next();
 		if(tasks.length) {
-			setTimeout(nextTask, 10);
+			setTimeout(nextTask, 100);
 		} else {
 			start();
 		}
 	};
-	setTimeout(nextTask, 10);
+	setTimeout(nextTask, 100);
 };
 
 function makeTest(name, doc, mutObs) {
@@ -80,7 +80,7 @@ function makeTest(name, doc, mutObs) {
 				start();
 				DOCUMENT(DOC);
 				MUTATION_OBSERVER(MUT_OBS);
-			}, 1);
+			}, 100);
 
 
 		}
@@ -503,7 +503,7 @@ function makeTest(name, doc, mutObs) {
 						setTimeout(function () {
 							equal(innerHTML(tds[0]), "Brian", "td changed to brian");
 							start();
-						}, 10);
+						}, 100);
 
 					}
 				});