Skip to content
This repository has been archived by the owner on Dec 10, 2024. It is now read-only.

Update to pull ember-mocha from NPM. #96

Merged
merged 1 commit into from
Feb 1, 2016

Conversation

rwjblue
Copy link
Member

@rwjblue rwjblue commented Feb 1, 2016

This follows suit with ember-cli/ember-cli-qunit#92.

@rwjblue rwjblue force-pushed the pull-ember-mocha-from-npm branch from 5181be4 to 4c4b402 Compare February 1, 2016 16:07
@rwjblue
Copy link
Member Author

rwjblue commented Feb 1, 2016

Confirmed locally in a 2.3.0-beta.1 app and a 1.13.1 app. Both sides seem to be working properly.

rwjblue added a commit that referenced this pull request Feb 1, 2016
Update to pull ember-mocha from NPM.
@rwjblue rwjblue merged commit 362d030 into ember-cli:master Feb 1, 2016
@rwjblue rwjblue deleted the pull-ember-mocha-from-npm branch February 1, 2016 16:17
@@ -13,9 +13,11 @@ module.exports = {
var addonContext = this;

return this.addBowerPackagesToProject([
{ name: 'mocha', source: 'mocha', target: '~2.2.4' },
{ name: 'chai', source: 'chai', target: '~2.3.0' },
{ name: 'ember-mocha-adapter', source: 'ember-mocha-adapter', target: '~0.3.1' },
{ name: 'ember-mocha', source: 'ember-mocha', target: '~0.8.8' },
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't this be removed too if it's already in the package.json file now?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I must have missed it :(

Would you mind submitting a PR?

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants