[glimmer2] enable tests fixed by emberjs#13615

refs emberjs#13644
fivetanley · Jul 17, 2016 · d665c55 · d665c55
1 parent 84dc75a
commit d665c55
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
     "express": "^4.5.0",
     "finalhandler": "^0.4.0",
     "github": "^0.2.3",
-    "glimmer-engine": "tildeio/glimmer#256f044",
+    "glimmer-engine": "tildeio/glimmer#b618846",
     "glob": "^5.0.13",
     "htmlbars": "0.14.24",
     "mocha": "^2.4.5",

diff --git a/packages/ember-testing/tests/acceptance_test.js b/packages/ember-testing/tests/acceptance_test.js
@@ -207,7 +207,7 @@ test('Nested async helpers', function() {
   });
 });
 
-test('Multiple nested async helpers', function() {
+QUnit.test('Multiple nested async helpers', function() {
   expect(3);
 
   visit('/posts');

diff --git a/packages/ember-testing/tests/helpers_test.js b/packages/ember-testing/tests/helpers_test.js
@@ -347,7 +347,7 @@ QUnit.test('`wait` helper can be passed a resolution value', function() {
 
 import { test } from 'internal-test-helpers/tests/skip-if-glimmer';
 
-test('`click` triggers appropriate events in order', function() {
+QUnit.test('`click` triggers appropriate events in order', function() {
   expect(5);
 
   var click, wait, events;
@@ -547,7 +547,7 @@ QUnit.test('`wait` does not error if routing has not begun', function() {
   });
 });
 
-test('`triggerEvent accepts an optional options hash without context', function() {
+QUnit.test('`triggerEvent accepts an optional options hash without context', function() {
   expect(3);
 
   var triggerEvent, wait, event;
@@ -577,7 +577,7 @@ test('`triggerEvent accepts an optional options hash without context', function(
   });
 });
 
-test('`triggerEvent can limit searching for a selector to a scope', function() {
+QUnit.test('`triggerEvent can limit searching for a selector to a scope', function() {
   expect(2);
 
   var triggerEvent, wait, event;
@@ -607,7 +607,7 @@ test('`triggerEvent can limit searching for a selector to a scope', function() {
   });
 });
 
-test('`triggerEvent` can be used to trigger arbitrary events', function() {
+QUnit.test('`triggerEvent` can be used to trigger arbitrary events', function() {
   expect(2);
 
   var triggerEvent, wait, event;
@@ -725,7 +725,7 @@ QUnit.test('`fillIn` fires `input` and `change` events in the proper order', fun
   return wait();
 });
 
-test('`triggerEvent accepts an optional options hash and context', function() {
+QUnit.test('`triggerEvent accepts an optional options hash and context', function() {
   expect(3);
 
   var triggerEvent, wait, event;