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

[BUGFIX beta] Add blueprints for "ember-cli-mocha >= 0.12.0" #14670

Merged
merged 1 commit into from
Dec 2, 2016

Conversation

Turbo87
Copy link
Member

@Turbo87 Turbo87 commented Dec 2, 2016

Resolves #14667

/cc @rwjblue @patsy-issa

@Turbo87
Copy link
Member Author

Turbo87 commented Dec 2, 2016

discovered a small issue with this, do not merge for now... 😞

Copy link
Member

@rwjblue rwjblue left a comment

Choose a reason for hiding this comment

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

Thank you for putting this together!

semver.satisfies('0.12.0', dependencies['ember-cli-mocha'])) {
type = 'mocha-0.12';
} else {
type = 'mocha';
Copy link
Member

Choose a reason for hiding this comment

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

I think we need to flip-flop this logic, I (and I could be going out on a limb here) think that the new syntax will likely stay around even if we have to make a 0.13 / 1.0 / etc of ember-mocha. We should update this conditional so the else is the new format.

I'd also suggest mocha-current and mocha-lt-0.12 as the folder paths.

Thoughts?

Copy link
Member Author

Choose a reason for hiding this comment

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

@rwjblue that is precisely what I meant with "small issue" above. I've fixed it in emberjs/data#4691 by using the VersionChecker class and generating fake package manifests for the mocha blueprint tests. will update this PR now too.

Copy link
Member Author

Choose a reason for hiding this comment

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

@rwjblue this should be resolved 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.

regarding the folder names: I wanted to keep the diff small, so I decided to leave the old blueprints at their original location

@rwjblue rwjblue merged commit b9ad116 into emberjs:master Dec 2, 2016
@Turbo87 Turbo87 deleted the mocha-blueprints branch December 2, 2016 15:54
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.

2 participants