From a8575c627272d365e525844bfba1785cc6c49650 Mon Sep 17 00:00:00 2001
From: Russell Bicknell <bicknellr@google.com>
Date: Wed, 13 Jun 2018 11:13:13 -0700
Subject: [PATCH 1/6] Fix test so that it fails if the animation doesn't play.

---
 test/iron-dropdown.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/iron-dropdown.html b/test/iron-dropdown.html
index 400819c..ba39b54 100644
--- a/test/iron-dropdown.html
+++ b/test/iron-dropdown.html
@@ -316,14 +316,14 @@
                   getComputedStyle(content).pointerEvents,
                   'none',
                   'content is interactive');
+              dropdown.addEventListener('iron-overlay-opened', function() {
+                assert.notEqual(
+                    getComputedStyle(content).pointerEvents,
+                    'none',
+                    'content is not interactive');
+                done();
+              });
             }, 150);
-            dropdown.addEventListener('iron-overlay-opened', function() {
-              assert.notEqual(
-                  getComputedStyle(content).pointerEvents,
-                  'none',
-                  'content is not interactive');
-              done();
-            });
           });
         });
       });

From 82b6aaa397d0d782cd59b24f93ebb0e74278d5cf Mon Sep 17 00:00:00 2001
From: Russell Bicknell <bicknellr@google.com>
Date: Wed, 13 Jun 2018 12:19:23 -0700
Subject: [PATCH 2/6] Only load the web animations polyfill if we're using
 Polymer 2.

---
 test/iron-dropdown.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/iron-dropdown.html b/test/iron-dropdown.html
index ba39b54..a70c3ab 100644
--- a/test/iron-dropdown.html
+++ b/test/iron-dropdown.html
@@ -18,7 +18,13 @@
   <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
   <script src="../../web-component-tester/browser.js"></script>
   <script src="../../iron-test-helpers/mock-interactions.js"></script>
-  <script src="../../web-animations-js/web-animations-next-lite.min.js"></script>
+
+  <link rel="import" href="../../polymer/polymer.html">
+  <script>
+    if (Polymer.Element) {
+      document.write('<script src="../../web-animations-js/web-animations-next-lite.min.js"></scr' + 'ipt>');
+    }
+  </script>
 
   <link rel="import" href="../iron-dropdown.html">
   <link rel="import" href="../../neon-animation/animations/fade-in-animation.html">

From e5065cd9c079bfaaf38eaa34730527bd714ccf26 Mon Sep 17 00:00:00 2001
From: Russell Bicknell <bicknellr@google.com>
Date: Wed, 13 Jun 2018 12:24:55 -0700
Subject: [PATCH 3/6] format

---
 test/iron-dropdown.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/iron-dropdown.html b/test/iron-dropdown.html
index a70c3ab..7b41a3a 100644
--- a/test/iron-dropdown.html
+++ b/test/iron-dropdown.html
@@ -22,7 +22,9 @@
   <link rel="import" href="../../polymer/polymer.html">
   <script>
     if (Polymer.Element) {
-      document.write('<script src="../../web-animations-js/web-animations-next-lite.min.js"></scr' + 'ipt>');
+      document.write(
+          '<script src="../../web-animations-js/web-animations-next-lite.min.js"></scr' +
+          'ipt>');
     }
   </script>
 

From 958273ddec2f03a95bde05349fa79fdbfed68534 Mon Sep 17 00:00:00 2001
From: Russell Bicknell <bicknellr@google.com>
Date: Wed, 13 Jun 2018 12:35:37 -0700
Subject: [PATCH 4/6] Use sync XHR because polyfilled HTML Imports run after
 sync scripts. (...)

- Check neon-animations version, rather than that of Polymer.
---
 test/iron-dropdown.html | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/test/iron-dropdown.html b/test/iron-dropdown.html
index 7b41a3a..46e5a43 100644
--- a/test/iron-dropdown.html
+++ b/test/iron-dropdown.html
@@ -21,11 +21,19 @@
 
   <link rel="import" href="../../polymer/polymer.html">
   <script>
-    if (Polymer.Element) {
+    (function() {
+    const xhr = new XMLHttpRequest();
+    xhr.open('GET', '../../neon-animation/bower.json', false);
+    xhr.send();
+
+    const majorVersion =
+        parseInt(JSON.parse(xhr.responseText).version.split('.')[0], 10);
+    if (majorVersion !== 1) {
       document.write(
           '<script src="../../web-animations-js/web-animations-next-lite.min.js"></scr' +
           'ipt>');
     }
+    })();
   </script>
 
   <link rel="import" href="../iron-dropdown.html">

From f0277869e849f339dbfee481827ced80f1963966 Mon Sep 17 00:00:00 2001
From: Russell Bicknell <bicknellr@google.com>
Date: Wed, 13 Jun 2018 14:15:54 -0700
Subject: [PATCH 5/6] If neon-animation/bower.json doesn't have a version,
 assume it's 2.x between e750808 and 8e4880e.

---
 test/iron-dropdown.html | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/iron-dropdown.html b/test/iron-dropdown.html
index 46e5a43..6d765aa 100644
--- a/test/iron-dropdown.html
+++ b/test/iron-dropdown.html
@@ -19,16 +19,17 @@
   <script src="../../web-component-tester/browser.js"></script>
   <script src="../../iron-test-helpers/mock-interactions.js"></script>
 
-  <link rel="import" href="../../polymer/polymer.html">
   <script>
+    // Don't load the web animations polyfill if we're using neon-animations
+    // 1.x, which loads it itself.
     (function() {
     const xhr = new XMLHttpRequest();
     xhr.open('GET', '../../neon-animation/bower.json', false);
     xhr.send();
 
-    const majorVersion =
-        parseInt(JSON.parse(xhr.responseText).version.split('.')[0], 10);
-    if (majorVersion !== 1) {
+    const bowerJson = JSON.parse(xhr.responseText);
+    if (typeof bowerJson.version !== 'string' ||
+        parseInt(bowerJson.version.split('.')[0], 10) !== 1) {
       document.write(
           '<script src="../../web-animations-js/web-animations-next-lite.min.js"></scr' +
           'ipt>');

From ddb7a48461445ef7d60db297e66c3eeb60a67447 Mon Sep 17 00:00:00 2001
From: Russell Bicknell <bicknellr@google.com>
Date: Wed, 13 Jun 2018 15:34:20 -0700
Subject: [PATCH 6/6] Add a TODO about removing the neon-animations version
 check.json.

---
 test/iron-dropdown.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/iron-dropdown.html b/test/iron-dropdown.html
index 6d765aa..896c68c 100644
--- a/test/iron-dropdown.html
+++ b/test/iron-dropdown.html
@@ -22,6 +22,7 @@
   <script>
     // Don't load the web animations polyfill if we're using neon-animations
     // 1.x, which loads it itself.
+    // TODO(bicknellr): Remove when updating to 3.x, bower.json may be removed.
     (function() {
     const xhr = new XMLHttpRequest();
     xhr.open('GET', '../../neon-animation/bower.json', false);