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

Changed how to determine if mockjax should be loaded #125

Conversation

begedin
Copy link
Contributor

@begedin begedin commented Aug 24, 2015

Description

This PR resolves the issue described in #124

If the described issue is in fact not an issue, feel free to ignore and close it.

danielspaniel added a commit that referenced this pull request Aug 24, 2015
Changed how to determine if mockjax should be loaded
@danielspaniel danielspaniel merged commit b689c28 into adopted-ember-addons:master Aug 24, 2015
@danielspaniel
Copy link
Collaborator

You are right about that one @begedin .. was good catch .. thanks for the PR.

@danielspaniel
Copy link
Collaborator

v1.3.9 has this change

@cherewaty
Copy link

Just bumped my Ember CLI app’s ember-data-factory-guy version to bring in this change. Now mockjax won’t import into my qunit-driven acceptance tests in the browser if I simply run ember server. The mockjax import happens if I run ember server --environment test, but then I can't simultaneously run my app on localhost:4200 and my tests at localhost:4200/tests.

I think the original implementation is also how ember-cli-qunit determines whether to import its own assets from the bower directory (ditto ember-cli-simple-auth-testing):

if (app.tests) {
  app.import(app.bowerDirectory + '/jquery-mockjax/dist/jquery.mockjax.js');
}

@danielspaniel
Copy link
Collaborator

yikes .. your even more right .. @cherewaty. What was I thinking before I changed this?? Gulp. That was dumb. I will comment that to make sure I don't forget again. Fixing.

@danielspaniel
Copy link
Collaborator

fixed in v2.0.3

@danielspaniel
Copy link
Collaborator

@begedin, until that raven issue is fixed .. you can stay with v2.0.2 I reckon

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