Skip to content

Commit 4a2ac61

Browse files
authored
Merge pull request #1194 from ember-cli/remove_ember_addon_command
feat!: remove deprecated ability to run as ember addon command
2 parents 303a0ed + d59209d commit 4a2ac61

8 files changed

Lines changed: 9 additions & 265 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,13 @@ jobs:
3030
- macos-latest
3131
node:
3232
- 12
33-
- '*'
33+
# - '*'
3434
test-command:
3535
- test:bin
36-
- test:command
3736
- test:fast
3837
exclude:
39-
- os: macos-latest
40-
node: '*'
38+
# - os: macos-latest
39+
# node: '*'
4140
- os: macos-latest
4241
node: 12
4342
test-command: test:fast

appveyor.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ test_script:
3535
- node --version
3636
- npm --version
3737
- npm run test:bin
38-
- npm run test:command
3938

4039
# http://help.appveyor.com/discussions/questions/1310-delete-cache
4140
cache:

package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"lint": "eslint . --ext js,json",
1212
"start": "node bin/ember-cli-update",
1313
"test": "mocha \"test/!(fixtures)/**/*-test.js\"",
14-
"test:command": "mocha test/acceptance/ember-addon-test.js",
1514
"test:bin": "mocha test/acceptance/ember-cli-update-test.js",
1615
"test:fast": "mocha \"test/+(integration|unit)/**/*-test.js\""
1716
},
@@ -21,7 +20,6 @@
2120
},
2221
"keywords": [
2322
"ember.js",
24-
"ember-addon",
2523
"ember-cli"
2624
],
2725
"author": "Kelly Selden",
@@ -72,8 +70,5 @@
7270
"sinon": "^11.0.0",
7371
"sinon-chai": "^3.3.0",
7472
"standard-node-template": "2.0.0"
75-
},
76-
"ember-addon": {
77-
"main": "src/ember-addon.js"
7873
}
7974
}

src/command.js

Lines changed: 0 additions & 117 deletions
This file was deleted.

src/ember-addon.js

Lines changed: 0 additions & 11 deletions
This file was deleted.

test/acceptance/ember-addon-test.js

Lines changed: 0 additions & 119 deletions
This file was deleted.

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const down = '\u001b[B';
2626
const enter = '\n';
2727

2828
describe(function() {
29-
this.timeout(30e3);
29+
this.timeout(60e3);
3030

3131
let tmpPath;
3232

@@ -144,11 +144,7 @@ describe(function() {
144144
});
145145

146146
it('runs codemods', async function() {
147-
if (process.platform === 'darwin') {
148-
this.timeout(1.5 * 60e3);
149-
} else {
150-
this.timeout(60e3);
151-
}
147+
this.timeout(1.5 * 60e3);
152148

153149
async function _merge(src, dest) {
154150
await fs.copy(
@@ -246,6 +242,8 @@ describe(function() {
246242
});
247243

248244
it('can pick from multiple blueprints', async function() {
245+
this.timeout(1.5 * 60e3);
246+
249247
let {
250248
location,
251249
version: to
@@ -388,7 +386,7 @@ describe(function() {
388386
});
389387

390388
it('can install an addon with a default blueprint and a state file', async function() {
391-
this.timeout((process.platform === 'darwin' ? 3 : 1) * 60e3);
389+
this.timeout(3 * 60e3);
392390

393391
let {
394392
location

test/integration/index-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const {
2626
const { EOL } = require('os');
2727

2828
describe(function() {
29-
this.timeout(30e3);
29+
this.timeout(60e3);
3030

3131
let tmpPath;
3232

0 commit comments

Comments
 (0)