Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add blueprints from ember-cli-mocha #4167

Merged
merged 1 commit into from
Feb 17, 2016
Merged

Conversation

Turbo87
Copy link
Member

@Turbo87 Turbo87 commented Feb 17, 2016

This PR imports the blueprints from ember-cli-mocha next to the existing qunit blueprints. During ember generate the blueprints will automatically figure out what test framework to use based on the project dependencies. This approach was taken from adopted-ember-addons/ember-cp-validations#8.

@rwjblue
Copy link
Member

rwjblue commented Feb 17, 2016

👍 - This is the path that Ember will take also, once the blueprints land there (hint hint @Turbo87...).

@bmac
Copy link
Member

bmac commented Feb 17, 2016

@Turbo87 would you mind squashing this pr into 1 commit and prefixing it with [BUGFIX beta] so we can remember to bring it into the beta branch?

@Turbo87
Copy link
Member Author

Turbo87 commented Feb 17, 2016

@bmac I'm not sure if that qualifies as a bugfix, but I can certainly do that.

The filesPath() method will automatically figure out if "qunit" or "mocha" files should be used by looking at the project packages.
@Turbo87
Copy link
Member Author

Turbo87 commented Feb 17, 2016

done

bmac added a commit that referenced this pull request Feb 17, 2016
Add blueprints from ember-cli-mocha
@bmac bmac merged commit 2d34339 into emberjs:master Feb 17, 2016
@bmac
Copy link
Member

bmac commented Feb 17, 2016

Thanks @Turbo87

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

Successfully merging this pull request may close these issues.

3 participants