Merge pull request #6 from cibernox/replace-this-registry

Replace `this.register` with `this.owner.register`

Author: rwjblue

__testfixtures__/ember-qunit-codemod/register.input.js

@@ -0,0 +1,20 @@
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('service:foo', 'Unit | Service | Foo', {
+  beforeEach() {
+    this.register('service:thingy', thingy);
+    this.registry.register('service:thingy', thingy);
+  }
+});
+
+test('it happens', function() {
+  this.register('service:thingy', thingy);
+  this.registry.register('service:thingy', thingy);
+});
+
+moduleFor('service:bar', 'Unit | Service | Bar');
+
+test('it happens again?', function() {
+  this.register('service:thingy', thingy);
+  this.registry.register('service:thingy', thingy);
+});

__testfixtures__/ember-qunit-codemod/register.output.js

@@ -0,0 +1,25 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Service | Foo', function(hooks) {
+  setupTest(hooks);
+
+  hooks.beforeEach(function() {
+    this.owner.register('service:thingy', thingy);
+    this.owner.register('service:thingy', thingy);
+  });
+
+  test('it happens', function() {
+    this.owner.register('service:thingy', thingy);
+    this.owner.register('service:thingy', thingy);
+  });
+});
+
+module('Unit | Service | Bar', function(hooks) {
+  setupTest(hooks);
+
+  test('it happens again?', function() {
+    this.owner.register('service:thingy', thingy);
+    this.owner.register('service:thingy', thingy);
+  });
+});

ember-qunit-codemod.js

@@ -242,7 +242,7 @@ function updateModuleForToNestedModule(j, root) {
 }
 
 function updateLookupCalls(j, root) {
-  return root
+  root
     .find(j.MemberExpression, {
       object: {
         object: { type: 'ThisExpression' },
@@ -256,6 +256,31 @@ function updateLookupCalls(j, root) {
     });
 }
 
+function updateRegisterCalls(j, root) {
+  root
+    .find(j.MemberExpression, {
+      object: {
+        object: { type: 'ThisExpression' },
+        property: { name: 'registry' },
+      },
+      property: { name: 'register' },
+    })
+    .forEach(path => {
+      let thisDotOwner = j.memberExpression(j.thisExpression(), j.identifier('owner'));
+      path.replace(j.memberExpression(thisDotOwner, path.value.property));
+    });
+
+  root
+    .find(j.MemberExpression, {
+      object: { type: 'ThisExpression' },
+      property: { name: 'register' },
+    })
+    .forEach(path => {
+      let thisDotOwner = j.memberExpression(j.thisExpression(), j.identifier('owner'));
+      path.replace(j.memberExpression(thisDotOwner, path.value.property));
+    });
+}
+
 module.exports = function(file, api, options) {
   const j = api.jscodeshift;
 
@@ -272,6 +297,7 @@ module.exports = function(file, api, options) {
   updateToNewEmberQUnitImports(j, root);
   updateModuleForToNestedModule(j, root);
   updateLookupCalls(j, root);
+  updateRegisterCalls(j, root);
 
   return root.toSource(printOptions);
 };