From 90060dde4c32b864be3308c1ef19faed560f2606 Mon Sep 17 00:00:00 2001 From: Caleb James DeLisle Date: Thu, 1 Jun 2017 10:08:16 +0200 Subject: [PATCH 1/2] added back safari --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d37176da5..a535229b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ env: - "BROWSER='chrome::Windows 10'" - "BROWSER='MicrosoftEdge:14.14393:Windows 10'" - "BROWSER='internet explorer:11.103:Windows 10'" - #- "BROWSER='safari:10.0:macOS 10.12'" + - "BROWSER='safari:10.0:macOS 10.12'" branches: only: - master From 337dd99b067986be54b325f4c42a6fc265c748b7 Mon Sep 17 00:00:00 2001 From: Caleb James DeLisle Date: Thu, 1 Jun 2017 10:15:57 +0200 Subject: [PATCH 2/2] lets see if safari will work with this... --- TestSelenium.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/TestSelenium.js b/TestSelenium.js index 82dc1fbc7..ace6d2656 100644 --- a/TestSelenium.js +++ b/TestSelenium.js @@ -35,7 +35,6 @@ var nt = nThen; nt = nt(function (waitFor) { var done = waitFor(); console.log('\n\n-----TEST ' + url + ' -----'); - driver.get(url); var waitTo = setTimeout(function () { console.log("no report in 20 seconds, timing out"); failed = true; @@ -69,7 +68,7 @@ var nt = nThen; if (done) { setTimeout(logMore, 50); } })); }; - logMore(); + driver.get(url).then(waitFor(logMore)); }).nThen; });