Skip to content

Commit 598cf71

Browse files
committed
stop using custom backburner wrapper in router_js tests
1 parent c504ebc commit 598cf71

9 files changed

Lines changed: 3039 additions & 2878 deletions

packages/router_js/tests/query_params_test.ts

Lines changed: 439 additions & 400 deletions
Large diffs are not rendered by default.

packages/router_js/tests/route_info_test.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import {
1010
import InternalTransition from '../lib/transition';
1111
import URLTransitionIntent from '../lib/transition-intent/url-transition-intent';
1212
import { resolve } from 'rsvp';
13-
import { createHandler, createHandlerInfo, module, test, skip, TestRouter } from './test_helpers';
13+
import { createHandler, createHandlerInfo, TestRouter } from './test_helpers';
1414

15-
module('RouteInfo');
15+
QUnit.module('RouteInfo');
1616

17-
test('ResolvedRouteInfo resolve to themselves', function (assert) {
17+
QUnit.test('ResolvedRouteInfo resolve to themselves', function (assert) {
1818
assert.expect(1);
1919
let router = new TestRouter();
2020
let routeInfo = new ResolvedRouteInfo(router, 'foo', [], {}, createHandler('empty'));
@@ -27,7 +27,7 @@ test('ResolvedRouteInfo resolve to themselves', function (assert) {
2727
});
2828
});
2929

30-
test('UnresolvedRouteInfoByParam defaults params to {}', function (assert) {
30+
QUnit.test('UnresolvedRouteInfoByParam defaults params to {}', function (assert) {
3131
let router = new TestRouter();
3232
let routeInfo = new UnresolvedRouteInfoByParam(router, 'empty', [], {});
3333
assert.deepEqual(routeInfo.params, {});
@@ -36,7 +36,7 @@ test('UnresolvedRouteInfoByParam defaults params to {}', function (assert) {
3636
assert.deepEqual(routeInfo2.params, { foo: 5 });
3737
});
3838

39-
test('RouteInfo can be aborted mid-resolve', function (assert) {
39+
QUnit.test('RouteInfo can be aborted mid-resolve', function (assert) {
4040
assert.expect(1);
4141

4242
let routeInfo = createHandlerInfo('stub');
@@ -54,7 +54,7 @@ test('RouteInfo can be aborted mid-resolve', function (assert) {
5454
});
5555
});
5656

57-
test('RouteInfo#resolve resolves with a ResolvedRouteInfo', function (assert) {
57+
QUnit.test('RouteInfo#resolve resolves with a ResolvedRouteInfo', function (assert) {
5858
assert.expect(1);
5959

6060
let routeInfo = createHandlerInfo('stub');
@@ -63,7 +63,7 @@ test('RouteInfo#resolve resolves with a ResolvedRouteInfo', function (assert) {
6363
});
6464
});
6565

66-
test('RouteInfo#resolve runs beforeModel hook on handler', function (assert) {
66+
QUnit.test('RouteInfo#resolve runs beforeModel hook on handler', function (assert) {
6767
assert.expect(1);
6868

6969
let transition = {} as Transition;
@@ -85,7 +85,7 @@ test('RouteInfo#resolve runs beforeModel hook on handler', function (assert) {
8585
});
8686
});
8787

88-
test('RouteInfo#resolve runs getModel hook', async function (assert) {
88+
QUnit.test('RouteInfo#resolve runs getModel hook', async function (assert) {
8989
assert.expect(2);
9090

9191
let transition = {} as Transition;
@@ -111,7 +111,7 @@ test('RouteInfo#resolve runs getModel hook', async function (assert) {
111111
*
112112
* TODO: unskip this test
113113
*/
114-
skip('RouteInfo#resolve runs afterModel hook on handler', function (assert) {
114+
QUnit.skip('RouteInfo#resolve runs afterModel hook on handler', function (assert) {
115115
assert.expect(3);
116116

117117
let transition = {} as Transition;
@@ -135,7 +135,7 @@ skip('RouteInfo#resolve runs afterModel hook on handler', function (assert) {
135135
});
136136
});
137137

138-
test('UnresolvedRouteInfoByParam gets its model hook called', function (assert) {
138+
QUnit.test('UnresolvedRouteInfoByParam gets its model hook called', function (assert) {
139139
assert.expect(2);
140140
let router = new TestRouter();
141141

@@ -160,7 +160,7 @@ test('UnresolvedRouteInfoByParam gets its model hook called', function (assert)
160160
routeInfo.resolve(transition);
161161
});
162162

163-
test('UnresolvedRouteInfoByObject does NOT get its model hook called', function (assert) {
163+
QUnit.test('UnresolvedRouteInfoByObject does NOT get its model hook called', function (assert) {
164164
type Dorkleton = { name: string } & IModel;
165165

166166
assert.expect(1);
@@ -194,7 +194,7 @@ test('UnresolvedRouteInfoByObject does NOT get its model hook called', function
194194
});
195195
});
196196

197-
test('RouteInfo.find', function (assert) {
197+
QUnit.test('RouteInfo.find', function (assert) {
198198
assert.expect(3);
199199
let router = new TestRouter();
200200
let parent = new ResolvedRouteInfo(router, 'parent', [], {}, createHandler('parent'));
@@ -214,7 +214,7 @@ test('RouteInfo.find', function (assert) {
214214
});
215215
});
216216

217-
test('RouteInfo.find returns matched', function (assert) {
217+
QUnit.test('RouteInfo.find returns matched', function (assert) {
218218
assert.expect(3);
219219
let router = new TestRouter();
220220
let parent = new ResolvedRouteInfo(router, 'parent', [], {}, createHandler('parent'));

0 commit comments

Comments
 (0)