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

…cit-this
ember-cli · Oct 10, 2019 · ed352c4 · ed352c4
1 parent 182d50f
commit ed352c4
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 5 deletions.
diff --git a/src/index.js b/src/index.js
@@ -196,7 +196,7 @@ All blueprints are up-to-date!`;
     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: [await getBlueprintFilePath(cwd)],
     wasRunAsExecutable

diff --git a/test/acceptance/ember-cli-update-test.js b/test/acceptance/ember-cli-update-test.js
@@ -146,9 +146,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.')) {
@@ -160,9 +165,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';
@@ -171,9 +184,6 @@ describe(function() {
     fixtureCompare({
       mergeFixtures
     });
-
-    assertNoUnstaged(status);
-    assertCodemodRan(status);
   });
 
   it('scopes to sub dir if run from there', async function() {

diff --git a/test/fixtures/codemod/latest-node/my-app/app/controllers/application.js b/test/fixtures/codemod/latest-node/my-app/app/controllers/application.js
@@ -3,6 +3,8 @@ import Ember from 'ember';
 import { assign } from '@ember/polyfills';
 
 export default Controller.extend({
+  controllerProperty: "test",
+
   actions: {
     foo(object) {
       this.doStuff(object);

diff --git a/test/fixtures/codemod/latest-node/my-app/app/templates/application.hbs b/test/fixtures/codemod/latest-node/my-app/app/templates/application.hbs
@@ -2,4 +2,6 @@
 <WelcomePage />
 {{!-- Feel free to remove this! --}}
 
+{{this.controllerProperty}}
+
 {{outlet}}
diff --git a/test/fixtures/codemod/latest-node/my-app/codemods.log b/test/fixtures/codemod/latest-node/my-app/codemods.log
diff --git a/test/fixtures/codemod/local/my-app/app/controllers/application.js b/test/fixtures/codemod/local/my-app/app/controllers/application.js
@@ -2,6 +2,8 @@ import Ember from 'ember';
 import { merge } from '@ember/polyfills';
 
 export default Ember.Controller.extend({
+  controllerProperty: "test",
+
   actions: {
     foo(object) {
       Ember.propertyWillChange(object, 'someProperty');

diff --git a/test/fixtures/codemod/local/my-app/app/templates/application.hbs b/test/fixtures/codemod/local/my-app/app/templates/application.hbs
@@ -2,4 +2,6 @@
 <WelcomePage />
 {{!-- Feel free to remove this! --}}
 
+{{controllerProperty}}
+
 {{outlet}}
diff --git a/test/fixtures/codemod/min-node/my-app/app/controllers/application.js b/test/fixtures/codemod/min-node/my-app/app/controllers/application.js
@@ -3,6 +3,8 @@ import Ember from 'ember';
 import { assign } from '@ember/polyfills';
 
 export default Controller.extend({
+  controllerProperty: "test",
+
   actions: {
     foo(object) {
       this.doStuff(object);

diff --git a/test/fixtures/codemod/min-node/my-app/app/templates/application.hbs b/test/fixtures/codemod/min-node/my-app/app/templates/application.hbs
@@ -2,4 +2,6 @@
 <WelcomePage />
 {{!-- Feel free to remove this! --}}
 
+{{this.controllerProperty}}
+
 {{outlet}}
diff --git a/test/fixtures/codemod/min-node/my-app/codemods.log b/test/fixtures/codemod/min-node/my-app/codemods.log