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

Upgrade QUnit to 2.0 #134

Merged
merged 1 commit into from
Aug 18, 2016
Merged

Upgrade QUnit to 2.0 #134

merged 1 commit into from
Aug 18, 2016

Conversation

trentmwillis
Copy link
Member

Corollary to https:/rwjblue/ember-qunit/pull/234.

Only real change here is to provide a new test adapter for handling async. This might belong in ember-qunit as opposed to this addon, but adding it here was way easier.

@trentmwillis
Copy link
Member Author

trentmwillis commented Aug 1, 2016

Tested this against Ember Observer and all is passing. But it is dependent on https:/rwjblue/ember-qunit/pull/234 being released first. I'll figure out why Travis is red in the meantime...

screen shot 2016-07-31 at 5 03 10 pm

@@ -1,6 +1,20 @@
/* globals jQuery, QUnit, require, requirejs */

jQuery(document).ready(function() {
Ember.Test.QUnit2Adapter = Ember.Test.QUnitAdapter.extend({
Copy link
Member

Choose a reason for hiding this comment

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

I'd like to move this into the ember-qunit suite, and not add to Ember.Test. Basically it would be:

import { QUnitAdapter } from 'ember-qunit';

@rwjblue
Copy link
Member

rwjblue commented Aug 17, 2016

I just released [email protected] with the changes from https:/rwjblue/ember-qunit/pull/234, would you mind updating things here to match and smoke test?

@trentmwillis
Copy link
Member Author

@rwjblue rebased this to use [email protected] and everything seems green. Also tested against the Ember Observer test suite again, no issues.

@rwjblue rwjblue merged commit 884a35c into ember-cli:master Aug 18, 2016
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