chore(tests): clean up modules in tests

Author: mhevery

demo/web/main.dart

@@ -83,17 +83,11 @@ class ChapterDirective {
 
 main() {
   // Set up the Angular directives.
-  var module = new AngularModule();
-  module.value(Expando, new Expando());
-  angularModule(module);
+  var module = new AngularModule()
+    ..register(NgBindAttrDirective)
+    ..register(NgRepeatAttrDirective)
+    ..register(BookComponent)
+    ..register(ChapterDirective);
   Injector injector = new Injector([module]);
-  injector.get(DirectiveRegistry)
-      ..register(NgBindAttrDirective)
-      ..register(NgRepeatAttrDirective)
-      ..register(BookComponent)
-      ..register(ChapterDirective);
-
   injector.get(AngularBootstrap)();
-
-
 }

lib/angular.dart

@@ -124,27 +124,25 @@ class AngularModule extends Module {
     type(Parser, Parser);
     type(Interpolate, Interpolate);
     type(Http, Http);
+
+    value(ScopeDigestTTL, new ScopeDigestTTL(5));
+
+    directive(NgTextMustacheDirective);
+    directive(NgAttrMustacheDirective);
+
+    directive(NgBindAttrDirective);
+    directive(NgClassAttrDirective);
+    directive(NgClickAttrDirective);
+    directive(NgCloakAttrDirective);
+    directive(NgControllerAttrDirective);
+    directive(NgHideAttrDirective);
+    directive(NgIfAttrDirective);
+    directive(NgRepeatAttrDirective);
+    directive(NgShowAttrDirective);
   }
 
   directive(Type directive) {
     _directives.register(directive);
     return this;
   }
 }
-
-angularModule(AngularModule module) {
-  module.value(ScopeDigestTTL, new ScopeDigestTTL(5));
-
-  module.directive(NgTextMustacheDirective);
-  module.directive(NgAttrMustacheDirective);
-
-  module.directive(NgBindAttrDirective);
-  module.directive(NgClassAttrDirective);
-  module.directive(NgClickAttrDirective);
-  module.directive(NgCloakAttrDirective);
-  module.directive(NgControllerAttrDirective);
-  module.directive(NgHideAttrDirective);
-  module.directive(NgIfAttrDirective);
-  module.directive(NgRepeatAttrDirective);
-  module.directive(NgShowAttrDirective);
-}

test/_log.dart

@@ -1,5 +1,6 @@
 library ng_log;
 
+//TODO(misko): merge with Logger
 class Log {
   List<String> output = [];
   call(s) { output.add(s); }

test/_specs.dart

@@ -151,34 +151,44 @@ class Logger implements List {
 }
 
 class SpecInjector {
+  Injector moduleInjector;
   Injector injector;
-  List<Module> modules = [new Module()..value(Expando, new Expando('specExpando'))];
+  List<Module> modules = [];
+  DirectiveRegistry directives = new DirectiveRegistry();
+  List<Function> initFns = [];
+
+  SpecInjector() {
+    var moduleModule = new Module()
+      ..factory(AngularModule, () => addModule(new AngularModule()))
+      ..factory(Module, () => addModule(new Module()));
+    moduleInjector = new Injector([moduleModule], false);
+  }
 
-  module(Function fn) {
-    Module module = new AngularModule()
-      ..type(Log, Log)
-      ..type(Logger, Logger);
+  addModule(module) {
     modules.add(module);
-    fn(module);
+    return module;
   }
 
-  inject(Function fn, declarationStack) {
-    if (injector == null) {
-      injector = new Injector(modules, false); // Implicit injection is disabled.
+  module(Function fn, declarationStack) {
+    try {
+      var initFn = moduleInjector.invoke(fn);
+      if (initFn is Function) {
+        initFns.add(initFn);
+      }
+    } catch (e, s) {
+      throw "$e\n$s\nDECLARED AT:$declarationStack";
     }
+  }
+
+  inject(Function fn, declarationStack) {
     try {
+      if (injector == null) {
+        injector = new Injector(modules, false); // Implicit injection is disabled.
+        initFns.forEach((fn) => injector.invoke(fn));
+      }
       injector.invoke(fn);
     } catch (e, s) {
-      var msg;
-      if (e is mirror.MirroredUncaughtExceptionError) {
-        msg = e.exception_string + "\nORIGINAL Stack trace:\n" + e.stacktrace.toString();
-      } else {
-        msg = '$e\nORIGINAL Stack trace:\n$s';
-      }
-      var frames = declarationStack.toString().split('\n');
-      frames.removeAt(0);
-      var declaredAt = frames.join('\n');
-      throw msg + "\nDECLARED AT:\n" + declaredAt;
+      throw "$e\n$s\nDECLARED AT:$declarationStack";
     }
   }
 
@@ -187,33 +197,34 @@ class SpecInjector {
 
 SpecInjector currentSpecInjector = null;
 inject(Function fn) {
-  var stack = null;
-  try {
-    throw '';
-  } catch (e, s) {
-    stack = s;
-  }
-  if (currentSpecInjector == null ) {
-    return () {
+  try { throw ''; } catch (e, stack) {
+    if (currentSpecInjector == null ) {
+      return () {
+        return currentSpecInjector.inject(fn, stack);
+      };
+    } else {
       return currentSpecInjector.inject(fn, stack);
-    };
-  } else {
-    return currentSpecInjector.inject(fn, stack);
+    }
   }
 }
 module(Function fn) {
-  if (currentSpecInjector == null ) {
-    return () {
-      return currentSpecInjector.module(fn);
-    };
-  } else {
-    return currentSpecInjector.module(fn);
+  try { throw ''; } catch(e, stack) {
+    if (currentSpecInjector == null ) {
+      return () {
+        return currentSpecInjector.module(fn, stack);
+      };
+    } else {
+      return currentSpecInjector.module(fn, stack);
+    }
   }
 }
 
 main() {
   beforeEach(() => id = 1);
   beforeEach(() => currentSpecInjector = new SpecInjector());
-  beforeEach(module(angularModule));
+  beforeEach(module((AngularModule module) {
+    module.type(Logger, Logger);
+    module.type(Log, Log);
+  }));
   afterEach(() => currentSpecInjector = null);
 }

test/block_spec.dart

@@ -31,8 +31,6 @@ class ShadowBlockDirective {
 
 main() {
   describe('Block', () {
-    beforeEach(module(angularModule));
-
     var anchor;
     var $rootElement;
     var blockCache;