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

Throw when integration and needs declared #78

Merged
merged 1 commit into from
Jul 31, 2015
Merged

Throw when integration and needs declared #78

merged 1 commit into from
Jul 31, 2015

Conversation

bcardarella
Copy link
Contributor

needs will switch off integration testing, this is not obvious. If
both are declared we should throw a descriptive Error.

@bcardarella
Copy link
Contributor Author

The current test suite is failing and I didn't have time to look into the error that already exist before writing this patch. Once those are resolved I can revisit this patch if there are build issues.

@rwjblue
Copy link
Member

rwjblue commented Jul 31, 2015

Sorry for the delay here, I think that we have everything fixed up test wise on master. Would you mind rebasing to get Travis to re-run with the updates?

@@ -18,6 +18,10 @@ export default Klass.extend({
this.name = description || subjectName;
this.callbacks = callbacks || {};

if (this.callbacks.integration && this.callback.needs) {
Copy link
Member

Choose a reason for hiding this comment

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

Should be this.callbacks.needs (it is this.callback ATM).

`needs` will switch off integration testing, this is not obvious. If
both are declared we should throw a descriptive Error.
rwjblue added a commit that referenced this pull request Jul 31, 2015
…-needs-declared

Throw when integration and needs declared
@rwjblue rwjblue merged commit de121d7 into emberjs:master Jul 31, 2015
@rwjblue
Copy link
Member

rwjblue commented Jul 31, 2015

Thank you!

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.

None yet

2 participants