Skip to content

Commit fd7d265

Browse files
author
Kelly Selden
committed
support NullVoxPopuli/ember-cli-update-codemods-manifest/add-no-implicit-this
1 parent b13eda7 commit fd7d265

File tree

12 files changed

+28
-9
lines changed

12 files changed

+28
-9
lines changed

package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"src"
4141
],
4242
"dependencies": {
43-
"boilerplate-update": "0.25.1",
43+
"boilerplate-update": "0.26.0",
4444
"debug": "^4.1.1",
4545
"fs-extra": "^8.0.0",
4646
"inquirer": "^7.0.0",

src/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ module.exports = async function emberCliUpdate({
153153
statsOnly,
154154
listCodemods,
155155
runCodemods,
156-
codemodsUrl: 'https://raw.githubusercontent.com/ember-cli/ember-cli-update-codemods-manifest/v3/manifest.json',
156+
codemodsUrl: 'https://raw.githubusercontent.com/ember-cli/ember-cli-update-codemods-manifest/ember-no-implicit-this-codemod/manifest.json',
157157
createCustomDiff,
158158
ignoredFiles: ['ember-cli-update.json'],
159159
wasRunAsExecutable

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

+14-4
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,14 @@ describe(function() {
135135
} = await merge({
136136
fixturesPath: 'test/fixtures/codemod/local',
137137
commitMessage: 'my-app',
138-
runCodemods: true
138+
runCodemods: true,
139+
async beforeMerge() {
140+
await run('npm install', { cwd: tmpPath });
141+
}
139142
});
140143

144+
ps.stdout.pipe(process.stdout);
145+
141146
ps.stdout.on('data', data => {
142147
let str = data.toString();
143148
if (str.includes('These codemods apply to your project.')) {
@@ -149,9 +154,17 @@ describe(function() {
149154
status
150155
} = await promise;
151156

157+
assertNoUnstaged(status);
158+
assertCodemodRan(status);
159+
160+
await fs.remove(path.join(tmpPath, 'package-lock.json'));
161+
152162
// file is indeterminent between OS's, so ignore
153163
await fs.remove(path.join(tmpPath, 'MODULE_REPORT.md'));
154164

165+
// remove dist and node_modules before fixture compare
166+
await run('git clean -fdX', { cwd: tmpPath });
167+
155168
let mergeFixtures = 'test/fixtures/codemod/latest-node/my-app';
156169
if (process.env.NODE_LTS) {
157170
mergeFixtures = 'test/fixtures/codemod/min-node/my-app';
@@ -160,9 +173,6 @@ describe(function() {
160173
fixtureCompare({
161174
mergeFixtures
162175
});
163-
164-
assertNoUnstaged(status);
165-
assertCodemodRan(status);
166176
});
167177

168178
it('scopes to sub dir if run from there', async function() {
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import Controller from '@ember/controller';
22

33
export default Controller.extend({
4+
controllerProperty: "test"
45
});

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

+2
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22
<WelcomePage />
33
{{!-- Feel free to remove this! --}}
44

5+
{{this.controllerProperty}}
6+
57
{{outlet}}

test/fixtures/codemod/latest-node/my-app/codemods.log

Whitespace-only changes.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import Ember from 'ember';
22

33
export default Ember.Controller.extend({
4+
controllerProperty: "test"
45
});

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

+2
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22
<WelcomePage />
33
{{!-- Feel free to remove this! --}}
44

5+
{{controllerProperty}}
6+
57
{{outlet}}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import Controller from '@ember/controller';
22

33
export default Controller.extend({
4+
controllerProperty: "test"
45
});

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

+2
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22
<WelcomePage />
33
{{!-- Feel free to remove this! --}}
44

5+
{{this.controllerProperty}}
6+
57
{{outlet}}

test/fixtures/codemod/min-node/my-app/codemods.log

Whitespace-only changes.

0 commit comments

Comments
 (0)