Skip to content

Commit 4713f36

Browse files
wagenetwagenet
committed
Update tests
1 parent 36017b7 commit 4713f36

File tree

10 files changed

+284
-152
lines changed

10 files changed

+284
-152
lines changed

‎packages/@ember/-internals/glimmer/tests/integration/components/append-test.js‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
import { moduleFor, RenderingTestCase, strip, runTask } from 'internal-test-helpers';
1+
import {
2+
moduleFor,
3+
RenderingTestCase,
4+
strip,
5+
runTask,
6+
expectDeprecation,
7+
} from 'internal-test-helpers';
28

39
import { set } from '@ember/object';
410

@@ -56,7 +62,9 @@ class AbstractAppendTest extends RenderingTestCase {
5662
}
5763
componentsByName[name] = this;
5864
pushHook('init');
59-
this.on('init', () => pushHook('on(init)'));
65+
expectDeprecation(() => {
66+
this.on('init', () => pushHook('on(init)'));
67+
}, /`on` is deprecated/);
6068
}
6169

6270
didReceiveAttrs() {
@@ -299,7 +307,9 @@ class AbstractAppendTest extends RenderingTestCase {
299307
}
300308
componentsByName[name] = this;
301309
pushHook('init');
302-
this.on('init', () => pushHook('on(init)'));
310+
expectDeprecation(() => {
311+
this.on('init', () => pushHook('on(init)'));
312+
}, /`on` is deprecated/);
303313
}
304314

305315
didReceiveAttrs() {

‎packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js‎

Lines changed: 38 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
equalsElement,
88
runTask,
99
runLoopSettled,
10+
expectDeprecation,
1011
} from 'internal-test-helpers';
1112

1213
import { action } from '@ember/object';
@@ -3162,45 +3163,49 @@ moduleFor(
31623163
['@test triggering an event only attempts to invoke an identically named method, if it actually is a function (GH#15228)'](
31633164
assert
31643165
) {
3165-
assert.expect(3);
3166+
assert.expect(5);
31663167

31673168
let payload = ['arbitrary', 'event', 'data'];
31683169

3169-
this.registerComponent('evented-component', {
3170-
ComponentClass: Component.extend({
3171-
someTruthyProperty: true,
3172-
3173-
init() {
3174-
this._super(...arguments);
3175-
this.trigger('someMethod', ...payload);
3176-
this.trigger('someTruthyProperty', ...payload);
3177-
},
3178-
3179-
someMethod(...data) {
3180-
assert.deepEqual(
3181-
data,
3182-
payload,
3183-
'the method `someMethod` should be called, when `someMethod` is triggered'
3184-
);
3185-
},
3170+
expectDeprecation(() => {
3171+
this.registerComponent('evented-component', {
3172+
ComponentClass: Component.extend({
3173+
someTruthyProperty: true,
3174+
3175+
init() {
3176+
this._super(...arguments);
3177+
expectDeprecation(() => {
3178+
this.trigger('someMethod', ...payload);
3179+
this.trigger('someTruthyProperty', ...payload);
3180+
}, /`trigger` is deprecated/);
3181+
},
31863182

3187-
listenerForSomeMethod: on('someMethod', function (...data) {
3188-
assert.deepEqual(
3189-
data,
3190-
payload,
3191-
'the listener `listenerForSomeMethod` should be called, when `someMethod` is triggered'
3192-
);
3193-
}),
3183+
someMethod(...data) {
3184+
assert.deepEqual(
3185+
data,
3186+
payload,
3187+
'the method `someMethod` should be called, when `someMethod` is triggered'
3188+
);
3189+
},
31943190

3195-
listenerForSomeTruthyProperty: on('someTruthyProperty', function (...data) {
3196-
assert.deepEqual(
3197-
data,
3198-
payload,
3199-
'the listener `listenerForSomeTruthyProperty` should be called, when `someTruthyProperty` is triggered'
3200-
);
3191+
listenerForSomeMethod: on('someMethod', function (...data) {
3192+
assert.deepEqual(
3193+
data,
3194+
payload,
3195+
'the listener `listenerForSomeMethod` should be called, when `someMethod` is triggered'
3196+
);
3197+
}),
3198+
3199+
listenerForSomeTruthyProperty: on('someTruthyProperty', function (...data) {
3200+
assert.deepEqual(
3201+
data,
3202+
payload,
3203+
'the listener `listenerForSomeTruthyProperty` should be called, when `someTruthyProperty` is triggered'
3204+
);
3205+
}),
32013206
}),
3202-
}),
3203-
});
3207+
});
3208+
}, /`on` is deprecated/);
32043209

32053210
this.render(`{{evented-component}}`);
32063211
}

‎packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1-
import { classes, moduleFor, RenderingTestCase, runTask, strip } from 'internal-test-helpers';
1+
import {
2+
classes,
3+
expectDeprecation,
4+
moduleFor,
5+
RenderingTestCase,
6+
runTask,
7+
strip,
8+
} from 'internal-test-helpers';
29

310
import { schedule } from '@ember/runloop';
411
import { set, setProperties } from '@ember/object';
512
import { A as emberA } from '@ember/array';
613
import { getViewElement, getViewId } from '@ember/-internals/views';
714

815
import { Component } from '../../utils/helpers';
16+
import { addListener } from '@ember/-internals/metal';
917

1018
class LifeCycleHooksTest extends RenderingTestCase {
1119
constructor() {
@@ -174,7 +182,7 @@ class LifeCycleHooksTest extends RenderingTestCase {
174182
assertNoElement('init', this);
175183
assertState('init', 'preRender', this);
176184

177-
this.on('init', () => pushHook('on(init)'));
185+
addListener(this, 'init', () => pushHook('on(init)'));
178186

179187
schedule('afterRender', () => {
180188
this.isInitialRender = false;

‎packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
1+
import { expectDeprecation, moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
22

33
import { Component } from '../utils/helpers';
44
import { _getCurrentRunLoop } from '@ember/runloop';
@@ -159,7 +159,9 @@ moduleFor(
159159
init() {
160160
super.init();
161161
Object.keys(SUPPORTED_EMBER_EVENTS).forEach((browserEvent) => {
162-
this.on(SUPPORTED_EMBER_EVENTS[browserEvent], (event) => (receivedEvent = event));
162+
expectDeprecation(() => {
163+
this.on(SUPPORTED_EMBER_EVENTS[browserEvent], (event) => (receivedEvent = event));
164+
}, /`on` is deprecated/);
163165
});
164166
}
165167
},

‎packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
import { moduleFor, RenderingTestCase, applyMixins, strip, runTask } from 'internal-test-helpers';
1+
import {
2+
moduleFor,
3+
RenderingTestCase,
4+
applyMixins,
5+
strip,
6+
runTask,
7+
expectDeprecation,
8+
} from 'internal-test-helpers';
29

310
import { notifyPropertyChange, on } from '@ember/-internals/metal';
411
import { get, set, computed } from '@ember/object';
@@ -1121,11 +1128,14 @@ moduleFor(
11211128
class extends EachTest {
11221129
createList(items) {
11231130
let wrapped = emberA(items);
1124-
let proxy = ArrayProxy.extend({
1125-
setup: on('init', function () {
1126-
this.set('content', emberA(wrapped));
1127-
}),
1128-
}).create();
1131+
let proxy;
1132+
expectDeprecation(() => {
1133+
proxy = ArrayProxy.extend({
1134+
setup: on('init', function () {
1135+
this.set('content', emberA(wrapped));
1136+
}),
1137+
}).create();
1138+
}, /`on` is deprecated/);
11291139

11301140
return { list: proxy, delegate: wrapped };
11311141
}

‎packages/@ember/-internals/metal/tests/events_test.js‎

Lines changed: 40 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { on, addListener, removeListener, sendEvent, hasListeners } from '..';
22
import Mixin from '@ember/object/mixin';
3-
import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
3+
import { moduleFor, AbstractTestCase, expectDeprecation } from 'internal-test-helpers';
44

55
moduleFor(
66
'system/props/events_test',
@@ -141,15 +141,18 @@ moduleFor(
141141

142142
['@test a listener can be added as part of a mixin'](assert) {
143143
let triggered = 0;
144-
let MyMixin = Mixin.create({
145-
foo1: on('bar', function () {
146-
triggered++;
147-
}),
148-
149-
foo2: on('bar', function () {
150-
triggered++;
151-
}),
152-
});
144+
let MyMixin;
145+
expectDeprecation(() => {
146+
MyMixin = Mixin.create({
147+
foo1: on('bar', function () {
148+
triggered++;
149+
}),
150+
151+
foo2: on('bar', function () {
152+
triggered++;
153+
}),
154+
});
155+
}, /`on` is deprecated/);
153156

154157
let obj = {};
155158
MyMixin.apply(obj);
@@ -160,30 +163,41 @@ moduleFor(
160163

161164
[`@test 'on' asserts for invalid arguments`]() {
162165
expectAssertion(() => {
163-
Mixin.create({
164-
foo1: on('bar'),
165-
});
166+
expectDeprecation(() => {
167+
Mixin.create({
168+
foo1: on('bar'),
169+
});
170+
}, /`on` is deprecated/);
166171
}, 'on expects function as last argument');
167172

168173
expectAssertion(() => {
169-
Mixin.create({
170-
foo1: on(function () {}),
171-
});
174+
expectDeprecation(() => {
175+
Mixin.create({
176+
foo1: on(function () {}),
177+
});
178+
}, /`on` is deprecated/);
172179
}, 'on called without valid event names');
173180
}
174181

175182
['@test a listener added as part of a mixin may be overridden'](assert) {
176183
let triggered = 0;
177-
let FirstMixin = Mixin.create({
178-
foo: on('bar', function () {
179-
triggered++;
180-
}),
181-
});
182-
let SecondMixin = Mixin.create({
183-
foo: on('baz', function () {
184-
triggered++;
185-
}),
186-
});
184+
let FirstMixin;
185+
expectDeprecation(() => {
186+
FirstMixin = Mixin.create({
187+
foo: on('bar', function () {
188+
triggered++;
189+
}),
190+
});
191+
}, /`on` is deprecated/);
192+
193+
let SecondMixin;
194+
expectDeprecation(() => {
195+
SecondMixin = Mixin.create({
196+
foo: on('baz', function () {
197+
triggered++;
198+
}),
199+
});
200+
}, /`on` is deprecated/);
187201

188202
let obj = {};
189203
FirstMixin.apply(obj);

‎packages/@ember/object/tests/es-compatibility-test.js‎

Lines changed: 35 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,12 @@ import {
99
sendEvent,
1010
} from '@ember/-internals/metal';
1111
import Mixin from '@ember/object/mixin';
12-
import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
12+
import {
13+
moduleFor,
14+
AbstractTestCase,
15+
runLoopSettled,
16+
expectDeprecation,
17+
} from 'internal-test-helpers';
1318

1419
moduleFor(
1520
'EmberObject ES Compatibility',
@@ -283,30 +288,35 @@ moduleFor(
283288
let someEventBase = 0;
284289
let someEventA = 0;
285290
let someEventB = 0;
286-
class A extends EmberObject.extend({
287-
fooDidChange: observer('foo', function () {
288-
fooDidChangeBase++;
289-
}),
290-
291-
onSomeEvent: on('someEvent', function () {
292-
someEventBase++;
293-
}),
294-
}) {
295-
init() {
296-
super.init();
297-
this.foo = 'bar';
298-
}
299-
300-
fooDidChange() {
301-
super.fooDidChange();
302-
fooDidChangeA++;
303-
}
304-
305-
onSomeEvent() {
306-
super.onSomeEvent();
307-
someEventA++;
308-
}
309-
}
291+
let A;
292+
expectDeprecation(() => {
293+
A = class extends (
294+
EmberObject.extend({
295+
fooDidChange: observer('foo', function () {
296+
fooDidChangeBase++;
297+
}),
298+
299+
onSomeEvent: on('someEvent', function () {
300+
someEventBase++;
301+
}),
302+
})
303+
) {
304+
init() {
305+
super.init();
306+
this.foo = 'bar';
307+
}
308+
309+
fooDidChange() {
310+
super.fooDidChange();
311+
fooDidChangeA++;
312+
}
313+
314+
onSomeEvent() {
315+
super.onSomeEvent();
316+
someEventA++;
317+
}
318+
};
319+
}, /`on` is deprecated/);
310320

311321
class B extends A {
312322
fooDidChange() {

0 commit comments

Comments
 (0)