From a702f4eaa4715141e91ac4b106ff400cd4d97f27 Mon Sep 17 00:00:00 2001 From: Kevin Phillips Date: Tue, 3 Jan 2017 16:17:34 -0600 Subject: [PATCH 1/3] using the latest firefox --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ff54548..448fc6c 100644 --- 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" \ No newline at end of file + - "sh -e /etc/init.d/xvfb start" +addons: + firefox: "latest" From ad590795432d5bfaae5d0f3796ce5c25e8cf93fe Mon Sep 17 00:00:00 2001 From: Kevin Phillips Date: Wed, 4 Jan 2017 09:54:28 -0600 Subject: [PATCH 2/3] ensuring 'in' operator is not used on undefined --- test/component-map-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/component-map-test.js b/test/component-map-test.js index 3071772..0da37a3 100644 --- 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; } }; From 6e9979e684b09bc420278a94d7a834096e3e7e8c Mon Sep 17 00:00:00 2001 From: Kevin Phillips Date: Wed, 4 Jan 2017 09:58:21 -0600 Subject: [PATCH 3/3] making setTimeouts consistent --- test/component-map-test.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/component-map-test.js b/test/component-map-test.js index 0da37a3..0e7a2cd 100644 --- a/test/component-map-test.js +++ b/test/component-map-test.js @@ -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); } });