refactor: Refactor test setup.

lib/mock/module.dart

@@ -59,14 +59,16 @@ part 'mock_cache_register.dart';
  */
 class AngularMockModule extends Module {
   AngularMockModule() {
+    bind(MockApplication);
+    bind(Application, toImplementation: MockApplication);
     bind(ExceptionHandler, toImplementation: RethrowExceptionHandler);
     bind(TestBed);
     bind(Probe);
     bind(Logger);
     bind(MockHttpBackend);
     bind(CacheRegister, toImplementation: MockCacheRegister);
-    bind(Element, toValue: document.body);
-    bind(Node, toValue: document.body);
+    bind(Element, toFactory: (app) => app.element, inject: [MockApplication]);
+    bind(Node, inject: [Element]);
     bind(HttpBackend, toInstanceOf: MOCK_HTTP_BACKEND_KEY);
     bind(VmTurnZone, toFactory: () {
       return new VmTurnZone()
@@ -78,3 +80,20 @@ class AngularMockModule extends Module {
     bind(DefaultPlatformShim, toInstanceOf: MockWebPlatformShim);
   }
 }
+
+class MockApplication extends Application {
+  var _element;
+
+  Element get element {
+    if (_element == null) {
+      _element = new DivElement()..attributes['ng-app'] = '';
+    }
+    return _element;
+  }
+
+  void destroyElement() {
+    _element = null;
+  }
+
+  Injector createInjector() => throw 'MockApplications can not create injectors';
+}

lib/mock/test_injection.dart

@@ -1,9 +1,13 @@
 library angular.mock.test_injection;
 
+import 'dart:html';
+
+import 'package:angular/application.dart';
 import 'package:angular/application_factory.dart';
 import 'package:angular/mock/module.dart';
 import 'package:di/di.dart';
 import 'dart:mirrors';
+import 'module.dart';
 
 _SpecInjector _currentSpecInjector = null;
 
@@ -61,7 +65,7 @@ class _SpecInjector {
     }
   }
 
-  reset() {
+  void reset() {
     injector = null;
     injectorCreateLocation = null;
   }
@@ -161,3 +165,12 @@ void setUpInjector() {
 void tearDownInjector() {
   _currentSpecInjector = null;
 }
+
+void cleanUpAppRoot() {
+  if (_currentSpecInjector.injector != null) {
+    var app = _currentSpecInjector.injector.get(Application);
+    assert(app is MockApplication);
+    app.destroyElement();
+  }
+  document.body.setInnerHtml('');
+}

test/_specs.dart

@@ -215,6 +215,7 @@ _removeNgBinding(node) {
 
 main() {
   gns.beforeEach(setUpInjector, priority:3);
+  gns.afterEach(cleanUpAppRoot);
   gns.afterEach(tearDownInjector);
 
   gns.guinnessEnableHtmlMatchers();

test/animate/ng_animate_spec.dart

@@ -26,10 +26,6 @@ main() {
       });
     });
 
-    afterEach(() {
-      tearDownInjector();
-    });
-
     it('should control animations on elements', () {
       _.compile('<div ng-animate="never"><div></div></div>');
       _.rootScope.apply();

test/core_dom/event_handler_spec.dart

@@ -20,49 +20,37 @@ main() {
   describe('EventHandler', () {
     Element ngAppElement;
     beforeEachModule((Module module) {
-      ngAppElement = new DivElement()..attributes['ng-app'] = '';
       module..bind(BarComponent);
-      module..bind(Node, toValue: ngAppElement);
-      document.body.append(ngAppElement);
     });
 
-    afterEach(() {
-      ngAppElement.remove();
-      ngAppElement = null;
-    });
-
-    compile(_, html) {
-      ngAppElement.setInnerHtml(html, treeSanitizer: new NullTreeSanitizer());
-      _.compile(ngAppElement);
-      return ngAppElement.firstChild;
-    }
 
-    it('should register and handle event', (TestBed _) {
-      var e = compile(_,
+    it('should register and handle event', (TestBed _, Application app) {
+      var e = _.compile(
         '''<div on-abc="invoked=true;"></div>''');
 
       _.triggerEvent(e, 'abc');
       expect(_.rootScope.context['invoked']).toEqual(true);
     });
 
-    it('shoud register and handle event with long name', (TestBed _) {
-      var e = compile(_,
+    it('shoud register and handle event with long name', (TestBed _, Application app) {
+      var e = _.compile(
         '''<div on-my-new-event="invoked=true;"></div>''');
 
       _.triggerEvent(e, 'my-new-event');
       expect(_.rootScope.context['invoked']).toEqual(true);
     });
 
-    it('shoud have model updates applied correctly', (TestBed _) {
-      var e = compile(_,
+    it('should have model updates applied correctly', (TestBed _, Application app) {
+      var e = _.compile(
         '''<div on-abc='description="new description";'>{{description}}</div>''');
       e.dispatchEvent(new Event('abc'));
       _.rootScope.apply();
       expect(e.text).toEqual("new description");
     });
 
-    it('shoud register event when shadow dom is used', async((TestBed _) {
-      var e = compile(_,'<bar></bar>');
+    it('should register event when shadow dom is used', async((TestBed _, Application app) {
+      var e = _.compile('<bar></bar>');
+      document.body.append(app.element..append(e));
 
       microLeap();
 
@@ -73,8 +61,8 @@ main() {
       expect(ctrl.invoked).toEqual(true);
     }));
 
-    it('shoud handle event within content only once', async((TestBed _) {
-      var e = compile(_,
+    it('shoud handle event within content only once', async((TestBed _, Application app) {
+      var e = _.compile(
         ''' <bar>
                <div on-abc="invoked=true;"></div>
              </bar>