support NullVoxPopuli/ember-cli-update-codemods-manifest/add-no-impli…

…cit-this

package.json

@@ -40,7 +40,7 @@
     "src"
   ],
   "dependencies": {
-    "boilerplate-update": "0.25.1",
+    "boilerplate-update": "0.26.0",
     "debug": "^4.1.1",
     "fs-extra": "^8.0.0",
     "inquirer": "^7.0.0",

src/index.js

@@ -153,7 +153,7 @@ module.exports = async function emberCliUpdate({
     statsOnly,
     listCodemods,
     runCodemods,
-    codemodsUrl: 'https://raw.githubusercontent.com/ember-cli/ember-cli-update-codemods-manifest/v3/manifest.json',
+    codemodsUrl: 'https://raw.githubusercontent.com/ember-cli/ember-cli-update-codemods-manifest/ember-no-implicit-this-codemod/manifest.json',
     createCustomDiff,
     ignoredFiles: ['ember-cli-update.json'],
     wasRunAsExecutable

test/acceptance/ember-cli-update-test.js

@@ -135,9 +135,14 @@ describe(function() {
     } = await merge({
       fixturesPath: 'test/fixtures/codemod/local',
       commitMessage: 'my-app',
-      runCodemods: true
+      runCodemods: true,
+      async beforeMerge() {
+        await run('npm install', { cwd: tmpPath });
+      }
     });
 
+    ps.stdout.pipe(process.stdout);
+
     ps.stdout.on('data', data => {
       let str = data.toString();
       if (str.includes('These codemods apply to your project.')) {
@@ -149,9 +154,17 @@ describe(function() {
       status
     } = await promise;
 
+    assertNoUnstaged(status);
+    assertCodemodRan(status);
+
+    await fs.remove(path.join(tmpPath, 'package-lock.json'));
+
     // file is indeterminent between OS's, so ignore
     await fs.remove(path.join(tmpPath, 'MODULE_REPORT.md'));
 
+    // remove dist and node_modules before fixture compare
+    await run('git clean -fdX', { cwd: tmpPath });
+
     let mergeFixtures = 'test/fixtures/codemod/latest-node/my-app';
     if (process.env.NODE_LTS) {
       mergeFixtures = 'test/fixtures/codemod/min-node/my-app';
@@ -160,9 +173,6 @@ describe(function() {
     fixtureCompare({
       mergeFixtures
     });
-
-    assertNoUnstaged(status);
-    assertCodemodRan(status);
   });
 
   it('scopes to sub dir if run from there', async function() {

test/fixtures/codemod/latest-node/my-app/app/controllers/application.js

@@ -1,4 +1,5 @@
 import Controller from '@ember/controller';
 
 export default Controller.extend({
+  controllerProperty: "test"
 });

test/fixtures/codemod/latest-node/my-app/app/templates/application.hbs

@@ -2,4 +2,6 @@
 <WelcomePage />
 {{!-- Feel free to remove this! --}}
 
+{{this.controllerProperty}}
+
 {{outlet}}

test/fixtures/codemod/local/my-app/app/controllers/application.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
 
 export default Ember.Controller.extend({
+  controllerProperty: "test"
 });

test/fixtures/codemod/local/my-app/app/templates/application.hbs

@@ -2,4 +2,6 @@
 <WelcomePage />
 {{!-- Feel free to remove this! --}}
 
+{{controllerProperty}}
+
 {{outlet}}

test/fixtures/codemod/min-node/my-app/app/controllers/application.js

@@ -1,4 +1,5 @@
 import Controller from '@ember/controller';
 
 export default Controller.extend({
+  controllerProperty: "test"
 });

test/fixtures/codemod/min-node/my-app/app/templates/application.hbs

@@ -2,4 +2,6 @@
 <WelcomePage />
 {{!-- Feel free to remove this! --}}
 
+{{this.controllerProperty}}
+
 {{outlet}}