Skip to content

Commit 5a20d9a

Browse files
author
Kelly Selden
committed
add test - save default when no state file
1 parent 31a689d commit 5a20d9a

5 files changed

Lines changed: 56 additions & 1 deletion

File tree

bin/commands/default.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@ module.exports.handler = async function handler(argv) {
2020
let statsOnly = argv['stats-only'];
2121
let listCodemods = argv['list-codemods'];
2222
let createCustomDiff = argv['create-custom-diff'];
23+
let blueprintOptions = argv['--'] || [];
2324

2425
try {
2526
let message = await emberCliUpdate({
2627
blueprint,
28+
blueprintOptions,
2729
from,
2830
to,
2931
resolveConflicts,

src/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ async function _resolvePackage(blueprint, url, range) {
5353

5454
module.exports = async function emberCliUpdate({
5555
blueprint: _blueprint,
56+
blueprintOptions,
5657
from,
5758
to = toDefault,
5859
resolveConflicts,
@@ -100,7 +101,8 @@ module.exports = async function emberCliUpdate({
100101
blueprint = {
101102
packageName,
102103
name: packageName,
103-
location: parsedPackage.location
104+
location: parsedPackage.location,
105+
options: blueprintOptions
104106
};
105107
}
106108

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,4 +580,42 @@ describe(function() {
580580
mergeFixtures: 'test/fixtures/blueprint/app/local-app/local/my-app/config'
581581
});
582582
});
583+
584+
it('can update a legacy blueprint without a state file', async function() {
585+
this.timeout(3 * 60 * 1000);
586+
587+
let {
588+
location,
589+
version: from,
590+
options
591+
} = (await loadSafeBlueprintFile('test/fixtures/blueprint/app/legacy-app/local/my-app/config2/ember-cli-update.json')).blueprints[1];
592+
593+
let {
594+
version: to
595+
} = (await loadSafeBlueprintFile('test/fixtures/blueprint/app/legacy-app/merge/my-app/config2/ember-cli-update.json')).blueprints[1];
596+
597+
let {
598+
status
599+
} = await (await merge({
600+
fixturesPath: 'test/fixtures/blueprint/app/legacy-app/init',
601+
commitMessage: 'my-app',
602+
blueprint: location,
603+
from,
604+
to,
605+
blueprintOptions: options,
606+
async beforeMerge() {
607+
await initBlueprint({
608+
fixturesPath: 'test/fixtures/blueprint/app/legacy',
609+
resolvedFrom: tmpPath,
610+
relativeDir: location
611+
});
612+
}
613+
})).promise;
614+
615+
fixtureCompare({
616+
mergeFixtures: 'test/fixtures/blueprint/app/legacy-app/merge/my-app'
617+
});
618+
619+
assertNoUnstaged(status);
620+
});
583621
});
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
123123
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"name": "my-app",
3+
"version": "0.0.0",
4+
"description": "",
5+
"main": "index.js",
6+
"devDependencies": {
7+
"ember-cli": "~3.11.0-beta.1"
8+
},
9+
"ember-addon": {
10+
"configPath": "config2"
11+
}
12+
}

0 commit comments

Comments
 (0)