diff --git a/gulpfile.js b/gulpfile.js
index 6055c9f6a..75cfba039 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -3,10 +3,7 @@
var gulp = require('gulp');
var eslint = require('gulp-eslint');
var htmlExtract = require('gulp-html-extract');
-var sourcemaps = require('gulp-sourcemaps');
var stylelint = require('gulp-stylelint');
-var ts = require('gulp-typescript');
-var typings = require('gulp-typings');
gulp.task('lint', ['lint:js', 'lint:html', 'lint:css']);
@@ -50,22 +47,3 @@ gulp.task('lint:css', function() {
]
}));
});
-
-gulp.task('typings', function() {
- return gulp.src('test/angular2/typings.json')
- .pipe(typings());
-});
-
-gulp.task('ng2', ['typings'], function() {
- ['test/angular2'].forEach(function(dir) {
- gulp.src([dir + '/*.ts', 'test/angular2/typings/main/**/*.d.ts'])
- .pipe(sourcemaps.init())
- .pipe(ts(ts.createProject('test/angular2/tsconfig.json')))
- .pipe(sourcemaps.write('.'))
- .pipe(gulp.dest(dir));
- });
-});
-
-gulp.task('ng2:watch', function() {
- gulp.watch('test/angular2/*.ts', ['ng2']);
-});
diff --git a/package.json b/package.json
index 7a6de1019..ff405ea44 100644
--- a/package.json
+++ b/package.json
@@ -9,29 +9,15 @@
"url": "https://github.com/vaadin/vaadin-combo-box/issues"
},
"devDependencies": {
- "@angular/common": "^2.0.0",
- "@angular/compiler": "^2.0.0",
- "@angular/core": "^2.0.0",
- "@angular/forms": "^2.0.0",
- "@angular/platform-browser": "^2.0.0",
- "@angular/platform-browser-dynamic": "^2.0.0",
- "@vaadin/angular2-polymer": "^1.0.0-beta4",
- "es6-shim": "^0.35.0",
"eslint-plugin-html": "^1.7.0",
- "eslint-config-vaadin": "github:vaadin/eslint-config-vaadin",
+ "eslint-config-vaadin": "^0.1.0",
"gulp": "latest",
"gulp-html-extract": "^0.1.0",
"gulp-eslint": "^3.0.1",
- "gulp-sourcemaps": "^1.6.0",
"gulp-stylelint": "^3.7.0",
- "gulp-typescript": "^2.13.0",
- "gulp-typings": "^1.3.4",
- "reflect-metadata": "0.1.3",
- "rxjs": "5.0.0-beta.12",
- "stylelint-config-vaadin": "github:vaadin/stylelint-config-vaadin",
- "systemjs": "0.19.27",
- "web-component-tester": "^5.0.0",
- "zone.js": "^0.6.17"
+ "stylelint-config-vaadin": "^0.1.0",
+ "wct-random-output": "^0.1.1",
+ "web-component-tester": "^5.0.0"
},
"scripts": {
"test": "wct"
diff --git a/test/angular2.html b/test/angular2.html
deleted file mode 100644
index f3151960f..000000000
--- a/test/angular2.html
+++ /dev/null
@@ -1,192 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Loading...
-
-
-
-
-
-
-
-
diff --git a/test/angular2/app.component.js b/test/angular2/app.component.js
deleted file mode 100644
index afd675abf..000000000
--- a/test/angular2/app.component.js
+++ /dev/null
@@ -1,55 +0,0 @@
-System.register(['@angular/core', "@angular/forms"], function(exports_1, context_1) {
- "use strict";
- var __moduleName = context_1 && context_1.id;
- var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
- else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
- return c > 3 && r && Object.defineProperty(target, key, r), r;
- };
- var __metadata = (this && this.__metadata) || function (k, v) {
- if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
- };
- var core_1, forms_1;
- var TestApp;
- return {
- setters:[
- function (core_1_1) {
- core_1 = core_1_1;
- },
- function (forms_1_1) {
- forms_1 = forms_1_1;
- }],
- execute: function() {
- TestApp = (function () {
- function TestApp(e, ref) {
- this.items = ['foo', 'bar', 'baz'];
- this.selection = 'foo';
- this._host = e.nativeElement;
- this._ref = ref;
- this.form = new forms_1.FormGroup({
- selection: new forms_1.FormControl()
- });
- }
- TestApp.prototype.ngAfterViewInit = function () {
- var event = new CustomEvent('readyForTests', { detail: this });
- this._host.dispatchEvent(event);
- };
- TestApp.prototype.detectChanges = function () {
- this._ref.detectChanges();
- };
- TestApp = __decorate([
- core_1.Component({
- selector: 'test-app',
- template: "\n \n\n \n "
- }),
- __metadata('design:paramtypes', [core_1.ElementRef, core_1.ChangeDetectorRef])
- ], TestApp);
- return TestApp;
- }());
- exports_1("TestApp", TestApp);
- }
- }
-});
-
-//# sourceMappingURL=app.component.js.map
diff --git a/test/angular2/app.component.js.map b/test/angular2/app.component.js.map
deleted file mode 100644
index 61029b433..000000000
--- a/test/angular2/app.component.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["app.component.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;YAcA;gBAQE,iBAAY,CAAa,EAAE,GAAsB;oBAJzC,UAAK,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;oBAC9B,cAAS,GAAG,KAAK,CAAC;oBAIxB,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,aAAa,CAAC;oBAC7B,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;oBAChB,IAAI,CAAC,IAAI,GAAG,IAAI,iBAAS,CAAC;wBACxB,SAAS,EAAE,IAAI,mBAAW,EAAE;qBAC7B,CAAC,CAAC;gBACL,CAAC;gBAED,iCAAe,GAAf;oBACE,IAAI,KAAK,GAAG,IAAI,WAAW,CAAC,eAAe,EAAE,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAC;oBAC7D,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;gBAClC,CAAC;gBAEM,+BAAa,GAApB;oBACE,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;gBAC5B,CAAC;gBAjCH;oBAAC,gBAAS,CAAC;wBACT,QAAQ,EAAE,UAAU;wBACpB,QAAQ,EAAE,0PAMP;qBACJ,CAAC;;2BAAA;gBAyBF,cAAC;YAAD,CAxBA,AAwBC,IAAA;YAxBD,6BAwBC,CAAA","file":"app.component.js","sourcesContent":["import { Component, ElementRef, ChangeDetectorRef } from '@angular/core';\nimport { FormGroup, FormControl } from \"@angular/forms\";\nimport { PolymerElement } from '@vaadin/angular2-polymer';\n\n@Component({\n selector: 'test-app',\n template: `\n \n\n \n `\n})\nexport class TestApp {\n\n private _host;\n private _ref;\n private items = ['foo', 'bar', 'baz'];\n private selection = 'foo';\n public form: FormGroup;\n\n constructor(e: ElementRef, ref: ChangeDetectorRef) {\n this._host = e.nativeElement;\n this._ref = ref;\n this.form = new FormGroup({\n selection: new FormControl()\n });\n }\n\n ngAfterViewInit() {\n var event = new CustomEvent('readyForTests', {detail: this});\n this._host.dispatchEvent(event);\n }\n\n public detectChanges() {\n this._ref.detectChanges();\n }\n}\n"],"sourceRoot":"/source/"}
\ No newline at end of file
diff --git a/test/angular2/app.component.ts b/test/angular2/app.component.ts
deleted file mode 100644
index 44a097b09..000000000
--- a/test/angular2/app.component.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { Component, ElementRef, ChangeDetectorRef } from '@angular/core';
-import { FormGroup, FormControl } from "@angular/forms";
-import { PolymerElement } from '@vaadin/angular2-polymer';
-
-@Component({
- selector: 'test-app',
- template: `
-
-
-
- `
-})
-export class TestApp {
-
- private _host;
- private _ref;
- private items = ['foo', 'bar', 'baz'];
- private selection = 'foo';
- public form: FormGroup;
-
- constructor(e: ElementRef, ref: ChangeDetectorRef) {
- this._host = e.nativeElement;
- this._ref = ref;
- this.form = new FormGroup({
- selection: new FormControl()
- });
- }
-
- ngAfterViewInit() {
- var event = new CustomEvent('readyForTests', {detail: this});
- this._host.dispatchEvent(event);
- }
-
- public detectChanges() {
- this._ref.detectChanges();
- }
-}
diff --git a/test/angular2/app.module.js b/test/angular2/app.module.js
deleted file mode 100644
index 0a013b64f..000000000
--- a/test/angular2/app.module.js
+++ /dev/null
@@ -1,52 +0,0 @@
-System.register(['@angular/core', '@angular/platform-browser', "@angular/forms", '@vaadin/angular2-polymer', './app.component'], function(exports_1, context_1) {
- "use strict";
- var __moduleName = context_1 && context_1.id;
- var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
- else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
- return c > 3 && r && Object.defineProperty(target, key, r), r;
- };
- var __metadata = (this && this.__metadata) || function (k, v) {
- if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
- };
- var core_1, platform_browser_1, forms_1, angular2_polymer_1, app_component_1;
- var AppModule;
- return {
- setters:[
- function (core_1_1) {
- core_1 = core_1_1;
- },
- function (platform_browser_1_1) {
- platform_browser_1 = platform_browser_1_1;
- },
- function (forms_1_1) {
- forms_1 = forms_1_1;
- },
- function (angular2_polymer_1_1) {
- angular2_polymer_1 = angular2_polymer_1_1;
- },
- function (app_component_1_1) {
- app_component_1 = app_component_1_1;
- }],
- execute: function() {
- AppModule = (function () {
- function AppModule() {
- }
- AppModule = __decorate([
- core_1.NgModule({
- imports: [platform_browser_1.BrowserModule, forms_1.ReactiveFormsModule],
- declarations: [app_component_1.TestApp, angular2_polymer_1.PolymerElement('vaadin-combo-box')],
- bootstrap: [app_component_1.TestApp],
- schemas: [core_1.CUSTOM_ELEMENTS_SCHEMA]
- }),
- __metadata('design:paramtypes', [])
- ], AppModule);
- return AppModule;
- }());
- exports_1("AppModule", AppModule);
- }
- }
-});
-
-//# sourceMappingURL=app.module.js.map
diff --git a/test/angular2/app.module.js.map b/test/angular2/app.module.js.map
deleted file mode 100644
index 522efe373..000000000
--- a/test/angular2/app.module.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["app.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAaA;gBAAA;gBAAyB,CAAC;gBAN1B;oBAAC,eAAQ,CAAC;wBACR,OAAO,EAAE,CAAE,gCAAa,EAAE,2BAAmB,CAAE;wBAC/C,YAAY,EAAE,CAAE,uBAAO,EAAE,iCAAc,CAAC,kBAAkB,CAAC,CAAE;wBAC7D,SAAS,EAAE,CAAE,uBAAO,CAAE;wBACtB,OAAO,EAAE,CAAE,6BAAsB,CAAE;qBACpC,CAAC;;6BAAA;gBACuB,gBAAC;YAAD,CAAzB,AAA0B,IAAA;YAA1B,iCAA0B,CAAA","file":"app.module.js","sourcesContent":["import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';\nimport { BrowserModule } from '@angular/platform-browser';\nimport { ReactiveFormsModule } from \"@angular/forms\";\nimport { PolymerElement } from '@vaadin/angular2-polymer';\n\nimport { TestApp } from './app.component';\n\n@NgModule({\n imports: [ BrowserModule, ReactiveFormsModule ],\n declarations: [ TestApp, PolymerElement('vaadin-combo-box') ],\n bootstrap: [ TestApp ],\n schemas: [ CUSTOM_ELEMENTS_SCHEMA ]\n})\nexport class AppModule { }\n"],"sourceRoot":"/source/"}
\ No newline at end of file
diff --git a/test/angular2/app.module.ts b/test/angular2/app.module.ts
deleted file mode 100644
index 328bc0bf9..000000000
--- a/test/angular2/app.module.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { ReactiveFormsModule } from "@angular/forms";
-import { PolymerElement } from '@vaadin/angular2-polymer';
-
-import { TestApp } from './app.component';
-
-@NgModule({
- imports: [ BrowserModule, ReactiveFormsModule ],
- declarations: [ TestApp, PolymerElement('vaadin-combo-box') ],
- bootstrap: [ TestApp ],
- schemas: [ CUSTOM_ELEMENTS_SCHEMA ]
-})
-export class AppModule { }
diff --git a/test/angular2/main.js b/test/angular2/main.js
deleted file mode 100644
index cf6b9ec59..000000000
--- a/test/angular2/main.js
+++ /dev/null
@@ -1,25 +0,0 @@
-System.register(['@angular/platform-browser-dynamic', '@angular/core', './app.module'], function(exports_1, context_1) {
- "use strict";
- var __moduleName = context_1 && context_1.id;
- var platform_browser_dynamic_1, core_1, app_module_1;
- return {
- setters:[
- function (platform_browser_dynamic_1_1) {
- platform_browser_dynamic_1 = platform_browser_dynamic_1_1;
- },
- function (core_1_1) {
- core_1 = core_1_1;
- },
- function (app_module_1_1) {
- app_module_1 = app_module_1_1;
- }],
- execute: function() {
- core_1.enableProdMode();
- document.body.addEventListener('bootstrap', function () {
- platform_browser_dynamic_1.platformBrowserDynamic().bootstrapModule(app_module_1.AppModule);
- });
- }
- }
-});
-
-//# sourceMappingURL=main.js.map
diff --git a/test/angular2/main.js.map b/test/angular2/main.js.map
deleted file mode 100644
index 393d3f3a8..000000000
--- a/test/angular2/main.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["main.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;YAIA,qBAAc,EAAE,CAAC;YAEjB,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE;gBAC1C,iDAAsB,EAAE,CAAC,eAAe,CAAC,sBAAS,CAAC,CAAC;YACtD,CAAC,CAAC,CAAC","file":"main.js","sourcesContent":["import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';\nimport { enableProdMode } from '@angular/core';\nimport { AppModule } from './app.module';\n\nenableProdMode();\n\ndocument.body.addEventListener('bootstrap', () => {\n platformBrowserDynamic().bootstrapModule(AppModule);\n});\n"],"sourceRoot":"/source/"}
\ No newline at end of file
diff --git a/test/angular2/main.ts b/test/angular2/main.ts
deleted file mode 100644
index 22e2405e4..000000000
--- a/test/angular2/main.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-import { enableProdMode } from '@angular/core';
-import { AppModule } from './app.module';
-
-enableProdMode();
-
-document.body.addEventListener('bootstrap', () => {
- platformBrowserDynamic().bootstrapModule(AppModule);
-});
diff --git a/test/angular2/tsconfig.json b/test/angular2/tsconfig.json
deleted file mode 100644
index c6617a9a4..000000000
--- a/test/angular2/tsconfig.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "compilerOptions": {
- "target": "es5",
- "module": "system",
- "moduleResolution": "node",
- "sourceMap": true,
- "emitDecoratorMetadata": true,
- "experimentalDecorators": true,
- "removeComments": false,
- "noImplicitAny": false
- }
-}
diff --git a/test/angular2/typings.json b/test/angular2/typings.json
deleted file mode 100644
index aa60b6b57..000000000
--- a/test/angular2/typings.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "ambientDependencies": {
- "es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#4de74cb527395c13ba20b438c3a7a419ad931f1c"
- }
-}
diff --git a/test/index.html b/test/index.html
index f8ed5d10a..1891847ce 100644
--- a/test/index.html
+++ b/test/index.html
@@ -29,8 +29,7 @@
'data-binding.html',
'late-upgrade.html',
'vaadin-combo-box-light.html',
- 'item-template.html',
- 'angular2.html'
+ 'item-template.html'
].reduce(function(suites, suite) {
return suites.concat([suite, suite + '?dom=shadow']);
}, []));
diff --git a/wct.conf.js b/wct.conf.js
index 4d9a1a61a..e2e2f6cd8 100644
--- a/wct.conf.js
+++ b/wct.conf.js
@@ -1,4 +1,7 @@
module.exports = {
+ plugins: {
+ 'random-output': true
+ },
registerHooks: function(context) {
var crossPlatforms = [
'Windows 10/chrome@55',