test: fix Safari errors in CI (#440)

* test: fix DOM assertion in a test for Safari 9 * test: fix pushState throttler for iOS 12
vaadin · Feb 26, 2020 · cee8143 · cee8143
1 parent c68243b
commit cee8143
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/test/router/parent-layouts.spec.html b/test/router/parent-layouts.spec.html
@@ -249,7 +249,9 @@
       it('should throw not found when neither children nor siblings match', async() => {
         // Ensure outlet is clean
         const childNodes = Array.from(outlet.childNodes);
-        outlet.textContent = '';
+        while (outlet.childNodes.length) {
+          outlet.removeChild(outlet.lastChild);
+        }
 
         router.setRoutes([
           {path: '/a', component: 'x-a', children: [
@@ -269,7 +271,9 @@
         expect(error.message).to.match(/page not found/i);
 
         // Restore previous outlet content
-        outlet.textContent = '';
+        while (outlet.childNodes.length) {
+          outlet.removeChild(outlet.lastChild);
+        }
         childNodes.forEach(childNode => outlet.appendChild(childNode));
       });
 

diff --git a/test/test-pushstate-throttler.html b/test/test-pushstate-throttler.html
@@ -124,14 +124,14 @@
         return new Promise((resolve, reject) => {
           if (runnerWindow.pushStateCount > 85 || force) {
             const cooldownPeriod = 30 * 1000;
-            test.timeout(cooldownPeriod + 5000);
             const cooldownMessage = this.$['safari-cooldown'];
             cooldownMessage.removeAttribute('hidden');
             setTimeout(() => {
               cooldownMessage.setAttribute('hidden', 'hidden');
               runnerWindow.pushStateCount = 0;
               resolve();
             }, cooldownPeriod);
+            test.timeout(cooldownPeriod + 5000);
           } else {
             resolve();
           }