Skip to content

Commit 7511e29

Browse files
Update some things
1 parent e9201e6 commit 7511e29

3 files changed

Lines changed: 82 additions & 58 deletions

File tree

Lines changed: 76 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,86 @@
11
'use strict';
22

33
const getChannelURL = require('ember-source-channel-url');
4+
const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
45

5-
module.exports = function() {
6-
return Promise.all([
7-
getChannelURL('release'),
8-
getChannelURL('beta'),
9-
getChannelURL('canary')
10-
]).then((urls) => {
11-
return {
12-
usePnpm: true,
13-
scenarios: [
14-
{
15-
name: 'ember-lts-2.12',
16-
npm: {
17-
devDependencies: {
18-
'@ember/jquery': '^0.5.1',
19-
'ember-source': '~2.18.0'
20-
}
21-
}
6+
module.exports = async function () {
7+
return {
8+
usePnpm: true,
9+
scenarios: [
10+
{
11+
name: 'ember-lts-4.4',
12+
npm: {
13+
devDependencies: {
14+
'@ember/test-helpers': '^2.5.0',
15+
'ember-cli-babel': '^7.26.11',
16+
'ember-source': '~4.4.0',
17+
},
2218
},
23-
{
24-
name: 'ember-lts-2.18',
25-
npm: {
26-
devDependencies: {
27-
'@ember/jquery': '^0.5.1',
28-
'ember-source': '~2.18.0'
29-
}
30-
}
19+
},
20+
{
21+
name: 'ember-lts-4.8',
22+
npm: {
23+
devDependencies: {
24+
'@ember/test-helpers': '^2.5.0',
25+
'@ember/test-waiters': '^3.1.0',
26+
'ember-cli-babel': '^7.26.11',
27+
'ember-source': '~4.8.0',
28+
},
3129
},
32-
{
33-
name: 'ember-release',
34-
npm: {
35-
devDependencies: {
36-
'ember-source': urls[0]
37-
}
38-
}
30+
},
31+
{
32+
name: 'ember-lts-4.12',
33+
npm: {
34+
devDependencies: {
35+
'@ember/test-helpers': '^2.5.0',
36+
'@ember/test-waiters': '^3.1.0',
37+
'ember-cli-babel': '^7.26.11',
38+
'ember-source': '~4.12.0',
39+
},
3940
},
40-
{
41-
name: 'ember-beta',
42-
npm: {
43-
devDependencies: {
44-
'ember-source': urls[1]
45-
}
46-
}
41+
},
42+
{
43+
name: 'ember-lts-5.4',
44+
npm: {
45+
devDependencies: {
46+
'ember-source': '~5.4.0',
47+
},
4748
},
48-
{
49-
name: 'ember-canary',
50-
npm: {
51-
devDependencies: {
52-
'ember-source': urls[2]
53-
}
54-
}
49+
},
50+
{
51+
name: 'ember-lts-5.8',
52+
npm: {
53+
devDependencies: {
54+
'ember-source': '~5.8.0',
55+
},
5556
},
56-
{
57-
name: 'ember-default',
58-
npm: {
59-
devDependencies: {}
60-
}
61-
}
62-
]
63-
};
64-
});
57+
},
58+
{
59+
name: 'ember-release',
60+
npm: {
61+
devDependencies: {
62+
'ember-source': await getChannelURL('release'),
63+
},
64+
},
65+
},
66+
{
67+
name: 'ember-beta',
68+
npm: {
69+
devDependencies: {
70+
'ember-source': await getChannelURL('beta'),
71+
},
72+
},
73+
},
74+
{
75+
name: 'ember-canary',
76+
npm: {
77+
devDependencies: {
78+
'ember-source': await getChannelURL('canary'),
79+
},
80+
},
81+
},
82+
embroiderSafe(),
83+
embroiderOptimized(),
84+
],
85+
};
6586
};

test-apps/new-addon/tests/index.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<html>
33
<head>
44
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
65
<title>Dummy Tests</title>
76
<meta name="description" content="">
87
<meta name="viewport" content="width=device-width, initial-scale=1">
@@ -20,6 +19,7 @@
2019
<body>
2120
{{content-for "body"}}
2221
{{content-for "test-body"}}
22+
2323
<div id="qunit"></div>
2424
<div id="qunit-fixture">
2525
<div id="ember-testing-container">
@@ -28,6 +28,7 @@
2828
</div>
2929

3030
<script src="/testem.js" integrity="" data-embroider-ignore></script>
31+
3132
<script src="{{rootURL}}assets/vendor.js"></script>
3233
<script src="{{rootURL}}assets/test-support.js"></script>
3334
<script src="{{rootURL}}assets/dummy.js"></script>

test-apps/new-addon/tests/test-helper.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ import config from 'dummy/config/environment';
33
import * as QUnit from 'qunit';
44
import { setApplication } from '@ember/test-helpers';
55
import { setup } from 'qunit-dom';
6-
import { start } from 'ember-qunit';
6+
import { loadTests } from 'ember-qunit/test-loader';
7+
import { start, setupEmberOnerrorValidation } from 'ember-qunit';
78

89
setApplication(Application.create(config.APP));
910

1011
setup(QUnit.assert);
11-
12+
setupEmberOnerrorValidation();
13+
loadTests();
1214
start();

0 commit comments

Comments
 (0)