| Index: packages/web_components/test/interop_test.dart
|
| diff --git a/packages/web_components/test/interop_test.dart b/packages/web_components/test/interop_test.dart
|
| index 20cce29cdce02f9cbe4e42c9d8a301cb89ae0f75..0b7fcc51384a5c0dee011d7fd8afeef8ef8fe8ea 100644
|
| --- a/packages/web_components/test/interop_test.dart
|
| +++ b/packages/web_components/test/interop_test.dart
|
| @@ -1,19 +1,16 @@
|
| // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file
|
| // for details. All rights reserved. Use of this source code is governed by a
|
| // BSD-style license that can be found in the LICENSE file.
|
| -
|
| +@TestOn('browser')
|
| library template_wrappers_test;
|
|
|
| import 'dart:html';
|
| -import 'dart:async';
|
| import 'dart:js' show context, JsObject;
|
| -import 'package:unittest/html_config.dart';
|
| -import 'package:unittest/unittest.dart';
|
| +import 'package:test/test.dart';
|
| import 'package:web_components/interop.dart';
|
| import 'package:web_components/polyfill.dart';
|
|
|
| main() {
|
| - useHtmlConfiguration();
|
| setUp(() => customElementsReady);
|
|
|
| test('interop is supported', () {
|
| @@ -44,13 +41,13 @@ main() {
|
| onlyUpgradeNewElements();
|
| registerDartType('x-d', XDWrapper); // late on purpose.
|
|
|
| - a = document.querySelector('x-a');
|
| + a = document.querySelector('x-a') as XAWrapper;
|
| expect(a is HtmlElement, isTrue, reason: 'x-a is HtmlElement');
|
| expect(a is XAWrapper, isTrue, reason: 'x-a is upgraded to XAWrapper');
|
| expect(a.x, 0);
|
| expect(a.wrapperCount, 0);
|
|
|
| - b = document.querySelector('[is=x-b]');
|
| + b = document.querySelector('[is=x-b]') as XBWrapper;
|
| expect(b is DivElement, isTrue, reason: 'x-b is DivElement');
|
| expect(b is XBWrapper, isTrue, reason: 'x-b is upgraded to XBWrapper');
|
| expect(b.x, 1);
|
| @@ -67,7 +64,7 @@ main() {
|
| expect(c is HtmlElement, isTrue, reason: 'x-c is HtmlElement');
|
| expect(c is XCWrapper, isFalse, reason: 'x-c should not be upgraded yet');
|
| expect(_readX(c), null, reason: 'x-c has not been registered in JS yet');
|
| - });
|
| + }, skip: 'https://github.com/dart-lang/web-components/issues/38');
|
|
|
| test('anything created after registering Dart type is upgraded', () {
|
| context.callMethod('addA');
|
| @@ -77,7 +74,7 @@ main() {
|
| expect(a is HtmlElement, isTrue, reason: 'x-a is HtmlElement');
|
| expect(a is XAWrapper, isTrue, reason: 'x-a is upgraded to XAWrapper');
|
| expect(a.x, 3);
|
| - expect(a.wrapperCount, 2);
|
| + expect((a as XAWrapper).wrapperCount, 2);
|
|
|
| context.callMethod('addB');
|
| list = document.querySelectorAll('[is=x-b]');
|
| @@ -86,7 +83,7 @@ main() {
|
| expect(b is DivElement, isTrue, reason: 'x-b is DivElement');
|
| expect(b is XBWrapper, isTrue, reason: 'x-b is upgraded to XBWrapper');
|
| expect(b.x, 4);
|
| - expect(b.wrapperCount, 3);
|
| + expect((b as XBWrapper).wrapperCount, 3);
|
|
|
| // New instances of x-d should be upgraded regardless.
|
| context.callMethod('addD');
|
| @@ -96,8 +93,8 @@ main() {
|
| expect(d is HtmlElement, isTrue, reason: 'x-d is HtmlElement');
|
| expect(d is XDWrapper, isTrue, reason: 'x-d is upgraded to XDWrapper');
|
| expect(d.x, 5);
|
| - expect(d.wrapperCount, 4);
|
| - });
|
| + expect((d as XDWrapper).wrapperCount, 4);
|
| + }, skip: 'https://github.com/dart-lang/web-components/issues/38');
|
|
|
| test('events seen if Dart type is registered before registerElement', () {
|
| var c = document.querySelector('x-c');
|
| @@ -108,7 +105,7 @@ main() {
|
| c = document.querySelector('x-c');
|
| expect(c is XCWrapper, isTrue);
|
| expect(c.x, 6);
|
| - expect(c.wrapperCount, 5);
|
| + expect((c as XCWrapper).wrapperCount, 5);
|
|
|
| context.callMethod('addC');
|
| var list = document.querySelectorAll('x-c');
|
| @@ -118,8 +115,8 @@ main() {
|
| expect(c is HtmlElement, isTrue, reason: 'x-c is HtmlElement');
|
| expect(c is XCWrapper, isTrue, reason: 'x-c is upgraded to XCWrapper');
|
| expect(c.x, 7);
|
| - expect(c.wrapperCount, 6);
|
| - });
|
| + expect((c as XCWrapper).wrapperCount, 6);
|
| + }, skip: 'https://github.com/dart-lang/web-components/issues/38');
|
|
|
| test('element can extend another element', () {
|
| registerDartType('x-e', XEWrapper);
|
| @@ -129,8 +126,9 @@ main() {
|
| expect(e is XEWrapper, isTrue);
|
| expect(e.x, 8);
|
| expect(e.y, 9);
|
| - });
|
| + }, skip: 'https://github.com/dart-lang/web-components/issues/38');
|
| }
|
| +
|
| int _count = 0;
|
|
|
| abstract class Wrapper {
|
|
|