Skip to content
This repository has been archived by the owner on Dec 10, 2024. It is now read-only.

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://github.com/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://github.com/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 ember-qunit@1.0.0-beta.1 with the changes from https://github.com/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 ember-qunit@1.0.0-beta.1 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
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants