mirror of
https://github.com/Polymer/polymer.git
synced 2026-08-18 17:04:57 -05:00
Merge branch 'master' into legacy-undefined-noBatch-master-merge
This commit is contained in:
+4
-5
@@ -6,11 +6,10 @@ services:
|
||||
- xvfb
|
||||
addons:
|
||||
firefox: latest
|
||||
apt:
|
||||
sources:
|
||||
- google-chrome
|
||||
packages:
|
||||
- google-chrome-stable
|
||||
chrome: stable
|
||||
cache:
|
||||
directories:
|
||||
- node_modules
|
||||
before_script:
|
||||
- npm install -g gulp-cli@1
|
||||
- gulp lint-eslint
|
||||
|
||||
Generated
+644
-597
File diff suppressed because it is too large
Load Diff
+3
-1
@@ -79,7 +79,9 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
||||
'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
|
||||
|
||||
@@ -381,9 +381,9 @@ suite('Mutate light DOM', function() {
|
||||
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 @@ suite('Mutate light DOM', function() {
|
||||
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]);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user