Merge pull request #11273 from mitchlloyd/deprecate-service-validation

Change assertion to deprecation
emberjs · May 25, 2015 · 9407d4c · 9407d4c
2 parents 850aba3 + 2850421
commit 9407d4c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/packages/ember-application/lib/utils/validate-type.js b/packages/ember-application/lib/utils/validate-type.js
@@ -17,6 +17,18 @@ export default function validateType(resolvedType, parsedName) {
     return;
   }
 
+  // 2.0TODO: Remove this deprecation warning
+  if (parsedName.type === 'service') {
+    Ember.deprecate(
+      "In Ember 2.0 service factories must have an `isServiceFactory` " +
+      `property set to true. You registered ${resolvedType} as a service ` +
+      "factory. Either add the `isServiceFactory` property to this factory or " +
+      "extend from Ember.Service.",
+      resolvedType.isServiceFactory
+    );
+    return;
+  }
+
   let [factoryFlag, expectedType] = validationAttributes;
 
   Ember.assert(`Expected ${parsedName.fullName} to resolve to an ${expectedType} but instead it was ${resolvedType}.`, function() {

diff --git a/packages/ember-application/tests/system/dependency_injection/default_resolver_test.js b/packages/ember-application/tests/system/dependency_injection/default_resolver_test.js
@@ -178,7 +178,8 @@ QUnit.test("lookup description", function() {
 });
 
 QUnit.test("validating resolved objects", function() {
-  let types = ['route', 'component', 'view', 'service'];
+  // 2.0TODO: Add service to this list
+  let types = ['route', 'component', 'view'];
 
   // Valid setup
   application.FooRoute = Route.extend();
@@ -207,3 +208,16 @@ QUnit.test("validating resolved objects", function() {
     }, matcher, `Should assert for ${type}`);
   });
 });
+
+QUnit.test("deprecation warning for service factories without isServiceFactory property", function() {
+  expectDeprecation(/service factories must have an `isServiceFactory` property/);
+  application.FooService = EmberObject.extend();
+  registry.resolve('service:foo');
+
+});
+
+QUnit.test("no deprecation warning for service factories that extend from Ember.Service", function() {
+  expectNoDeprecation();
+  application.FooService = Service.extend();
+  registry.resolve('service:foo');
+});