Revert "web-angular: reintroduce page object class..."

This reverts commit 11e60b97.
This reverts commit 2df53280.

Will revisit when github.com/google/pageloader/issues/145 is fixed

Fixes https://github.com/dart-lang/stagehand/issues/526

CHANGELOG.md

@@ -4,7 +4,6 @@
   supported.
 - Set minimal SDK to 2.0.0-dev.55.0 in project and template `pubspec.yaml`.
 - `web-angular` template:
-  - Reintroduced use of a pageloader-base page object in the sample test file.
   - Upgraded to `-alpha+13` versions of `angular` and
     `angular_components` packages.
 

lib/src/generators/web_angular.g.dart

@@ -132,61 +132,22 @@ CgplbnZpcm9ubWVudDoKICBzZGs6ICc+PTIuMC4wLWRldi41NS4wIDwyLjAuMCcKCmRlcGVuZGVu
 Y2llczoKICBhbmd1bGFyOiBeNS4wLjAtYWxwaGErMTMKICBhbmd1bGFyX2NvbXBvbmVudHM6IF4w
 LjkuMC1hbHBoYSsxMwoKZGV2X2RlcGVuZGVuY2llczoKICBhbmd1bGFyX3Rlc3Q6IF4yLjAuMC1h
 bHBoYSsxMQogIGJ1aWxkX3J1bm5lcjogXjAuOC45CiAgYnVpbGRfdGVzdDogXjAuMTAuMgogIGJ1
-aWxkX3dlYl9jb21waWxlcnM6IF4wLjQuMAogIHBhZ2Vsb2FkZXI6IF4zLjAuMC1hbHBoYQogIHRl
-c3Q6IF4wLjEyLjM4Cg==''',
-  'test/app_po.dart',
-  'text',
-  '''
-aW1wb3J0ICdwYWNrYWdlOnBhZ2Vsb2FkZXIvcGFnZWxvYWRlci5kYXJ0JzsKCnBhcnQgJ2FwcF9w
-by5nLmRhcnQnOwoKQFBhZ2VPYmplY3QoKQphYnN0cmFjdCBjbGFzcyBBcHBQTyB7CiAgQXBwUE8o
-KTsKICBmYWN0b3J5IEFwcFBPLmNyZWF0ZShQYWdlTG9hZGVyRWxlbWVudCBjb250ZXh0KSA9ICRB
-cHBQTy5jcmVhdGU7CgogIEBCeVRhZ05hbWUoJ2gxJykKICBQYWdlTG9hZGVyRWxlbWVudCBnZXQg
-X3RpdGxlOwoKICBTdHJpbmcgZ2V0IHRpdGxlID0+IF90aXRsZS52aXNpYmxlVGV4dDsKfQo=''',
-  'test/app_po.g.dart',
-  'text',
-  '''
-Ly8gR0VORVJBVEVEIENPREUgLSBETyBOT1QgTU9ESUZZIEJZIEhBTkQKCnBhcnQgb2YgJ2FwcF9w
-by5kYXJ0JzsKCi8vICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi8vIEdlbmVyYXRvcjogUGFnZU9iamVjdEdl
-bmVyYXRvcgovLyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKgoKLy8gaWdub3JlX2Zvcl9maWxlOiBwcml2YXRl
-X2NvbGxpc2lvbl9pbl9taXhpbl9hcHBsaWNhdGlvbgpjbGFzcyAkQXBwUE8gZXh0ZW5kcyBBcHBQ
-TyB3aXRoICQkQXBwUE8gewogIFBhZ2VMb2FkZXJFbGVtZW50ICRfX3Jvb3RfXzsKICAkQXBwUE8u
-Y3JlYXRlKFBhZ2VMb2FkZXJFbGVtZW50IGN1cnJlbnRDb250ZXh0KSA6ICRfX3Jvb3RfXyA9IGN1
-cnJlbnRDb250ZXh0IHsKICAgICRfX3Jvb3RfXy5hZGRDaGVja2VycyhbXSk7CiAgfQogIFN0cmlu
-ZyBnZXQgdGl0bGUgewogICAgZm9yIChmaW5hbCBfX2xpc3RlbmVyIGluICRfX3Jvb3RfXy5saXN0
-ZW5lcnMpIHsKICAgICAgX19saXN0ZW5lci5zdGFydFBhZ2VPYmplY3RNZXRob2QoJ0FwcFBPJywg
-J3RpdGxlJyk7CiAgICB9CiAgICBmaW5hbCByZXR1cm5NZSA9IHN1cGVyLnRpdGxlOwogICAgZm9y
-IChmaW5hbCBfX2xpc3RlbmVyIGluICRfX3Jvb3RfXy5saXN0ZW5lcnMpIHsKICAgICAgX19saXN0
-ZW5lci5lbmRQYWdlT2JqZWN0TWV0aG9kKCdBcHBQTycsICd0aXRsZScpOwogICAgfQogICAgcmV0
-dXJuIHJldHVybk1lOwogIH0KfQoKY2xhc3MgJCRBcHBQTyB7CiAgUGFnZUxvYWRlckVsZW1lbnQg
-JF9fcm9vdF9fOwogIFBhZ2VMb2FkZXJNb3VzZSBfX21vdXNlX187CiAgUGFnZUxvYWRlckVsZW1l
-bnQgZ2V0ICRyb290ID0+ICRfX3Jvb3RfXzsKICBQYWdlTG9hZGVyRWxlbWVudCBnZXQgX3RpdGxl
-IHsKICAgIGZvciAoZmluYWwgX19saXN0ZW5lciBpbiAkX19yb290X18ubGlzdGVuZXJzKSB7CiAg
-ICAgIF9fbGlzdGVuZXIuc3RhcnRQYWdlT2JqZWN0TWV0aG9kKCdBcHBQTycsICdfdGl0bGUnKTsK
-ICAgIH0KICAgIGZpbmFsIGVsZW1lbnQgPSAkX19yb290X18uY3JlYXRlRWxlbWVudChjb25zdCBC
-eVRhZ05hbWUoJ2gxJyksIFtdLCBbXSk7CiAgICBmaW5hbCByZXR1cm5NZSA9IGVsZW1lbnQ7CiAg
-ICBmb3IgKGZpbmFsIF9fbGlzdGVuZXIgaW4gJF9fcm9vdF9fLmxpc3RlbmVycykgewogICAgICBf
-X2xpc3RlbmVyLmVuZFBhZ2VPYmplY3RNZXRob2QoJ0FwcFBPJywgJ190aXRsZScpOwogICAgfQog
-ICAgcmV0dXJuIHJldHVybk1lOwogIH0KfQo=''',
+aWxkX3dlYl9jb21waWxlcnM6IF4wLjQuMAogIHRlc3Q6IF4wLjEyLjM4Cg==''',
   'test/app_test.dart',
   'text',
   '''
 QFRlc3RPbignYnJvd3NlcicpCmltcG9ydCAncGFja2FnZTphbmd1bGFyX3Rlc3QvYW5ndWxhcl90
 ZXN0LmRhcnQnOwppbXBvcnQgJ3BhY2thZ2U6dGVzdC90ZXN0LmRhcnQnOwppbXBvcnQgJ3BhY2th
 Z2U6X19wcm9qZWN0TmFtZV9fL2FwcF9jb21wb25lbnQuZGFydCc7CmltcG9ydCAncGFja2FnZTpf
-X3Byb2plY3ROYW1lX18vYXBwX2NvbXBvbmVudC50ZW1wbGF0ZS5kYXJ0JyBhcyBuZzsKaW1wb3J0
-ICdwYWNrYWdlOnBhZ2Vsb2FkZXIvaHRtbC5kYXJ0JzsKCmltcG9ydCAnYXBwX3BvLmRhcnQnOwoK
-dm9pZCBtYWluKCkgewogIGZpbmFsIHRlc3RCZWQgPQogICAgICBOZ1Rlc3RCZWQuZm9yQ29tcG9u
-ZW50PEFwcENvbXBvbmVudD4obmcuQXBwQ29tcG9uZW50TmdGYWN0b3J5KTsKICBOZ1Rlc3RGaXh0
-dXJlPEFwcENvbXBvbmVudD4gZml4dHVyZTsKICBBcHBQTyBhcHBQTzsKCiAgc2V0VXAoKCkgYXN5
-bmMgewogICAgZml4dHVyZSA9IGF3YWl0IHRlc3RCZWQuY3JlYXRlKCk7CiAgICBmaW5hbCBjb250
-ZXh0ID0KICAgICAgICBuZXcgSHRtbFBhZ2VMb2FkZXJFbGVtZW50LmNyZWF0ZUZyb21FbGVtZW50
-KGZpeHR1cmUucm9vdEVsZW1lbnQpOwogICAgYXBwUE8gPSBuZXcgQXBwUE8uY3JlYXRlKGNvbnRl
-eHQpOwogIH0pOwoKICB0ZWFyRG93bihkaXNwb3NlQW55UnVubmluZ1Rlc3QpOwoKICB0ZXN0KCdo
-ZWFkaW5nJywgKCkgewogICAgZXhwZWN0KGFwcFBPLnRpdGxlLCBjb250YWlucygnTXkgRmlyc3Qg
-QW5ndWxhckRhcnQgQXBwJykpOwogIH0pOwoKICAvLyBUZXN0aW5nIGluZm86IGh0dHBzOi8vd2Vi
-ZGV2LmRhcnRsYW5nLm9yZy9hbmd1bGFyL2d1aWRlL3Rlc3RpbmcKfQo=''',
+X3Byb2plY3ROYW1lX18vYXBwX2NvbXBvbmVudC50ZW1wbGF0ZS5kYXJ0JyBhcyBuZzsKCnZvaWQg
+bWFpbigpIHsKICBmaW5hbCB0ZXN0QmVkID0KICAgICAgTmdUZXN0QmVkLmZvckNvbXBvbmVudDxB
+cHBDb21wb25lbnQ+KG5nLkFwcENvbXBvbmVudE5nRmFjdG9yeSk7CiAgTmdUZXN0Rml4dHVyZTxB
+cHBDb21wb25lbnQ+IGZpeHR1cmU7CgogIHNldFVwKCgpIGFzeW5jIHsKICAgIGZpeHR1cmUgPSBh
+d2FpdCB0ZXN0QmVkLmNyZWF0ZSgpOwogIH0pOwoKICB0ZWFyRG93bihkaXNwb3NlQW55UnVubmlu
+Z1Rlc3QpOwoKICB0ZXN0KCdoZWFkaW5nJywgKCkgewogICAgZXhwZWN0KGZpeHR1cmUudGV4dCwg
+Y29udGFpbnMoJ015IEZpcnN0IEFuZ3VsYXJEYXJ0IEFwcCcpKTsKICB9KTsKCiAgLy8gVGVzdGlu
+ZyBpbmZvOiBodHRwczovL3dlYmRldi5kYXJ0bGFuZy5vcmcvYW5ndWxhci9ndWlkZS90ZXN0aW5n
+Cn0K''',
   'web/favicon.png',
   'binary',
   '''

templates/web-angular/pubspec.yaml

@@ -16,5 +16,4 @@ dev_dependencies:
   build_runner: ^0.8.9
   build_test: ^0.10.2
   build_web_compilers: ^0.4.0
-  pageloader: ^3.0.0-alpha
   test: ^0.12.38

templates/web-angular/test/app_po.dart

-import 'package:pageloader/pageloader.dart';
-
-part 'app_po.g.dart';
-
-@PageObject()
-abstract class AppPO {
-  AppPO();
-  factory AppPO.create(PageLoaderElement context) = $AppPO.create;
-
-  @ByTagName('h1')
-  PageLoaderElement get _title;
-
-  String get title => _title.visibleText;
-}

templates/web-angular/test/app_po.g.dart

-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'app_po.dart';
-
-// **************************************************************************
-// Generator: PageObjectGenerator
-// **************************************************************************
-
-// ignore_for_file: private_collision_in_mixin_application
-class $AppPO extends AppPO with $$AppPO {
-  PageLoaderElement $__root__;
-  $AppPO.create(PageLoaderElement currentContext) : $__root__ = currentContext {
-    $__root__.addCheckers([]);
-  }
-  String get title {
-    for (final __listener in $__root__.listeners) {
-      __listener.startPageObjectMethod('AppPO', 'title');
-    }
-    final returnMe = super.title;
-    for (final __listener in $__root__.listeners) {
-      __listener.endPageObjectMethod('AppPO', 'title');
-    }
-    return returnMe;
-  }
-}
-
-class $$AppPO {
-  PageLoaderElement $__root__;
-  PageLoaderMouse __mouse__;
-  PageLoaderElement get $root => $__root__;
-  PageLoaderElement get _title {
-    for (final __listener in $__root__.listeners) {
-      __listener.startPageObjectMethod('AppPO', '_title');
-    }
-    final element = $__root__.createElement(const ByTagName('h1'), [], []);
-    final returnMe = element;
-    for (final __listener in $__root__.listeners) {
-      __listener.endPageObjectMethod('AppPO', '_title');
-    }
-    return returnMe;
-  }
-}

templates/web-angular/test/app_test.dart

@@ -3,27 +3,20 @@ import 'package:angular_test/angular_test.dart';
 import 'package:test/test.dart';
 import 'package:__projectName__/app_component.dart';
 import 'package:__projectName__/app_component.template.dart' as ng;
-import 'package:pageloader/html.dart';
-
-import 'app_po.dart';
 
 void main() {
   final testBed =
       NgTestBed.forComponent<AppComponent>(ng.AppComponentNgFactory);
   NgTestFixture<AppComponent> fixture;
-  AppPO appPO;
 
   setUp(() async {
     fixture = await testBed.create();
-    final context =
-        new HtmlPageLoaderElement.createFromElement(fixture.rootElement);
-    appPO = new AppPO.create(context);
   });
 
   tearDown(disposeAnyRunningTest);
 
   test('heading', () {
-    expect(appPO.title, contains('My First AngularDart App'));
+    expect(fixture.text, contains('My First AngularDart App'));
   });
 
   // Testing info: https://webdev.dartlang.org/angular/guide/testing

tool/web-angular-test.sh

@@ -19,6 +19,6 @@ travis_fold start web_angular.pub
   (set -x; pub get)
 travis_fold end web_angular.pub
 travis_fold start web_angular.test
-  (set -x; pub run build_runner test --delete-conflicting-outputs --fail-on-severe -- -p chrome --reporter=expanded)
+  (set -x; pub run build_runner test --fail-on-severe -- -p chrome --reporter=expanded)
 travis_fold end web_angular.test
 popd