Skip to content

Commit 3c382f0

Browse files
author
Robert Jackson
committed
Migrate test configuration to new style.
1 parent db08cc9 commit 3c382f0

File tree

1 file changed

+63
-138
lines changed

1 file changed

+63
-138
lines changed

tests/create-tests.js

Lines changed: 63 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,24 @@ function createTests(options) {
1515
[
1616
DebugToolsPlugin,
1717
{
18-
envFlags: {
19-
source: '@ember/env-flags',
20-
flags: {
21-
DEBUG: false,
18+
flags: [
19+
{
20+
source: '@ember/env-flags',
21+
flags: {
22+
DEBUG: false,
23+
},
2224
},
23-
},
24-
debugTools: {
25-
source: '@ember/debug-tools',
26-
},
27-
features: [
2825
{
29-
name: 'ember-source',
3026
source: '@ember/features',
3127
flags: {
3228
FEATURE_A: false,
3329
FEATURE_B: true,
3430
},
3531
},
3632
],
33+
debugTools: {
34+
source: '@ember/debug-tools',
35+
},
3736
},
3837
],
3938
],
@@ -57,12 +56,7 @@ function createTests(options) {
5756
source: '@ember/debug-tools',
5857
assertPredicateIndex: 0,
5958
},
60-
envFlags: {
61-
source: '@ember/env-flags',
62-
flags: {
63-
DEBUG: true,
64-
},
65-
},
59+
flags: [{ source: '@ember/env-flags', flags: { DEBUG: true } }],
6660
},
6761
],
6862
],
@@ -93,12 +87,7 @@ function createTests(options) {
9387
source: '@ember/debug-tools',
9488
assertPredicateIndex: 0,
9589
},
96-
envFlags: {
97-
source: '@ember/env-flags',
98-
flags: {
99-
DEBUG: true,
100-
},
101-
},
90+
flags: [{ source: '@ember/env-flags', flags: { DEBUG: true } }],
10291
},
10392
],
10493

@@ -155,12 +144,7 @@ function createTests(options) {
155144
debugTools: {
156145
source: '@ember/debug-tools',
157146
},
158-
envFlags: {
159-
source: '@ember/env-flags',
160-
flags: {
161-
DEBUG: true,
162-
},
163-
},
147+
flags: [{ source: '@ember/env-flags', flags: { DEBUG: true } }],
164148
},
165149
],
166150
],
@@ -169,7 +153,7 @@ function createTests(options) {
169153
h.generateTest('global-external-helpers');
170154
});
171155

172-
describe('ember-cli-babel default configuration', function() {
156+
describe('ember-cli-babel default configuration (legacy config API)', function() {
173157
let h = transformTestHelper({
174158
presets,
175159
plugins: [
@@ -197,82 +181,52 @@ function createTests(options) {
197181
h.generateTest('ember-cli-babel-config');
198182
});
199183

200-
describe('Retain Module External Test Helpers', function() {
184+
describe('ember-cli-babel default configuration', function() {
201185
let h = transformTestHelper({
202186
presets,
203187
plugins: [
204188
[
205189
DebugToolsPlugin,
206190
{
207191
externalizeHelpers: {
208-
module: true,
192+
global: 'Ember',
209193
},
210194
debugTools: {
211-
source: '@ember/debug-tools',
212-
},
213-
envFlags: {
214-
source: '@ember/env-flags',
215-
flags: {
216-
DEBUG: true,
217-
},
195+
source: '@ember/debug',
196+
assertPredicateIndex: 1,
218197
},
198+
flags: [{ source: '@glimmer/env', flags: { DEBUG: true } }],
219199
},
220200
],
221201
],
222202
});
223203

224-
h.generateTest('retain-module-external-helpers');
204+
h.generateTest('ember-cli-babel-config');
225205
});
226206

227-
describe('Development Svelte Builds', function() {
207+
describe('Retain Module External Test Helpers', function() {
228208
let h = transformTestHelper({
229209
presets,
230210
plugins: [
231211
[
232212
DebugToolsPlugin,
233213
{
214+
externalizeHelpers: {
215+
module: true,
216+
},
234217
debugTools: {
235218
source: '@ember/debug-tools',
236219
},
237-
envFlags: {
238-
source: '@ember/env-flags',
239-
flags: {
240-
DEBUG: true,
241-
},
242-
},
243-
244-
svelte: {
245-
'ember-source': '2.15.0',
246-
},
247-
248-
features: [
249-
{
250-
name: 'my-app',
251-
source: 'my-app/features',
252-
flags: {
253-
FEATURE_A: false,
254-
FEATURE_B: true,
255-
},
256-
},
257-
// Note this going to have to be concated in by each lib
258-
{
259-
name: 'ember-source',
260-
source: '@ember/features',
261-
flags: {
262-
DEPRECATED_PARTIALS: '2.14.0',
263-
DEPRECATED_CONTROLLERS: '2.16.0',
264-
},
265-
},
266-
],
220+
flags: [{ source: '@ember/env-flags', flags: { DEBUG: true } }],
267221
},
268222
],
269223
],
270224
});
271225

272-
h.generateTest('development-svelte-builds');
226+
h.generateTest('retain-module-external-helpers');
273227
});
274228

275-
describe('Production Svelte Builds', function() {
229+
describe('Svelte Builds', function() {
276230
let h = transformTestHelper({
277231
presets,
278232
plugins: [
@@ -282,18 +236,8 @@ function createTests(options) {
282236
debugTools: {
283237
source: '@ember/debug-tools',
284238
},
285-
envFlags: {
286-
source: '@ember/env-flags',
287-
flags: {
288-
DEBUG: false,
289-
},
290-
},
291-
292-
svelte: {
293-
'ember-source': '2.15.0',
294-
},
295-
296-
features: [
239+
flags: [
240+
{ source: '@ember/env-flags', flags: { DEBUG: true } },
297241
{
298242
name: 'my-app',
299243
source: 'my-app/features',
@@ -312,12 +256,16 @@ function createTests(options) {
312256
},
313257
},
314258
],
259+
260+
svelte: {
261+
'ember-source': '2.15.0',
262+
},
315263
},
316264
],
317265
],
318266
});
319267

320-
h.generateTest('production-svelte-builds');
268+
h.generateTest('development-svelte-builds');
321269
});
322270

323271
describe('Inline Env Flags', function() {
@@ -327,17 +275,10 @@ function createTests(options) {
327275
[
328276
DebugToolsPlugin,
329277
{
330-
envFlags: {
331-
source: '@ember/env-flags',
332-
flags: {
333-
DEBUG: true,
334-
TESTING: false,
335-
},
336-
},
337278
debugTools: {
338279
source: '@ember/debug-tools',
339280
},
340-
features: [],
281+
flags: [{ source: '@ember/env-flags', flags: { DEBUG: true, TESTING: false } }],
341282
},
342283
],
343284
],
@@ -357,12 +298,7 @@ function createTests(options) {
357298
debugTools: {
358299
source: '@ember/debug-tools',
359300
},
360-
envFlags: {
361-
source: '@ember/env-flags',
362-
flags: {
363-
DEBUG: true,
364-
},
365-
},
301+
flags: [{ source: '@ember/env-flags', flags: { DEBUG: true } }],
366302
},
367303
],
368304
],
@@ -379,23 +315,19 @@ function createTests(options) {
379315
[
380316
DebugToolsPlugin,
381317
{
382-
envFlags: {
383-
source: '@ember/env-flags',
384-
flags: {
385-
DEBUG: false,
386-
},
387-
},
388318
debugTools: {
389319
source: '@ember/debug-tools',
390320
},
391-
features: {
392-
name: 'ember-source',
393-
source: '@ember/features',
394-
flags: {
395-
FEATURE_A: true,
396-
FEATURE_B: null,
321+
flags: [
322+
{ source: '@ember/env-flags', flags: { DEBUG: false } },
323+
{
324+
source: '@ember/features',
325+
flags: {
326+
FEATURE_A: true,
327+
FEATURE_B: null,
328+
},
397329
},
398-
},
330+
],
399331
},
400332
],
401333
],
@@ -411,23 +343,19 @@ function createTests(options) {
411343
[
412344
DebugToolsPlugin,
413345
{
414-
envFlags: {
415-
source: '@ember/env-flags',
416-
flags: {
417-
DEBUG: false,
418-
},
419-
},
420346
debugTools: {
421347
source: '@ember/debug-tools',
422348
},
423-
features: {
424-
name: 'ember-source',
425-
source: '@ember/features',
426-
flags: {
427-
FEATURE_A: true,
428-
FEATURE_B: null,
349+
flags: [
350+
{ source: '@ember/env-flags', flags: { DEBUG: false } },
351+
{
352+
source: '@ember/features',
353+
flags: {
354+
FEATURE_A: true,
355+
FEATURE_B: null,
356+
},
429357
},
430-
},
358+
],
431359
},
432360
],
433361
],
@@ -443,23 +371,20 @@ function createTests(options) {
443371
[
444372
DebugToolsPlugin,
445373
{
446-
envFlags: {
447-
source: '@ember/env-flags',
448-
flags: {
449-
DEBUG: true,
374+
flags: [
375+
{ source: '@ember/env-flags', flags: { DEBUG: true } },
376+
{
377+
name: 'ember-source',
378+
source: '@ember/features',
379+
flags: {
380+
FOO_BAR: false,
381+
WIDGET_WOO: false,
382+
},
450383
},
451-
},
384+
],
452385
debugTools: {
453386
source: '@ember/debug-tools',
454387
},
455-
features: {
456-
name: 'ember-source',
457-
source: '@ember/features',
458-
flags: {
459-
FOO_BAR: false,
460-
WIDGET_WOO: false,
461-
},
462-
},
463388
},
464389
],
465390
],

0 commit comments

Comments
 (0)