Skip to content
This repository was archived by the owner on Mar 7, 2023. It is now read-only.

Commit 3aae490

Browse files
mdeanjonesmdeanjones
committed
test: setup ember-try scenarios
1 parent 4dbb6f9 commit 3aae490

File tree

13 files changed

+361
-225
lines changed

13 files changed

+361
-225
lines changed

‎.yarnclean‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# test directories
2+
__tests__
3+
test
4+
tests
5+
powered-test
6+
7+
# asset directories
8+
docs
9+
doc
10+
website
11+
images
12+
assets
13+
14+
# examples
15+
example
16+
examples
17+
18+
# code coverage directories
19+
coverage
20+
.nyc_output
21+
22+
# build scripts
23+
Makefile
24+
Gulpfile.js
25+
Gruntfile.js
26+
27+
# configs
28+
appveyor.yml
29+
circle.yml
30+
codeship-services.yml
31+
codeship-steps.yml
32+
wercker.yml
33+
.tern-project
34+
.gitattributes
35+
.editorconfig
36+
.*ignore
37+
.eslintrc
38+
.jshintrc
39+
.flowconfig
40+
.documentup.json
41+
.yarn-metadata.json
42+
.travis.yml
43+
44+
# misc
45+
*.md

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"scripts": {
1010
"document": "npm run document --workspaces --if-present",
1111
"test": "npm test --workspaces --if-present",
12+
"test:ember-compatibility": "npm run test:ember-compatibility --workspaces --if-present",
1213
"test:coverage": "npm run test:coverage --workspaces --if-present",
1314
"posttest:coverage": "npx lcov-result-merger 'packages/*/*/coverage/lcov.info' 'lcov.info' --prepend-source-files",
1415
"lint:js": "npm run lint:js --workspaces --if-present",

‎packages/@nsf-open/ember-contact-utils/config/ember-try.js‎

Lines changed: 39 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,48 @@
11
'use strict';
2-
32
const getChannelURL = require('ember-source-channel-url');
3+
const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
44

5-
module.exports = function() {
6-
return Promise.all([
7-
getChannelURL('release')
8-
]).then((urls) => {
9-
return {
10-
useYarn: true,
5+
module.exports = async function() {
6+
return {
7+
useYarn: true,
8+
command: 'npm run test:ember',
119

12-
scenarios: [
13-
{
14-
name: 'ember-lts-3.4',
15-
npm: {
16-
devDependencies: {
17-
'ember-source': '~3.4.0'
18-
}
10+
scenarios: [
11+
{
12+
name: 'ember-lts-3.16',
13+
npm: {
14+
devDependencies: {
15+
'ember-source': '~3.16'
1916
}
20-
},
21-
{
22-
name: 'ember-release',
23-
npm: {
24-
devDependencies: {
25-
'ember-source': urls[0]
26-
}
17+
}
18+
},
19+
{
20+
name: 'ember-lts-3.28',
21+
npm: {
22+
devDependencies: {
23+
'ember-source': '~3.28'
2724
}
25+
}
26+
},
27+
{
28+
name: 'ember-release',
29+
env: {
30+
COVERAGE: true,
2831
},
29-
{
30-
name: 'ember-default',
31-
npm: {
32-
devDependencies: {}
32+
npm: {
33+
devDependencies: {
34+
'ember-source': await getChannelURL('release'),
3335
}
34-
},
35-
]
36-
};
37-
});
36+
}
37+
},
38+
{
39+
name: 'ember-default',
40+
npm: {
41+
devDependencies: {}
42+
}
43+
},
44+
embroiderSafe(),
45+
embroiderOptimized(),
46+
]
47+
};
3848
};

‎packages/@nsf-open/ember-contact-utils/package.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"lint:js": "eslint .",
1616
"start": "ember serve",
1717
"test": "npm run lint:js && ember test",
18-
"test:all": "ember try:each",
19-
"test:ember": "ember test",
18+
"test:ember-compatibility": "ember try:each",
19+
"test:ember": "ember test --test-port=0",
2020
"test:coverage": "COVERAGE=true ember test",
2121
"prepack": "ember ts:precompile",
2222
"postpack": "ember ts:clean",
@@ -32,6 +32,7 @@
3232
"@babel/eslint-parser": "^7.18.2",
3333
"@ember/optional-features": "2.0.0",
3434
"@ember/test-helpers": "2.8.0",
35+
"@embroider/test-setup": "^1.8.0",
3536
"@glimmer/component": "1.1.2",
3637
"@glimmer/tracking": "1.1.2",
3738
"@types/ember-qunit": "5.0.0",
@@ -74,7 +75,7 @@
7475
"ember-maybe-import-regenerator": "1.0.0",
7576
"ember-qunit": "5.1.5",
7677
"ember-resolver": "8.0.3",
77-
"ember-source": "^4.4.0",
78+
"ember-source": "~3.16",
7879
"ember-source-channel-url": "3.0.0",
7980
"ember-try": "2.0.0",
8081
"eslint": "^8.17.0",
@@ -96,4 +97,4 @@
9697
"ember-addon": {
9798
"configPath": "tests/dummy/config"
9899
}
99-
}
100+
}

‎packages/@nsf-open/ember-currency-utils/config/ember-try.js‎

Lines changed: 39 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,48 @@
11
'use strict';
2-
32
const getChannelURL = require('ember-source-channel-url');
3+
const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
44

5-
module.exports = function() {
6-
return Promise.all([
7-
getChannelURL('release')
8-
]).then((urls) => {
9-
return {
10-
useYarn: true,
5+
module.exports = async function() {
6+
return {
7+
useYarn: true,
8+
command: 'npm run test:ember',
119

12-
scenarios: [
13-
{
14-
name: 'ember-lts-3.4',
15-
npm: {
16-
devDependencies: {
17-
'ember-source': '~3.4.0'
18-
}
10+
scenarios: [
11+
{
12+
name: 'ember-lts-3.16',
13+
npm: {
14+
devDependencies: {
15+
'ember-source': '~3.16'
1916
}
20-
},
21-
{
22-
name: 'ember-release',
23-
npm: {
24-
devDependencies: {
25-
'ember-source': urls[0]
26-
}
17+
}
18+
},
19+
{
20+
name: 'ember-lts-3.28',
21+
npm: {
22+
devDependencies: {
23+
'ember-source': '~3.28'
2724
}
25+
}
26+
},
27+
{
28+
name: 'ember-release',
29+
env: {
30+
COVERAGE: true,
2831
},
29-
{
30-
name: 'ember-default',
31-
npm: {
32-
devDependencies: {}
32+
npm: {
33+
devDependencies: {
34+
'ember-source': await getChannelURL('release'),
3335
}
34-
},
35-
]
36-
};
37-
});
36+
}
37+
},
38+
{
39+
name: 'ember-default',
40+
npm: {
41+
devDependencies: {}
42+
}
43+
},
44+
embroiderSafe(),
45+
embroiderOptimized(),
46+
]
47+
};
3848
};

‎packages/@nsf-open/ember-currency-utils/package.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"lint:js": "eslint .",
1616
"start": "ember serve",
1717
"test": "npm run lint:js && ember test",
18-
"test:all": "ember try:each",
19-
"test:ember": "ember test",
18+
"test:ember-compatibility": "ember try:each",
19+
"test:ember": "ember test --test-port=0",
2020
"test:coverage": "COVERAGE=true ember test",
2121
"prepack": "ember ts:precompile",
2222
"postpack": "ember ts:clean",
@@ -32,6 +32,7 @@
3232
"@babel/eslint-parser": "^7.18.2",
3333
"@ember/optional-features": "2.0.0",
3434
"@ember/test-helpers": "2.8.0",
35+
"@embroider/test-setup": "^1.8.0",
3536
"@glimmer/component": "1.1.2",
3637
"@glimmer/tracking": "1.1.2",
3738
"@types/ember-qunit": "5.0.0",
@@ -74,7 +75,7 @@
7475
"ember-maybe-import-regenerator": "1.0.0",
7576
"ember-qunit": "5.1.5",
7677
"ember-resolver": "8.0.3",
77-
"ember-source": "^4.4.0",
78+
"ember-source": "~3.16",
7879
"ember-source-channel-url": "3.0.0",
7980
"ember-try": "2.0.0",
8081
"eslint": "^8.17.0",
@@ -96,4 +97,4 @@
9697
"ember-addon": {
9798
"configPath": "tests/dummy/config"
9899
}
99-
}
100+
}

‎packages/@nsf-open/ember-datetime-utils/config/ember-try.js‎

Lines changed: 39 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,48 @@
11
'use strict';
2-
32
const getChannelURL = require('ember-source-channel-url');
3+
const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
44

5-
module.exports = function() {
6-
return Promise.all([
7-
getChannelURL('release')
8-
]).then((urls) => {
9-
return {
10-
useYarn: true,
5+
module.exports = async function() {
6+
return {
7+
useYarn: true,
8+
command: 'npm run test:ember',
119

12-
scenarios: [
13-
{
14-
name: 'ember-lts-3.4',
15-
npm: {
16-
devDependencies: {
17-
'ember-source': '~3.4.0'
18-
}
10+
scenarios: [
11+
{
12+
name: 'ember-lts-3.16',
13+
npm: {
14+
devDependencies: {
15+
'ember-source': '~3.16'
1916
}
20-
},
21-
{
22-
name: 'ember-release',
23-
npm: {
24-
devDependencies: {
25-
'ember-source': urls[0]
26-
}
17+
}
18+
},
19+
{
20+
name: 'ember-lts-3.28',
21+
npm: {
22+
devDependencies: {
23+
'ember-source': '~3.28'
2724
}
25+
}
26+
},
27+
{
28+
name: 'ember-release',
29+
env: {
30+
COVERAGE: true,
2831
},
29-
{
30-
name: 'ember-default',
31-
npm: {
32-
devDependencies: {}
32+
npm: {
33+
devDependencies: {
34+
'ember-source': await getChannelURL('release'),
3335
}
34-
},
35-
]
36-
};
37-
});
36+
}
37+
},
38+
{
39+
name: 'ember-default',
40+
npm: {
41+
devDependencies: {}
42+
}
43+
},
44+
embroiderSafe(),
45+
embroiderOptimized(),
46+
]
47+
};
3848
};

‎packages/@nsf-open/ember-datetime-utils/package.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"lint:js": "eslint .",
1616
"start": "ember serve",
1717
"test": "npm run lint:js && ember test",
18-
"test:all": "ember try:each",
19-
"test:ember": "ember test",
18+
"test:ember-compatibility": "ember try:each",
19+
"test:ember": "ember test --test-port=0",
2020
"test:coverage": "COVERAGE=true ember test",
2121
"prepack": "ember ts:precompile",
2222
"postpack": "ember ts:clean",
@@ -33,6 +33,7 @@
3333
"@babel/eslint-parser": "^7.18.2",
3434
"@ember/optional-features": "2.0.0",
3535
"@ember/test-helpers": "2.8.0",
36+
"@embroider/test-setup": "^1.8.0",
3637
"@glimmer/component": "1.1.2",
3738
"@glimmer/tracking": "1.1.2",
3839
"@types/ember-qunit": "5.0.0",
@@ -75,7 +76,7 @@
7576
"ember-maybe-import-regenerator": "1.0.0",
7677
"ember-qunit": "5.1.5",
7778
"ember-resolver": "8.0.3",
78-
"ember-source": "^4.4.0",
79+
"ember-source": "~3.16",
7980
"ember-source-channel-url": "3.0.0",
8081
"ember-try": "2.0.0",
8182
"eslint": "^8.17.0",
@@ -97,4 +98,4 @@
9798
"ember-addon": {
9899
"configPath": "tests/dummy/config"
99100
}
100-
}
101+
}

0 commit comments

Comments
 (0)