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 release] Ensure Ember.Test globals setup when including ember-testing.js #15112

Merged
merged 2 commits into from
Apr 6, 2017

Conversation

trentmwillis
Copy link
Member

Addressing one part of ember-cli/ember-cli#6870.

After this, it looks like there are other errors that pop-up, but those will be handled in a separate PR.

@trentmwillis
Copy link
Member Author

Looks like Safari bombed out on SauceLabs, due to a timeout.

@rwjblue
Copy link
Member

rwjblue commented Apr 5, 2017

restarted

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.

Can you share the source of dist/ember-testing.js with this PR?

hasBootstrap: false,
footer: stripIndent`
var testing = requireModule('ember-testing');
Ember.Test = testing.Test;
Copy link
Member

Choose a reason for hiding this comment

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

Is Ember guaranteed to exist here? What happens when you eval ember-testing.js before ember.debug.js or ember.prod.js?

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, due to these lines. I originally had var Ember = requireModule('ember-metal/core'); but that was flagged as a redeclaration.

Copy link
Member

Choose a reason for hiding this comment

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

Confirmed that this works as intended via shared asset in #15112 (comment)

@trentmwillis
Copy link
Member Author

Here's the output of ember-testing.js.

@rwjblue rwjblue merged commit d9d5c24 into emberjs:master Apr 6, 2017
@homu homu mentioned this pull request Apr 6, 2017
@rwjblue
Copy link
Member

rwjblue commented Apr 7, 2017

@trentmwillis - The entire build system has changed between release/beta and master, and df839ae cannot be cherry-picked. Would you mind submitting a PR targetting beta with that commit?

@trentmwillis
Copy link
Member Author

@rwjblue, sure, target beta but still tag as BUGFIX release?

@rwjblue
Copy link
Member

rwjblue commented Apr 7, 2017

Yes, beta and release are pretty close (the build side is basically the same), so it should still cherry-pick from beta to release.

@trentmwillis
Copy link
Member Author

So turns out this needs to be ported into emberjs-build and then we'll have to bump that package on the beta/release branch here.

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