mirror of
https://github.com/Polymer/polymer.git
synced 2025-02-25 18:55:30 -06:00
Fixes #5420
This branch actually fixes this issue. A behavior specified template should win over a template specified via a dom-module. Updating the test here, which was validating the wrong result.
This commit is contained in:
@@ -365,7 +365,7 @@ Polymer({
|
||||
<behavior-registered></behavior-registered>
|
||||
</template>
|
||||
</test-fixture>
|
||||
|
||||
|
||||
<test-fixture id="from-registered">
|
||||
<template>
|
||||
<template-from-registered></template-from-registered>
|
||||
@@ -602,8 +602,8 @@ suite('templates from behaviors', function() {
|
||||
|
||||
test('template from base', function() {
|
||||
var el = fixture('from-base');
|
||||
assert.ok(el.shadowRoot.querySelector('#from-base'));
|
||||
assert.notOk(el.shadowRoot.querySelector('#from-behavior1'));
|
||||
assert.notOk(el.shadowRoot.querySelector('#from-base'));
|
||||
assert.ok(el.shadowRoot.querySelector('#from-behavior1'));
|
||||
});
|
||||
|
||||
test('template from behavior', function() {
|
||||
|
||||
Reference in New Issue
Block a user