From 61a14c17cef6020c224d91e95be9e73d342276d7 Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Tue, 21 Jan 2020 17:29:25 -0800
Subject: [PATCH] Fix testing issues with latest webcomponentsjs

* querySelectorAll now polyfills an NodeList so coerce to Array when doing `deepEquals`
* when testing noPatch, add workaround for https://github.com/webcomponents/polyfills/issues/250.
---
 test/runner.html     |  4 +++-
 test/unit/shady.html | 12 ++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/test/runner.html b/test/runner.html
index e174cab993..af3cebde8a 100644
--- a/test/runner.html
+++ b/test/runner.html
@@ -71,7 +71,9 @@
       'unit/dom-bind.html',
       'unit/array-selector.html',
       'unit/polymer-dom.html',
-      'unit/polymer-dom-nopatch.html',
+      // Forced to `noPatch` here to workaround
+      // https://github.com/webcomponents/polyfills/issues/250.
+      'unit/polymer-dom-nopatch.html?wc-noPatch=true',
       'unit/polymer-dom-observeNodes.html',
       'unit/flattened-nodes-observer.html',
       // TODO: substitute for equivalent es6 import tests
diff --git a/test/unit/shady.html b/test/unit/shady.html
index e53ca50f69..4716843b59 100644
--- a/test/unit/shady.html
+++ b/test/unit/shady.html
@@ -381,9 +381,9 @@
     child.shadowRoot.innerHTML = '<slot></slot><span id="sub"></span>';
     var childLocalSub = child.shadowRoot.lastChild;
     ShadyDOM.flush();
-    assert.deepEqual(host.root.querySelectorAll('span#main'), [hostLocalMain]);
-    assert.deepEqual(host.root.querySelectorAll('div#sub'), [childLightSub]);
-    assert.deepEqual(child.root.querySelectorAll('span#sub'), [childLocalSub]);
+    assert.deepEqual(Array.from(host.root.querySelectorAll('span#main')), [hostLocalMain]);
+    assert.deepEqual(Array.from(host.root.querySelectorAll('div#sub')), [childLightSub]);
+    assert.deepEqual(Array.from(child.root.querySelectorAll('span#sub')), [childLocalSub]);
   });
 
   test('querySelectorAll (light dom)', function() {
@@ -396,9 +396,9 @@
     var childLightSub = getComposedChildAtIndex(child, 100) ;
     child.shadowRoot.innerHTML = '<slot></slot><span id="sub"></span>';
     ShadyDOM.flush();
-    assert.deepEqual(host.querySelectorAll('div#main'), [hostLightMain]);
-    assert.deepEqual(host.querySelectorAll('#sub'), []);
-    assert.deepEqual(child.querySelectorAll('div#sub'), [childLightSub]);
+    assert.deepEqual(Array.from(host.querySelectorAll('div#main')), [hostLightMain]);
+    assert.deepEqual(Array.from(host.querySelectorAll('#sub')), []);
+    assert.deepEqual(Array.from(child.querySelectorAll('div#sub')), [childLightSub]);
   });
 
 });