35e32bb feat(mocks): Mark mock objects @Injectable()

angular · Dec 3, 2015 · 866c53e · 866c53e
1 parent 788d500
commit 866c53e
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 2 deletions.
diff --git a/BUILD_INFO b/BUILD_INFO
@@ -1,2 +1,2 @@
-Thu Dec 3 00:22:40 UTC 2015
-e9f873a365a627525e81fefee2a5bd335ca54067
+Thu Dec 3 19:01:55 UTC 2015
+35e32bbea170327225be86ef437ab8694f866bb9
diff --git a/lib/src/mock/directive_resolver_mock.dart b/lib/src/mock/directive_resolver_mock.dart
@@ -1,5 +1,6 @@
 library angular2.src.mock.directive_resolver_mock;
 
+import "package:angular2/src/core/di.dart" show Injectable;
 import "package:angular2/src/facade/collection.dart"
     show Map, MapWrapper, ListWrapper;
 import "package:angular2/src/facade/lang.dart"
@@ -8,6 +9,7 @@ import "../core/metadata.dart" show DirectiveMetadata, ComponentMetadata;
 import "package:angular2/src/core/linker/directive_resolver.dart"
     show DirectiveResolver;
 
+@Injectable()
 class MockDirectiveResolver extends DirectiveResolver {
   var _providerOverrides = new Map<Type, List<dynamic>>();
   var viewProviderOverrides = new Map<Type, List<dynamic>>();

diff --git a/lib/src/mock/location_mock.dart b/lib/src/mock/location_mock.dart
@@ -1,10 +1,12 @@
 library angular2.src.mock.location_mock;
 
+import "package:angular2/src/core/di.dart" show Injectable;
 import "package:angular2/src/facade/async.dart"
     show EventEmitter, ObservableWrapper;
 import "package:angular2/src/facade/collection.dart" show ListWrapper;
 import "package:angular2/src/router/location.dart" show Location;
 
+@Injectable()
 class SpyLocation implements Location {
   List<String> urlChanges = [];
   /** @internal */

diff --git a/lib/src/mock/mock_application_ref.dart b/lib/src/mock/mock_application_ref.dart
@@ -1,13 +1,15 @@
 library angular2.src.mock.mock_application_ref;
 
 import "package:angular2/src/core/application_ref.dart" show ApplicationRef;
+import "package:angular2/src/core/di.dart" show Injectable;
 import "package:angular2/src/facade/lang.dart" show Type;
 import "package:angular2/src/core/linker/dynamic_component_loader.dart"
     show ComponentRef;
 import "package:angular2/src/core/di.dart" show Provider, Injector;
 import "package:angular2/src/core/zone/ng_zone.dart" show NgZone;
 import "package:angular2/src/facade/async.dart" show Future;
 
+@Injectable()
 class MockApplicationRef extends ApplicationRef {
   void registerBootstrapListener(
       dynamic /* (ref: ComponentRef) => void */ listener) {}

diff --git a/lib/src/mock/mock_location_strategy.dart b/lib/src/mock/mock_location_strategy.dart
@@ -1,10 +1,12 @@
 library angular2.src.mock.mock_location_strategy;
 
+import "package:angular2/src/core/di.dart" show Injectable;
 import "package:angular2/src/facade/async.dart"
     show EventEmitter, ObservableWrapper;
 import "package:angular2/src/router/location_strategy.dart"
     show LocationStrategy;
 
+@Injectable()
 class MockLocationStrategy extends LocationStrategy {
   String internalBaseHref = "/";
   String internalPath = "/";

diff --git a/lib/src/mock/ng_zone_mock.dart b/lib/src/mock/ng_zone_mock.dart
@@ -1,9 +1,11 @@
 library angular2.src.mock.ng_zone_mock;
 
+import "package:angular2/src/core/di.dart" show Injectable;
 import "package:angular2/src/core/zone/ng_zone.dart" show NgZone;
 import "package:angular2/src/facade/async.dart"
     show EventEmitter, ObservableWrapper;
 
+@Injectable()
 class MockNgZone extends NgZone {
   /** @internal */
   EventEmitter<dynamic> _mockOnEventDone;

diff --git a/lib/src/mock/view_resolver_mock.dart b/lib/src/mock/view_resolver_mock.dart
@@ -1,5 +1,6 @@
 library angular2.src.mock.view_resolver_mock;
 
+import "package:angular2/src/core/di.dart" show Injectable;
 import "package:angular2/src/facade/collection.dart"
     show Map, MapWrapper, ListWrapper;
 import "package:angular2/src/facade/lang.dart"
@@ -9,6 +10,7 @@ import "package:angular2/src/facade/exceptions.dart"
 import "../core/metadata.dart" show ViewMetadata;
 import "package:angular2/src/core/linker/view_resolver.dart" show ViewResolver;
 
+@Injectable()
 class MockViewResolver extends ViewResolver {
   /** @internal */
   var _views = new Map<Type, ViewMetadata>();

diff --git a/lib/src/testing/utils.dart b/lib/src/testing/utils.dart
@@ -1,11 +1,13 @@
 library angular2.src.testing.utils;
 
+import "package:angular2/src/core/di.dart" show Injectable;
 import "package:angular2/src/facade/collection.dart"
     show ListWrapper, MapWrapper;
 import "package:angular2/src/platform/dom/dom_adapter.dart" show DOM;
 import "package:angular2/src/facade/lang.dart"
     show isPresent, isString, RegExpWrapper, StringWrapper, RegExp;
 
+@Injectable()
 class Log {
   /** @internal */
   List<dynamic> _result;

diff --git a/test/core/testability/testability_spec.dart b/test/core/testability/testability_spec.dart
@@ -1,5 +1,6 @@
 library angular2.test.core.testability.testability_spec;
 
+import "package:angular2/src/core/di.dart" show Injectable;
 import "package:angular2/testing_internal.dart"
     show
         AsyncTestCompleter,
@@ -26,6 +27,7 @@ void microTask(Function fn) {
   });
 }
 
+@Injectable()
 class MockNgZone extends NgZone {
   EventEmitter<dynamic> _onTurnStartStream;
   get onTurnStart {