Skip to content

Commit

Permalink
Merge pull request #13837 from chadhietala/moar-test-helper-tests
Browse files Browse the repository at this point in the history
[Glimmer2] Unskip test helper tests related to chaining
  • Loading branch information
stefanpenner committed Jul 18, 2016
2 parents a06493e + 244c251 commit 8cfd257
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions packages/ember-testing/tests/acceptance_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ import { setTemplates, set as setTemplate } from 'ember-templates/template_regis

var App, find, click, fillIn, currentRoute, currentURL, visit, originalAdapter, andThen, indexHitCount;

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

QUnit.module('ember-testing Acceptance', {
setup() {
jQuery('<style>#ember-testing-container { position: absolute; background: white; bottom: 0; right: 0; width: 640px; height: 384px; overflow: auto; z-index: 9999; border: 1px solid #ccc; } #ember-testing { zoom: 50%; }</style>').appendTo('head');
Expand Down Expand Up @@ -103,7 +101,7 @@ QUnit.module('ember-testing Acceptance', {
}
});

test('helpers can be chained with then', function() {
QUnit.test('helpers can be chained with then', function() {
expect(6);

currentRoute = 'index';
Expand All @@ -130,7 +128,7 @@ test('helpers can be chained with then', function() {

// Keep this for backwards compatibility

test('helpers can be chained to each other', function() {
QUnit.test('helpers can be chained to each other', function() {
expect(7);

currentRoute = 'index';
Expand All @@ -155,7 +153,7 @@ test('helpers can be chained to each other', function() {
});
});

test('helpers don\'t need to be chained', function() {
QUnit.test('helpers don\'t need to be chained', function() {
expect(5);

currentRoute = 'index';
Expand All @@ -180,7 +178,7 @@ test('helpers don\'t need to be chained', function() {
});
});

test('Nested async helpers', function() {
QUnit.test('Nested async helpers', function() {
expect(5);

currentRoute = 'index';
Expand Down Expand Up @@ -226,7 +224,7 @@ QUnit.test('Multiple nested async helpers', function() {
});
});

test('Helpers nested in thens', function() {
QUnit.test('Helpers nested in thens', function() {
expect(5);

currentRoute = 'index';
Expand Down

0 comments on commit 8cfd257

Please sign in to comment.