Merge branch 'master' into v2

GoogleWebComponents · Jan 23, 2018 · 99c0dc8 · 99c0dc8
2 parents 9771707 + 510692a
commit 99c0dc8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/bower.json b/bower.json
@@ -13,14 +13,14 @@
     "/test/"
   ],
   "keywords": [
-    "web-component",
-    "web-components",
-    "polymer",
     "chart",
     "charts",
-    "google-visualization",
     "google",
-    "visualization"
+    "google-visualization",
+    "polymer",
+    "visualization",
+    "web-component",
+    "web-components"
   ],
   "dependencies": {
     "polymer": "Polymer/polymer#1.9 - 2"

diff --git a/demo/index.html b/demo/index.html
@@ -12,9 +12,7 @@
   <title>Google Chart Polymer Elements Demo</title>
 </head>
 
-<body>
-
+<body>  
   <google-chart-demo></google-chart-demo>
-
 </body>
 </html>
diff --git a/test/basic-tests.html b/test/basic-tests.html
@@ -13,6 +13,7 @@
   <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
   <script src="../../web-component-tester/browser.js"></script>
 
+  <link rel="import" href="../../promise-polyfill/promise-polyfill-lite.html">
   <link rel="import" href="../google-chart.html">
 </head>
 

diff --git a/test/index.html b/test/index.html
@@ -21,7 +21,8 @@
   <body>
     <script>
       WCT.loadSuites([
-        'basic-tests.html'
+        'basic-tests.html?wc-shadydom=true&wc-ce=true',
+        'basic-tests.html?dom=shadow'
       ]);
     </script>
   </body>