Skip to content

Commit

Permalink
Fixes #5420
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Steven Orvell committed Nov 1, 2018
1 parent 725d52c commit 926a673
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions test/unit/behaviors.html
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@
<behavior-registered></behavior-registered>
</template>
</test-fixture>

<test-fixture id="from-registered">
<template>
<template-from-registered></template-from-registered>
Expand Down Expand Up @@ -602,8 +602,8 @@

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() {
Expand Down

0 comments on commit 926a673

Please sign in to comment.