Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions app/services/ember-cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,13 @@ export default Ember.Service.extend({

json.dependencies[dependencyName] = version;

// since ember and ember-template-compiler should always have the same
// version, we update the version for the ember-template-compiler too, if
// the ember dependency is updated
if (dependencyName === 'ember' && json.dependencies.hasOwnProperty('ember-template-compiler')) {
json.dependencies['ember-template-compiler'] = version;
}

json = JSON.stringify(json, null, ' ');
twiddle.set('content', json);

Expand Down
31 changes: 30 additions & 1 deletion tests/unit/services/ember-cli-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ test("getTwiddleJson() resolves dependencies", function(assert) {
});

test("updateDependencyVersion() updates the version of the dependency in twiddle.json", function(assert) {
assert.expect(1);
assert.expect(2);

var service = this.subject();

Expand All @@ -92,5 +92,34 @@ test("updateDependencyVersion() updates the version of the dependency in twiddle
var parsed = JSON.parse(updatedContent);

assert.equal(parsed.dependencies.ember, 'release');
assert.equal(parsed.dependencies.hasOwnProperty('ember-template-compiler'), false, "does not automatically add an ember-template-compiler dependency, when ember is updated");
});
});

test("updateDependencyVersion() updates the version of ember-template-compiler if ember is updated", function(assert) {
assert.expect(2);

var service = this.subject();

var gist = Ember.Object.create({
files: Ember.A([Ember.Object.create({
filePath: 'twiddle.json',
content: `
{
"dependencies": {
"ember": "1.13.9",
"ember-template-compiler": "1.13.9"
}
}
`
})])
});

service.updateDependencyVersion(gist, 'ember', 'release').then(function() {
var updatedContent = gist.get('files').findBy('filePath', 'twiddle.json').get('content');
var parsed = JSON.parse(updatedContent);

assert.equal(parsed.dependencies.ember, 'release');
assert.equal(parsed.dependencies['ember-template-compiler'], 'release');
});
});