Skip to content

Commit d665c55

Browse files
author
Stanley Stuart
committed
[glimmer2] enable tests fixed by emberjs#13615
refs emberjs#13644
1 parent 84dc75a commit d665c55

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"express": "^4.5.0",
3838
"finalhandler": "^0.4.0",
3939
"github": "^0.2.3",
40-
"glimmer-engine": "tildeio/glimmer#256f044",
40+
"glimmer-engine": "tildeio/glimmer#b618846",
4141
"glob": "^5.0.13",
4242
"htmlbars": "0.14.24",
4343
"mocha": "^2.4.5",

packages/ember-testing/tests/acceptance_test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ test('Nested async helpers', function() {
207207
});
208208
});
209209

210-
test('Multiple nested async helpers', function() {
210+
QUnit.test('Multiple nested async helpers', function() {
211211
expect(3);
212212

213213
visit('/posts');

packages/ember-testing/tests/helpers_test.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ QUnit.test('`wait` helper can be passed a resolution value', function() {
347347

348348
import { test } from 'internal-test-helpers/tests/skip-if-glimmer';
349349

350-
test('`click` triggers appropriate events in order', function() {
350+
QUnit.test('`click` triggers appropriate events in order', function() {
351351
expect(5);
352352

353353
var click, wait, events;
@@ -547,7 +547,7 @@ QUnit.test('`wait` does not error if routing has not begun', function() {
547547
});
548548
});
549549

550-
test('`triggerEvent accepts an optional options hash without context', function() {
550+
QUnit.test('`triggerEvent accepts an optional options hash without context', function() {
551551
expect(3);
552552

553553
var triggerEvent, wait, event;
@@ -577,7 +577,7 @@ test('`triggerEvent accepts an optional options hash without context', function(
577577
});
578578
});
579579

580-
test('`triggerEvent can limit searching for a selector to a scope', function() {
580+
QUnit.test('`triggerEvent can limit searching for a selector to a scope', function() {
581581
expect(2);
582582

583583
var triggerEvent, wait, event;
@@ -607,7 +607,7 @@ test('`triggerEvent can limit searching for a selector to a scope', function() {
607607
});
608608
});
609609

610-
test('`triggerEvent` can be used to trigger arbitrary events', function() {
610+
QUnit.test('`triggerEvent` can be used to trigger arbitrary events', function() {
611611
expect(2);
612612

613613
var triggerEvent, wait, event;
@@ -725,7 +725,7 @@ QUnit.test('`fillIn` fires `input` and `change` events in the proper order', fun
725725
return wait();
726726
});
727727

728-
test('`triggerEvent accepts an optional options hash and context', function() {
728+
QUnit.test('`triggerEvent accepts an optional options hash and context', function() {
729729
expect(3);
730730

731731
var triggerEvent, wait, event;

0 commit comments

Comments
 (0)