Merge pull request #59 from rwjblue/properly-handle-resolver

Properly handle custom `resolver` option.

Author: rwjblue

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

@@ -0,0 +1,32 @@
+import { module } from 'qunit';
+import { moduleFor, moduleForComponent, test } from 'ember-qunit';
+import hbs from 'htmlbars-inline-precompile';
+import engineResolverFor from 'ember-engines/test-support/engine-resolver-for';
+
+const resolver = engineResolverFor('appointments-manager');
+
+moduleForComponent('date-picker', 'Integration | Component | Date picker', {
+  integration: true,
+  resolver
+});
+
+test('renders text', function(assert) {
+  this.render(hbs`{{date-picker}}`);
+  assert.equal(this.$().text().trim(), 'una fecha');
+});
+
+moduleFor('service:foo', {
+  resolver
+});
+
+test('can resolve from custom resolver', function(assert) {
+  assert.ok(this.container.lookup('service:foo'));
+});
+
+module('non-ember-qunit module', {
+  resolver
+});
+
+test('custom resolver property means nothing, and ends up in `beforeEach`', function(assert) {
+  assert.ok(this.container.lookup('service:foo'));
+});

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

@@ -0,0 +1,38 @@
+import { module, test } from 'qunit';
+import { setupTest, setupRenderingTest } from 'ember-qunit';
+import { render } from 'ember-test-helpers';
+import hbs from 'htmlbars-inline-precompile';
+import engineResolverFor from 'ember-engines/test-support/engine-resolver-for';
+
+const resolver = engineResolverFor('appointments-manager');
+
+module('Integration | Component | Date picker', function(hooks) {
+  setupRenderingTest(hooks, {
+    resolver
+  });
+
+  test('renders text', async function(assert) {
+    await render(hbs`{{date-picker}}`);
+    assert.equal(this.$().text().trim(), 'una fecha');
+  });
+});
+
+module('service:foo', function(hooks) {
+  setupTest(hooks, {
+    resolver
+  });
+
+  test('can resolve from custom resolver', function(assert) {
+    assert.ok(this.owner.lookup('service:foo'));
+  });
+});
+
+module('non-ember-qunit module', function(hooks) {
+  hooks.beforeEach(function() {
+    this.resolver = resolver;
+  });
+
+  test('custom resolver property means nothing, and ends up in `beforeEach`', function(assert) {
+    assert.ok(this.owner.lookup('service:foo'));
+  });
+});

ember-qunit-codemod.js

@@ -309,6 +309,12 @@ module.exports = function(file, api) {
             updateRegisterCalls(expressionCollection);
             updateInjectCalls(expressionCollection);
             updateOnCalls(expressionCollection, moduleInfo);
+
+            if (j.match(property, { key: { name: 'resolver' } })) {
+              let setupExpression = moduleInfo.moduleSetupExpression;
+              setupExpression.expression.arguments.push(j.objectExpression([property]));
+              return;
+            }
           }
 
           if (isLifecycleHook(property)) {