Skip to content

Commit 6107ada

Browse files
author
Robert Jackson
authored
Merge pull request #858 from ember-fastboot/add-ember-try
2 parents 38e8b50 + e185b81 commit 6107ada

File tree

5 files changed

+137
-5
lines changed

5 files changed

+137
-5
lines changed

.github/workflows/ci.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,3 +115,33 @@ jobs:
115115
- name: Run Mocha Tests
116116
run: |
117117
yarn workspace ember-cli-fastboot test:mocha
118+
119+
try-scenarios:
120+
name: "ember-try for ember-cli-fastboot: ${{ matrix.ember-try-scenario }}"
121+
runs-on: ubuntu-latest
122+
timeout-minutes: 7
123+
124+
strategy:
125+
fail-fast: false
126+
matrix:
127+
ember-try-scenario:
128+
- ember-lts-3.16
129+
- ember-lts-3.20
130+
- ember-release
131+
- ember-beta
132+
- ember-canary
133+
- ember-default-with-jquery
134+
- ember-classic
135+
- embroider-safe
136+
- embroider-optimized
137+
- no-deprecations
138+
- ember-release-no-deprecations
139+
140+
steps:
141+
- uses: actions/checkout@v2
142+
- uses: actions/setup-node@v2
143+
with:
144+
node-version: 14
145+
- run: yarn install --ignore-engines --frozen-lockfile
146+
- name: test
147+
run: yarn workspace ember-cli-fastboot ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
'use strict';
2+
3+
const getChannelURL = require('ember-source-channel-url');
4+
const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
5+
6+
module.exports = async function () {
7+
return {
8+
useYarn: true,
9+
scenarios: [
10+
{
11+
name: 'ember-lts-3.16',
12+
npm: {
13+
devDependencies: {
14+
'ember-source': '~3.16.0',
15+
},
16+
},
17+
},
18+
{
19+
name: 'ember-lts-3.20',
20+
npm: {
21+
devDependencies: {
22+
'ember-source': '~3.20.5',
23+
},
24+
},
25+
},
26+
{
27+
name: 'ember-release',
28+
npm: {
29+
devDependencies: {
30+
'ember-source': await getChannelURL('release'),
31+
},
32+
},
33+
},
34+
{
35+
name: 'ember-beta',
36+
npm: {
37+
devDependencies: {
38+
'ember-source': await getChannelURL('beta'),
39+
},
40+
},
41+
},
42+
{
43+
name: 'ember-canary',
44+
npm: {
45+
devDependencies: {
46+
'ember-source': await getChannelURL('canary'),
47+
},
48+
},
49+
},
50+
{
51+
name: 'ember-default-with-jquery',
52+
env: {
53+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
54+
'jquery-integration': true,
55+
}),
56+
},
57+
npm: {
58+
devDependencies: {
59+
'@ember/jquery': '^1.1.0',
60+
},
61+
},
62+
},
63+
{
64+
name: 'ember-classic',
65+
env: {
66+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
67+
'application-template-wrapper': true,
68+
'default-async-observers': false,
69+
'template-only-glimmer-components': false,
70+
}),
71+
},
72+
npm: {
73+
ember: {
74+
edition: 'classic',
75+
},
76+
},
77+
},
78+
embroiderSafe(),
79+
embroiderOptimized(),
80+
{
81+
name: 'no-deprecations',
82+
npm: {
83+
devDependencies: {
84+
'ember-deprecation-error': '*',
85+
},
86+
},
87+
},
88+
{
89+
name: 'ember-release-no-deprecations',
90+
npm: {
91+
devDependencies: {
92+
'ember-source': await getChannelURL('release'),
93+
'ember-deprecation-error': '*',
94+
},
95+
},
96+
},
97+
],
98+
};
99+
};

packages/ember-cli-fastboot/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
"test": "npm-run-all lint test:*",
2626
"test:mocha": "node fix-node-modules.mjs && mocha && node fix-node-modules.mjs -r",
2727
"test:ember": "ember test",
28-
"test:precook": "node node_modules/ember-cli-addon-tests/scripts/precook-node-modules.js"
28+
"test:precook": "node node_modules/ember-cli-addon-tests/scripts/precook-node-modules.js",
29+
"test:ember-compatibility": "ember try:each"
2930
},
3031
"dependencies": {
3132
"broccoli-concat": "^3.7.1",
@@ -78,7 +79,9 @@
7879
"ember-resolver": "^8.0.2",
7980
"ember-sinon": "^2.2.0",
8081
"ember-source": "~3.26.1",
82+
"ember-source-channel-url": "^3.0.0",
8183
"ember-template-lint": "^3.2.0",
84+
"ember-try": "^1.4.0",
8285
"eslint": "^7.23.0",
8386
"eslint-config-prettier": "^8.1.0",
8487
"eslint-plugin-ember": "^10.3.0",

packages/ember-cli-fastboot/tests/dummy/app/templates/application.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
{{outlet}}
66

77
<div class="shoebox">
8-
{{model.key1.foo}}
9-
{{model.key2.zip}}
8+
{{this.model.key1.foo}}
9+
{{this.model.key2.zip}}
1010
</div>

packages/ember-cli-fastboot/tests/integration/instance-initializers/clear-double-boot-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ module('Instance-initializer: clear-double-boot', function(hooks) {
2929
`);
3030

3131
// render the whole tree dynamically to more closely mimc bad markup cases
32-
await render(hbs`{{{BAD_HTML}}}`);
32+
await render(hbs`{{{this.BAD_HTML}}}`);
3333

3434
clearHtml();
3535
assert.notOk(this.element.querySelector('#fastboot-body-start'), 'There is no start marker');
@@ -41,7 +41,7 @@ module('Instance-initializer: clear-double-boot', function(hooks) {
4141
this.set('BAD_HTML', `<script type="x/boundary" id="fastboot-body-start"></script>`);
4242

4343
// render the whole tree dynamically to more closely mimc bad markup cases
44-
await render(hbs`{{{BAD_HTML}}}`);
44+
await render(hbs`{{{this.BAD_HTML}}}`);
4545

4646
clearHtml();
4747

0 commit comments

Comments
 (0)