Move polymer-gestures and polymer-expressions from platform into polymer

googlearchive · Apr 17, 2014 · ade4f83 · ade4f83
1 parent c6cc7f4
commit ade4f83
Show file tree

Hide file tree

Showing 6 changed files with 107 additions and 2 deletions.
diff --git a/build.json b/build.json
@@ -1,4 +1,6 @@
 [
+  "../polymer-gestures/build.json",
+  "../polymer-expressions/build.json",
   "src/polymer.js",
   "src/boot.js",
   "src/lib/lang.js",

diff --git a/polymer.html b/polymer.html
@@ -3,6 +3,8 @@
  Use of this source code is governed by a BSD-style
  license that can be found in the LICENSE file.
 -->
+<link rel="import" href="../polymer-expressions/polymer-expressions.html">
+<link rel="import" href="../polymer-gestures/polymer-gestures.html">
 <script src="src/polymer.js"></script>
 <script src="src/boot.js"></script>
 <script src="src/lib/lang.js"></script>
@@ -29,4 +31,4 @@
 <script src="src/declaration/queue.js"></script>
 <script src="src/declaration/import.js"></script>
 <script src="src/declaration/polymer-element.js"></script>
-<link rel="import" href="src/polymer-body.html">
+<link rel="import" href="src/polymer-body.html">
diff --git a/test/html/mdv-shadow.html b/test/html/mdv-shadow.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<!--
+Copyright 2013 The Polymer Authors. All rights reserved.
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file.
+-->
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>MDV + ShadowDOM Polyfill Integration Tests</title>
+  <link rel="stylesheet" href="../../../tools/test/mocha/mocha.css">
+  <script src="../../../platform/platform.js" shadow="polyfill"></script>
+  <script>
+    var parserHasNativeTemplate = function() {
+      var div = document.createElement('div');
+      div.innerHTML = '<table><template>';
+      return div.firstChild.firstChild &&
+             div.firstChild.firstChild.tagName == 'TEMPLATE';
+    }();
+
+    var forceCollectObservers = true;
+    var exposeGetExpression = true;
+  </script>
+  <link rel="import" href="../../polymer.html">
+  <script src="../../../tools/test/mocha/mocha.js"></script>
+  <script src="../../../tools/test/chai/chai.js"></script>
+  <script src="../../../tools/test/htmltest.js"></script>
+  <script>
+
+    mocha.setup({
+      ignoreLeaks: true,
+      ui: 'tdd'
+    });
+
+    var assert = chai.assert;
+
+  </script>
+  <script src="../../../polymer-expressions/tests/tests.js"></script>
+  <script src="../../../TemplateBinding/tests/tests.js"></script>
+</head>
+<body>
+  <div id="mocha"></div>
+  <script>
+    addEventListener('polymer-ready', function() {
+      // mocha stomps window.onerror, save for failure case
+      var htmlsuite_fail = window.onerror;
+      var runner = mocha.run();
+      runner.on('fail', function(test, err) {
+        htmlsuite_fail(err.toString());
+      });
+      runner.on('end', function() {
+        runner.failures || done();
+      });
+    });
+  </script>
+</body>
+</html>
diff --git a/test/html/template-repeat-wrappers.html b/test/html/template-repeat-wrappers.html
@@ -0,0 +1,42 @@
+<!doctype html>
+<script src="../../../platform/platform.js"></script>
+<link rel="import" href="../../polymer.html">
+<script src="../../../tools/test/htmltest.js"></script>
+<script src="../../../tools/test/chai/chai.js"></script>
+
+<template id="template">
+  <div id="list">
+    <template id="t" repeat>
+      <div>{{label}}</div>
+    </template>
+  </div>
+</template>
+
+<div id="foo"></div>
+
+<script>
+  document.addEventListener('DOMContentLoaded', function() {
+    var template = document.querySelector('#template');
+
+    var host = document.querySelector('#foo');
+    var root = host.createShadowRoot();
+    root.appendChild(template.content);
+
+    var m = [
+      {label: 'item1'},
+      {label: 'item2'}
+    ];
+
+    host.shadowRoot.querySelector('#t').model = m;
+
+    // TODO(sjmiles): forcing SD to render at this point is not necessary, 
+    // except to understand why it causes a failure at the assertion
+    host.offsetHeight;
+    var list = host.shadowRoot.querySelector('#list');
+
+    new MutationObserver(function() {
+      chai.assert.equal(list.children.length, 3, 'list.children.length (should be 3 but returns 1)');  
+      done();
+    }).observe(list, {childList: true});
+  });
+</script>
diff --git a/test/js/mdv-syntax.js b/test/js/mdv-syntax.js
@@ -7,4 +7,6 @@
 htmlSuite('MDV syntax', function() {
   // TODO(dfreedm): Disable this test until polymer-expressions#19 is resolved
   // htmlTest('html/mdv-syntax.html');
+  htmlTest('html/template-repeat-wrappers.html');
+  htmlTest('html/mdv-shadow.html');
 });
diff --git a/test/runner.html b/test/runner.html
@@ -19,7 +19,7 @@
   <body>
     <div id="mocha"></div>
     <script>
-      mocha.setup({ui: 'tdd', slow: 1000, timeout: 5000, htmlbase: ''});
+      mocha.setup({ui: 'tdd', slow: 1000, timeout: 10000, htmlbase: ''});
     </script>
     <!-- -->
     <script src="js/marshall.js"></script>