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

ember-cli 0.2.3 #81

Merged
merged 12 commits into from
Apr 13, 2015
Merged

ember-cli 0.2.3 #81

merged 12 commits into from
Apr 13, 2015

Conversation

dustinfarris
Copy link
Owner

This bumps our internal ember-cli to v0.2.3.

The PR is big as a lot needed updating. In summary:

  • All dependencies are updated to the new addon blueprint
  • Sinon received a minor upgrade
  • Use the new assert arg now required in ember-qunit tests
  • Use node 0.12 on circleci tests
  • Updated acceptance tests to return promises, avoiding the need to explicitly stop/start qunit (see: https://github.com/rwjblue/ember-qunit#async-example)

Modify acceptance tests to return promises to force non-async execution;
and various other updates.
@stefanpenner
Copy link
Contributor

i submitted a PR quick fixes the issue #82

@dustinfarris
Copy link
Owner Author

@benkonrath this should be good to merge

@@ -9,7 +9,6 @@
/bower_components

# misc
/.idea
Copy link
Collaborator

Choose a reason for hiding this comment

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

I use PyCharm so this ignore is useful for me.

Copy link
Owner Author

Choose a reason for hiding this comment

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

Will fix. I'll also add .travis.yml while I'm at it.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Ok, I'll merge this PR once you update this. Thanks.

@benkonrath
Copy link
Collaborator

Looks good. Thanks for the doing the work on this - there are some nice improvements of the tests and it's nice to see that things are still working with the new versions of ember and ember-data.

I noticed you renamed the integration directory to acceptance. Is this required by ember-cli or is this just a better name? It's fine by me, I'm just curious.

The README should also be updated to indicate that this adapter works with ember-cli 0.2.3, ember 1.11.1 and ember-data 1.0.0-beta.16.1.

So it just the .gitignore and the question about the travis and then I'll merge it.

@dustinfarris
Copy link
Owner Author

"acceptance" tests seems to be the de facto terminology in Ember world. I'm indifferent in general, but would like to stay consistent with the ecosystem.

@dustinfarris
Copy link
Owner Author

I think we're good here.

benkonrath added a commit that referenced this pull request Apr 13, 2015
@benkonrath benkonrath merged commit 5fef3f0 into master Apr 13, 2015
@dustinfarris dustinfarris deleted the ember-cli-0.2.3 branch July 7, 2015 20:12
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