Skip to content

Commit

Permalink
Import Polymer function in tests from legacy/polymer-fn.js
Browse files Browse the repository at this point in the history
  • Loading branch information
rictic committed Apr 16, 2018
1 parent 69f488b commit 232b004
Show file tree
Hide file tree
Showing 54 changed files with 212 additions and 212 deletions.
2 changes: 1 addition & 1 deletion lib/legacy/polymer-fn.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
*/
import { Class } from './class.js';

import { Polymer } from '../utils/boot.js';
import '../utils/boot.js';

/**
* Legacy class factory and registration helper for defining Polymer
Expand Down
2 changes: 1 addition & 1 deletion test/smoke/behavior-mixin.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</dom-module>
<script type="module">
import '../../polymer-legacy.js';
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';
import { DomModule } from '../../lib/elements/dom-module.js';
import { mixinBehaviors } from '../../lib/legacy/class.js';
/** @polymerBehavior */
Expand Down
6 changes: 3 additions & 3 deletions test/smoke/data-table.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
</template>
<script type="module">
import '../../polymer-legacy.js';
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';
Polymer({
is: 'data-popup'
});
Expand Down Expand Up @@ -98,7 +98,7 @@
</template>
<script type="module">
import '../../polymer-legacy.js';
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';
Polymer({
is: 'data-cell',
properties: {
Expand Down Expand Up @@ -160,7 +160,7 @@
</template>
<script type="module">
import '../../polymer-legacy.js';
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';
Polymer({
is: 'data-row',
properties: {
Expand Down
4 changes: 2 additions & 2 deletions test/smoke/passive-gestures.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
</dom-module>
<script type="module">
import '../../polymer-legacy.js';
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';
Polymer({
is: 'x-passive',
listeners: {
Expand All @@ -62,4 +62,4 @@
</script>
<x-passive></x-passive>
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion test/smoke/style-props/src/elements.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import './elements-defaults.js';
import { Polymer } from '../../../../lib/utils/boot.js';
import { Polymer } from '../../../../lib/legacy/polymer-fn.js';
import { html } from '../../../../lib/utils/html-tag.js';
Polymer({
_template: html`
Expand Down
2 changes: 1 addition & 1 deletion test/smoke/style-props/src/scopes.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import './settings.js';
import './elements.js';
import { Polymer } from '../../../../lib/utils/boot.js';
import { Polymer } from '../../../../lib/legacy/polymer-fn.js';
import { html } from '../../../../lib/utils/html-tag.js';
import { dom } from '../../../../lib/legacy/polymer.dom.js';

Expand Down
2 changes: 1 addition & 1 deletion test/smoke/style-props/src/settings.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Polymer } from '../../../../lib/utils/boot.js';
import { Polymer } from '../../../../lib/legacy/polymer-fn.js';
import { html } from '../../../../lib/utils/html-tag.js';
const $_documentContainer = document.createElement('div');
$_documentContainer.setAttribute('style', 'display: none;');
Expand Down
2 changes: 1 addition & 1 deletion test/unit/array-selector-elements.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ The complete set of contributors may be found at http://polymer.github.io/CONTRI
Code distributed by Google as part of the polymer project is also
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
*/
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';

Polymer({
is: 'observe-el',
Expand Down
2 changes: 1 addition & 1 deletion test/unit/attributes-elements.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ The complete set of contributors may be found at http://polymer.github.io/CONTRI
Code distributed by Google as part of the polymer project is also
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
*/
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';

import { html } from '../../lib/utils/html-tag.js';
let PropertyTypeBehavior = {
Expand Down
4 changes: 2 additions & 2 deletions test/unit/behaviors.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<script type="module">
import '../../polymer-legacy.js';
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';
window.BehaviorA = {
properties: {

Expand Down Expand Up @@ -311,7 +311,7 @@
</test-fixture>
<script type="module">
import '../../polymer-legacy.js';
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';

suite('single behavior element', function() {
var el;
Expand Down
14 changes: 7 additions & 7 deletions test/unit/configure.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</template>
<script type="module">
import '../../polymer-legacy.js';
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';
Polymer({

is: 'x-configure-value',
Expand Down Expand Up @@ -78,7 +78,7 @@
</template>
<script type="module">
import '../../polymer-legacy.js';
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';
Polymer({

is: 'x-configure-gchild',
Expand Down Expand Up @@ -117,7 +117,7 @@
</template>
<script type="module">
import '../../polymer-legacy.js';
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';
Polymer({

is: 'x-configure-child',
Expand Down Expand Up @@ -185,7 +185,7 @@
<dom-module id="x-configure-simple-child">
<script type="module">
import '../../polymer-legacy.js';
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';
Polymer({

is: 'x-configure-simple-child',
Expand Down Expand Up @@ -218,7 +218,7 @@
</template>
<script type="module">
import '../../polymer-legacy.js';
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';
Polymer({

is: 'x-configure-host',
Expand Down Expand Up @@ -324,7 +324,7 @@
</template>
<script type="module">
import '../../polymer-legacy.js';
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';
Polymer({
is: 'x-config-lazy-host',
properties: {
Expand All @@ -350,7 +350,7 @@

<script type="module">
import '../../polymer-legacy.js';
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';

function testValueAndChangeHandler(e, value) {
assert.equal(e.content, value, 'Property does not equal configured value');
Expand Down
2 changes: 1 addition & 1 deletion test/unit/custom-style-async-import.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
x-client
</template>
<script type="module">
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';
Polymer({
is: 'x-client'
});
Expand Down
2 changes: 1 addition & 1 deletion test/unit/custom-style-async.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</dom-module>
<script type="module">
import '../../polymer-legacy.js';
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';
Polymer({
is: 'x-host'
});
Expand Down
2 changes: 1 addition & 1 deletion test/unit/custom-style-late.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

<script type="module">
import '../../polymer-legacy.js';
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';
import { afterNextRender } from '../../lib/utils/render-status.js';
/* global input */

Expand Down
2 changes: 1 addition & 1 deletion test/unit/custom-style-scope-cache.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</template>
<script type="module">
import '../../polymer-legacy.js';
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';
Polymer({
is: 'cache-element'
});
Expand Down
4 changes: 2 additions & 2 deletions test/unit/custom-style.html
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@
<script type="module">
import '../../polymer-legacy.js';
import './custom-style-import.js';
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';
Polymer({
is: 'x-baz'
});
Expand All @@ -441,7 +441,7 @@
import '../../polymer-legacy.js';
import './custom-style-import.js';
import { updateStyles } from '../../lib/mixins/element-mixin.js';
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';

suite('custom-style', function() {

Expand Down
2 changes: 1 addition & 1 deletion test/unit/debounce.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<script type="module">
import '../../polymer-legacy.js';
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';
import { Debouncer } from '../../lib/utils/debounce.js';
import { microTask, timeOut, animationFrame, idlePeriod } from '../../lib/utils/async.js';
Polymer({is: 'x-basic'});
Expand Down
4 changes: 2 additions & 2 deletions test/unit/dir.html
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
<script type="module">
import '../../polymer-legacy.js';
import '../../lib/mixins/dir-mixin.js';
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';
Polymer({is: 'x-dir-legacy'});
</script>
</dom-module>
Expand Down Expand Up @@ -261,4 +261,4 @@
});
</script>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions test/unit/disable-upgrade.html
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ <h2 id="element">[[prop]]</h2>
<script type="module">
import '../../polymer-legacy.js';
import '../../lib/mixins/disable-upgrade-mixin.js';
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';
Polymer({
is: 'my-element-legacy',
properties: {
Expand Down Expand Up @@ -275,4 +275,4 @@ <h2 id="element">[[prop]]</h2>
});
</script>
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion test/unit/dom-bind-elements1.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ The complete set of contributors may be found at http://polymer.github.io/CONTRI
Code distributed by Google as part of the polymer project is also
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
*/
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';

import { html } from '../../lib/utils/html-tag.js';
Polymer({
Expand Down
2 changes: 1 addition & 1 deletion test/unit/dom-bind-elements2.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ The complete set of contributors may be found at http://polymer.github.io/CONTRI
Code distributed by Google as part of the polymer project is also
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
*/
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';

Polymer({
is: 'x-needs-host',
Expand Down
2 changes: 1 addition & 1 deletion test/unit/dom-if-elements.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ The complete set of contributors may be found at http://polymer.github.io/CONTRI
Code distributed by Google as part of the polymer project is also
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
*/
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';

import { html } from '../../lib/utils/html-tag.js';
Polymer({
Expand Down
2 changes: 1 addition & 1 deletion test/unit/dom-repeat-elements.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ The complete set of contributors may be found at http://polymer.github.io/CONTRI
Code distributed by Google as part of the polymer project is also
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
*/
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';

import { html } from '../../lib/utils/html-tag.js';
import { MutableData } from '../../lib/mixins/mutable-data.js';
Expand Down
2 changes: 1 addition & 1 deletion test/unit/dynamic-imports/dynamic-element.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
*/
import '../../../polymer-legacy.js';

import { Polymer } from '../../../lib/utils/boot.js';
import { Polymer } from '../../../lib/legacy/polymer-fn.js';
import { html } from '../../../lib/utils/html-tag.js';
import { dom } from '../../../lib/legacy/polymer.dom.js';
Polymer({
Expand Down
2 changes: 1 addition & 1 deletion test/unit/dynamic-imports/inner-element.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
*/
import '../../../polymer-legacy.js';

import { Polymer } from '../../../lib/utils/boot.js';
import { Polymer } from '../../../lib/legacy/polymer-fn.js';
import { html } from '../../../lib/utils/html-tag.js';
Polymer({
_template: html`
Expand Down
2 changes: 1 addition & 1 deletion test/unit/dynamic-imports/outer-element.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<script type="module">
import '../../../polymer-legacy.js';
import './inner-element.js';
import { Polymer } from '../../../lib/utils/boot.js';
import { Polymer } from '../../../lib/legacy/polymer-fn.js';
Polymer({
is: 'outer-element'
});
Expand Down
2 changes: 1 addition & 1 deletion test/unit/events-elements.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
*/
import { Base } from '../../polymer-legacy.js';

import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';
import { html } from '../../lib/utils/html-tag.js';
var EventLoggerImpl = {
created: function() {
Expand Down
2 changes: 1 addition & 1 deletion test/unit/gestures-elements.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
*/
import '../../polymer-legacy.js';

import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';
import { html } from '../../lib/utils/html-tag.js';
import { PolymerElement } from '../../polymer-element.js';
import { GestureEventListeners } from '../../lib/mixins/gesture-event-listeners.js';
Expand Down
4 changes: 2 additions & 2 deletions test/unit/globals.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</template>
<script type="module">
import '../../polymer-legacy.js';
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';
Polymer({
is: 'global-test',
properties: {
Expand Down Expand Up @@ -64,7 +64,7 @@

<script type="module">
import '../../polymer-legacy.js';
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';

suite('globals', function() {

Expand Down
2 changes: 1 addition & 1 deletion test/unit/html-tag.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import '../../polymer-legacy.js';
import { html, htmlLiteral } from '../../lib/utils/html-tag.js';
import { PolymerElement } from '../../polymer-element.js';
import { Polymer } from '../../lib/utils/boot.js';
import { Polymer } from '../../lib/legacy/polymer-fn.js';
suite('html function', function() {
test('html makes an HTML template', function() {
let t = html``;
Expand Down
Loading

0 comments on commit 232b004

Please sign in to comment.