Skip to content

Commit 316e2c3

Browse files
rwjbluerwjblue
committed
Remove guards for supporting older Ember versions
1 parent 2891a98 commit 316e2c3

28 files changed

+217
-519
lines changed

‎addon-test-support/@ember/test-helpers/-internal/render-settled.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ if (macroCondition(dependencySatisfies('ember-source', '>=4.5.0-beta.1'))) {
1515
//@ts-ignore
1616
renderSettled = importSync('@ember/-internals/glimmer').renderSettled;
1717
} else {
18-
throw new Error('Using an unsupported version of Ember (@ember/test-helpers@3.0.0+ requires Ember 4 or higher)');
18+
throw new Error(
19+
'Using an unsupported version of Ember (@ember/test-helpers@3.0.0+ requires Ember 4 or higher)'
20+
);
1921
}
2022

2123
export default renderSettled;

‎addon-test-support/@ember/test-helpers/setup-rendering-context.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ import { assert } from '@ember/debug';
1717
import { runHooks } from './-internal/helper-hooks';
1818
import { ComponentRenderMap, SetUsage } from './setup-context';
1919
import { ensureSafeComponent } from '@embroider/util';
20-
import type { ComponentInstance, InternalComponentManager } from '@glimmer/interfaces';
20+
import type {
21+
ComponentInstance,
22+
InternalComponentManager,
23+
} from '@glimmer/interfaces';
2124
import { getInternalComponentManager } from '@glimmer/manager';
2225

2326
const OUTLET_TEMPLATE = hbs`{{outlet}}`;
@@ -152,8 +155,8 @@ export function render(
152155
if (setCalls !== undefined) {
153156
assert(
154157
`You cannot call \`this.set\` or \`this.setProperties\` when passing a component to \`render\`, but they were called for the following properties:\n${setCalls
155-
.map((key) => ` - ${key}`)
156-
.join('\n')}`
158+
.map((key) => ` - ${key}`)
159+
.join('\n')}`
157160
);
158161
}
159162

‎tests/integration/dom/scroll-to-test.js

-5
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,13 @@ import {
77
setupRenderingContext,
88
teardownContext,
99
} from '@ember/test-helpers';
10-
import hasEmberVersion from '@ember/test-helpers/has-ember-version';
1110
import {
1211
buildExpectedSteps,
1312
registerHooks,
1413
unregisterHooks,
1514
} from '../../helpers/register-hooks';
1615

1716
module('DOM Helper: scroll-to', function (hooks) {
18-
if (!hasEmberVersion(2, 4)) {
19-
return;
20-
}
21-
2217
hooks.beforeEach(async function () {
2318
await setupContext(this);
2419
await setupRenderingContext(this);

‎tests/integration/rerender-test.js

-5
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,8 @@ import GlimmerComponent from '@glimmer/component';
1616
import { tracked } from '@glimmer/tracking';
1717
import { hbs } from 'ember-cli-htmlbars';
1818
import { module, test } from 'qunit';
19-
import hasEmberVersion from '@ember/test-helpers/has-ember-version';
2019

2120
module('rerender real-world', function (hooks) {
22-
// this test requires Ember 3.25 in order to use lexically scoped values in templates
23-
if (!hasEmberVersion(3, 25)) {
24-
return;
25-
}
2621
hooks.beforeEach(async function () {
2722
await setupContext(this);
2823
await setupRenderingContext(this);

‎tests/integration/settled-test.js

-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import {
1212
render,
1313
rerender,
1414
} from '@ember/test-helpers';
15-
import hasEmberVersion from '@ember/test-helpers/has-ember-version';
1615
import { module, test } from 'qunit';
1716
import { hbs } from 'ember-cli-htmlbars';
1817
import Pretender from 'pretender';
@@ -119,10 +118,6 @@ const TestComponent5 = Component.extend({
119118
});
120119

121120
module('settled real-world scenarios', function (hooks) {
122-
if (!hasEmberVersion(2, 4)) {
123-
return;
124-
}
125-
126121
hooks.beforeEach(async function () {
127122
await setupContext(this);
128123
await setupRenderingContext(this);

‎tests/integration/setup-rendering-context-test.js

+38-43
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import {
1515
} from '@ember/test-helpers';
1616
import templateOnly from '@ember/component/template-only';
1717

18-
import hasEmberVersion from '@ember/test-helpers/has-ember-version';
1918
import { setResolverRegistry } from '../helpers/resolver';
2019
import { hbs } from 'ember-cli-htmlbars';
2120
import { precompileTemplate } from '@ember/template-compilation';
@@ -143,60 +142,56 @@ module('setupRenderingContext "real world"', function (hooks) {
143142
});
144143

145144
module('lexical scope access', function () {
146-
if (hasEmberVersion(3, 28)) {
147-
test('can render components passed as locals', async function (assert) {
148-
let add = helper(function ([first, second]) {
149-
return first + second;
150-
});
151-
152-
await render(
153-
precompileTemplate('{{add 1 3}}', {
154-
scope() {
155-
return { add };
156-
},
157-
})
158-
);
159-
160-
assert.equal(this.element.textContent, '4');
145+
test('can render components passed as locals', async function (assert) {
146+
let add = helper(function ([first, second]) {
147+
return first + second;
161148
});
162-
}
149+
150+
await render(
151+
precompileTemplate('{{add 1 3}}', {
152+
scope() {
153+
return { add };
154+
},
155+
})
156+
);
157+
158+
assert.equal(this.element.textContent, '4');
159+
});
163160
});
164161

165162
module('render with a component', function () {
166-
if (hasEmberVersion(3, 25)) {
167-
test('can render locally defined components', async function (assert) {
168-
class MyComponent extends GlimmerComponent {}
163+
test('can render locally defined components', async function (assert) {
164+
class MyComponent extends GlimmerComponent {}
169165

170-
setComponentTemplate(hbs`my name is {{@name}}`, MyComponent);
166+
setComponentTemplate(hbs`my name is {{@name}}`, MyComponent);
171167

172-
const somePerson = new (class {
173-
@tracked name = 'Zoey';
174-
})();
168+
const somePerson = new (class {
169+
@tracked name = 'Zoey';
170+
})();
175171

176-
const template = precompileTemplate(
177-
'<MyComponent @name={{somePerson.name}} />',
178-
{
179-
scope() {
180-
return {
181-
somePerson,
182-
MyComponent,
183-
};
184-
},
185-
}
186-
);
172+
const template = precompileTemplate(
173+
'<MyComponent @name={{somePerson.name}} />',
174+
{
175+
scope() {
176+
return {
177+
somePerson,
178+
MyComponent,
179+
};
180+
},
181+
}
182+
);
187183

188-
const component = setComponentTemplate(template, templateOnly());
184+
const component = setComponentTemplate(template, templateOnly());
189185

190-
await render(component);
186+
await render(component);
191187

192-
assert.equal(this.element.textContent, 'my name is Zoey');
188+
assert.equal(this.element.textContent, 'my name is Zoey');
193189

194-
somePerson.name = 'Tomster';
190+
somePerson.name = 'Tomster';
195191

196-
await rerender();
192+
await rerender();
197193

198-
assert.equal(this.element.textContent, 'my name is Tomster');
199-
});
200-
}
194+
assert.equal(this.element.textContent, 'my name is Tomster');
195+
});
201196
});
202197
});

‎tests/unit/dom/blur-test.js

-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import {
88
} from '@ember/test-helpers';
99
import { buildInstrumentedElement, insertElement } from '../../helpers/events';
1010
import { isIE11, isEdge } from '../../helpers/browser-detect';
11-
import hasEmberVersion from '@ember/test-helpers/has-ember-version';
1211

1312
let focusSteps = ['focus', 'focusin'];
1413
let blurSteps = ['blur', 'focusout'];
@@ -21,10 +20,6 @@ if (isIE11) {
2120
}
2221

2322
module('DOM Helper: blur', function (hooks) {
24-
if (!hasEmberVersion(2, 4)) {
25-
return;
26-
}
27-
2823
let context, elementWithFocus;
2924

3025
hooks.beforeEach(async function (assert) {

‎tests/unit/dom/click-test.js

-5
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,13 @@ import {
66
insertElement,
77
} from '../../helpers/events';
88
import { isIE11 } from '../../helpers/browser-detect';
9-
import hasEmberVersion from '@ember/test-helpers/has-ember-version';
109
import {
1110
registerHooks,
1211
unregisterHooks,
1312
buildExpectedSteps,
1413
} from '../../helpers/register-hooks';
1514

1615
module('DOM Helper: click', function (hooks) {
17-
if (!hasEmberVersion(2, 4)) {
18-
return;
19-
}
20-
2116
let context, element;
2217

2318
hooks.beforeEach(function () {

‎tests/unit/dom/double-click-test.js

-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {
1010
insertElement,
1111
} from '../../helpers/events';
1212
import { isIE11 } from '../../helpers/browser-detect';
13-
import hasEmberVersion from '@ember/test-helpers/has-ember-version';
1413
import {
1514
registerHooks,
1615
unregisterHooks,
@@ -28,10 +27,6 @@ const expectedEvents = [
2827
];
2928

3029
module('DOM Helper: doubleClick', function (hooks) {
31-
if (!hasEmberVersion(2, 4)) {
32-
return;
33-
}
34-
3530
let context, element;
3631

3732
hooks.beforeEach(function () {

‎tests/unit/dom/fill-in-test.js

-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { module, test } from 'qunit';
22
import { fillIn, setupContext, teardownContext } from '@ember/test-helpers';
33
import { buildInstrumentedElement, insertElement } from '../../helpers/events';
44
import { isIE11, isFirefox } from '../../helpers/browser-detect';
5-
import hasEmberVersion from '@ember/test-helpers/has-ember-version';
65
import {
76
registerHooks,
87
unregisterHooks,
@@ -18,10 +17,6 @@ if (isIE11) {
1817
}
1918

2019
module('DOM Helper: fillIn', function (hooks) {
21-
if (!hasEmberVersion(2, 4)) {
22-
return;
23-
}
24-
2520
let context, element;
2621

2722
hooks.beforeEach(function () {

‎tests/unit/dom/find-all-test.js

-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
import { module, test } from 'qunit';
22
import { findAll, setupContext, teardownContext } from '@ember/test-helpers';
3-
import hasEmberVersion from '@ember/test-helpers/has-ember-version';
43

54
module('DOM Helper: findAll', function (hooks) {
6-
if (!hasEmberVersion(2, 4)) {
7-
return;
8-
}
9-
105
let context, element1, element2;
116

127
hooks.beforeEach(function () {

‎tests/unit/dom/find-test.js

-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
import { module, test } from 'qunit';
22
import { find, setupContext, teardownContext } from '@ember/test-helpers';
3-
import hasEmberVersion from '@ember/test-helpers/has-ember-version';
43

54
module('DOM Helper: find', function (hooks) {
6-
if (!hasEmberVersion(2, 4)) {
7-
return;
8-
}
9-
105
let context, element;
116

127
hooks.beforeEach(function () {

‎tests/unit/dom/focus-test.js

-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import {
1111
instrumentElement,
1212
} from '../../helpers/events';
1313
import { isIE11, isEdge } from '../../helpers/browser-detect';
14-
import hasEmberVersion from '@ember/test-helpers/has-ember-version';
1514

1615
let focusSteps = ['focus', 'focusin'];
1716
let blurSteps = ['blur', 'focusout'];
@@ -24,10 +23,6 @@ if (isIE11) {
2423
}
2524

2625
module('DOM Helper: focus', function (hooks) {
27-
if (!hasEmberVersion(2, 4)) {
28-
return;
29-
}
30-
3126
let context, element;
3227

3328
hooks.beforeEach(function () {

‎tests/unit/dom/get-root-element-test.js

-5
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,8 @@ import {
44
setupContext,
55
teardownContext,
66
} from '@ember/test-helpers';
7-
import hasEmberVersion from '@ember/test-helpers/has-ember-version';
87

98
module('DOM Helper: getRootElement', function (hooks) {
10-
if (!hasEmberVersion(2, 4)) {
11-
return;
12-
}
13-
149
let context;
1510

1611
hooks.beforeEach(function () {

‎tests/unit/dom/logging-test.js

-5
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,10 @@ import {
66
setupRenderingContext,
77
teardownContext,
88
} from '@ember/test-helpers';
9-
import hasEmberVersion from '@ember/test-helpers/has-ember-version';
109
import { elementToString } from '@ember/test-helpers/dom/-logging';
1110
import { hbs } from 'ember-cli-htmlbars';
1211

1312
module('elementToString()', function (hooks) {
14-
if (!hasEmberVersion(2, 4)) {
15-
return;
16-
}
17-
1813
hooks.beforeEach(async function () {
1914
await setupContext(this);
2015
await setupRenderingContext(this);

‎tests/unit/dom/select-files-test.js

-5
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,8 @@ import {
55
teardownContext,
66
} from '@ember/test-helpers';
77
import { buildInstrumentedElement } from '../../helpers/events';
8-
import hasEmberVersion from '@ember/test-helpers/has-ember-version';
98

109
module('DOM Helper: selectFiles', function (hooks) {
11-
if (!hasEmberVersion(2, 4)) {
12-
return;
13-
}
14-
1510
let context, element;
1611

1712
const textFile = new Blob(['Hello World'], { type: 'text/plain' });

‎tests/unit/dom/tab-test.js

-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import {
1111
instrumentElement,
1212
} from '../../helpers/events';
1313
import { isIE11, isEdge } from '../../helpers/browser-detect';
14-
import hasEmberVersion from '@ember/test-helpers/has-ember-version';
1514

1615
let _focusSteps = ['focus', 'focusin'];
1716
let _blurSteps = isEdge ? ['focusout', 'blur'] : ['blur', 'focusout'];
@@ -34,10 +33,6 @@ function moveFocus(from, to) {
3433
}
3534

3635
module('DOM Helper: tab', function (hooks) {
37-
if (!hasEmberVersion(2, 4)) {
38-
return;
39-
}
40-
4136
if (isIE11) {
4237
return;
4338
}

‎tests/unit/dom/tap-test.js

-5
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@ import { module, test } from 'qunit';
22
import { tap, setupContext, teardownContext } from '@ember/test-helpers';
33
import { buildInstrumentedElement, insertElement } from '../../helpers/events';
44
import { isIE11 } from '../../helpers/browser-detect';
5-
import hasEmberVersion from '@ember/test-helpers/has-ember-version';
65
import {
76
registerHooks,
87
unregisterHooks,
98
buildExpectedSteps,
109
} from '../../helpers/register-hooks';
1110

1211
module('DOM Helper: tap', function (hooks) {
13-
if (!hasEmberVersion(2, 4)) {
14-
return;
15-
}
16-
1712
let context, element;
1813

1914
hooks.beforeEach(function () {

0 commit comments

Comments
 (0)