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

Introduce resolver option to test module #174

Merged
merged 2 commits into from
Aug 17, 2016

Conversation

trentmwillis
Copy link
Member

Addresses #173. After implementing, I realize this could potentially break some one that has already been using the resolver property in their passed in environment, but I think that risk is acceptable.

@rwjblue
Copy link
Member

rwjblue commented Aug 11, 2016

Seems like this should be changed in test-module.js (moduleFor also supports integration: true so it needs/uses a resolver) around here. Once that is changed, I'm not sure that the test-module-for-integration.js or test-module-for-component need to be changed as much...

@trentmwillis
Copy link
Member Author

@rwjblue test-module.js is changed. test-module-for-component inherits from test-module, so that is fine. Then test-module-for-integration inherits directly from abstract-test-module, so it also needs the changes.

Also, looks like Canary and Alpha are failing, for ambiguous reasons.

@rwjblue
Copy link
Member

rwjblue commented Aug 11, 2016

Yeah, I keep fighting with canary + alpha on CI. I'll look at that separately.

@trentmwillis
Copy link
Member Author

Seems like we could just make Canary an allowed failure. Also, could we drop some of the versions we test against and split the tests up into different processes?

@rwjblue
Copy link
Member

rwjblue commented Aug 16, 2016

Looks like canary was passing in #175, maybe try rebasing?

Trent Willis added 2 commits August 17, 2016 11:32
@trentmwillis
Copy link
Member Author

@rwjblue rebased and all is green now

@rwjblue rwjblue merged commit 262867d into emberjs:master Aug 17, 2016
@rwjblue
Copy link
Member

rwjblue commented Aug 18, 2016

Released in v0.5.33.

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