Skip to content

Commit cb408aa

Browse files
committed
remove new usage from tests
1 parent 20f08df commit cb408aa

File tree

13 files changed

+61
-100
lines changed

13 files changed

+61
-100
lines changed

packages/ember-runtime/tests/helpers/array.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ class CopyableNativeArray extends AbstractArrayHelper {
165165

166166
class CopyableArray extends AbstractArrayHelper {
167167
newObject() {
168-
return new CopyableObject();
168+
return CopyableObject.create();
169169
}
170170

171171
isEqual(a, b) {
@@ -274,15 +274,15 @@ const CopyableObject = EmberObject.extend(Copyable, {
274274
},
275275

276276
copy() {
277-
let ret = new CopyableObject();
277+
let ret = CopyableObject.create();
278278
set(ret, 'id', get(this, 'id'));
279279
return ret;
280280
},
281281
});
282282

283283
class MutableArrayHelpers extends NativeArrayHelpers {
284284
newObject(ary) {
285-
return new TestMutableArray(super.newObject(ary));
285+
return TestMutableArray.create(super.newObject(ary));
286286
}
287287

288288
// allows for testing of the basic enumerable after an internal mutation
@@ -293,7 +293,7 @@ class MutableArrayHelpers extends NativeArrayHelpers {
293293

294294
class EmberArrayHelpers extends MutableArrayHelpers {
295295
newObject(ary) {
296-
return new TestArray(super.newObject(ary));
296+
return TestArray.create(super.newObject(ary));
297297
}
298298
}
299299

packages/ember-runtime/tests/mixins/array_test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ moduleFor(
6363
}
6464

6565
['@test slice supports negative index arguments'](assert) {
66-
let testArray = new TestArray({ _content: [1, 2, 3, 4] });
66+
let testArray = TestArray.create({ _content: [1, 2, 3, 4] });
6767

6868
assert.deepEqual(testArray.slice(-2), [3, 4], 'slice(-2)');
6969
assert.deepEqual(testArray.slice(-2, -1), [3], 'slice(-2, -1');
@@ -248,7 +248,7 @@ moduleFor(
248248
'EmberArray.@each support',
249249
class extends AbstractTestCase {
250250
beforeEach() {
251-
ary = new TestArray({
251+
ary = TestArray.create({
252252
_content: [
253253
{ isDone: true, desc: 'Todo 1' },
254254
{ isDone: false, desc: 'Todo 2' },

packages/ember-runtime/tests/system/core_object_test.js

+20-24
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,31 @@ import { moduleFor, AbstractTestCase, buildOwner } from 'internal-test-helpers';
66
moduleFor(
77
'Ember.CoreObject',
88
class extends AbstractTestCase {
9-
['@test works with new (one arg)'](assert) {
10-
let obj = new CoreObject({
11-
firstName: 'Stef',
12-
lastName: 'Penner',
13-
});
14-
15-
assert.equal(obj.firstName, 'Stef');
16-
assert.equal(obj.lastName, 'Penner');
17-
}
18-
19-
['@test works with new (> 1 arg)'](assert) {
20-
let obj = new CoreObject(
21-
{
9+
['@test throws deprecation with new (one arg)']() {
10+
expectDeprecation(() => {
11+
new CoreObject({
2212
firstName: 'Stef',
2313
lastName: 'Penner',
24-
},
25-
{
26-
other: 'name',
27-
}
28-
);
29-
30-
assert.equal(obj.firstName, 'Stef');
31-
assert.equal(obj.lastName, 'Penner');
14+
});
15+
}, /using `new` with EmberObject has been deprecated/);
16+
}
3217

33-
assert.equal(obj.other, undefined); // doesn't support multiple pojo' to the constructor
18+
['@test throws deprecation with new (> 1 arg)']() {
19+
expectDeprecation(() => {
20+
new CoreObject(
21+
{
22+
firstName: 'Stef',
23+
lastName: 'Penner',
24+
},
25+
{
26+
other: 'name',
27+
}
28+
);
29+
}, /using `new` with EmberObject has been deprecated/);
3430
}
3531

3632
['@test toString should be not be added as a property when calling toString()'](assert) {
37-
let obj = new CoreObject({
33+
let obj = CoreObject.create({
3834
firstName: 'Foo',
3935
lastName: 'Bar',
4036
});
@@ -54,7 +50,7 @@ moduleFor(
5450
},
5551
}).create();
5652

57-
let obj = new CoreObject({
53+
let obj = CoreObject.create({
5854
someProxyishThing,
5955
});
6056

packages/ember-runtime/tests/system/object/computed_test.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ moduleFor(
2323
}),
2424
});
2525

26-
testWithDefault(assert, 'FOO', new MyClass(), 'foo');
26+
testWithDefault(assert, 'FOO', MyClass.create(), 'foo');
2727
}
2828

2929
['@test computed property on subclass'](assert) {
@@ -39,7 +39,7 @@ moduleFor(
3939
}),
4040
});
4141

42-
testWithDefault(assert, 'BAR', new Subclass(), 'foo');
42+
testWithDefault(assert, 'BAR', Subclass.create(), 'foo');
4343
}
4444

4545
['@test replacing computed property with regular val'](assert) {
@@ -53,7 +53,7 @@ moduleFor(
5353
foo: 'BAR',
5454
});
5555

56-
testWithDefault(assert, 'BAR', new Subclass(), 'foo');
56+
testWithDefault(assert, 'BAR', Subclass.create(), 'foo');
5757
}
5858

5959
['@test complex depndent keys'](assert) {
@@ -75,8 +75,8 @@ moduleFor(
7575
count: 20,
7676
});
7777

78-
let obj1 = new MyClass();
79-
let obj2 = new Subclass();
78+
let obj1 = MyClass.create();
79+
let obj2 = Subclass.create();
8080

8181
testWithDefault(assert, 'BIFF 1', obj1, 'foo');
8282
testWithDefault(assert, 'BIFF 21', obj2, 'foo');
@@ -121,7 +121,7 @@ moduleFor(
121121
}).property('bar2.baz'),
122122
});
123123

124-
let obj2 = new Subclass();
124+
let obj2 = Subclass.create();
125125

126126
testWithDefault(assert, 'BIFF2 1', obj2, 'foo');
127127

packages/ember-runtime/tests/system/object/destroy_test.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,13 @@ moduleFor(
124124
}),
125125
});
126126

127-
objs.a = new A();
127+
objs.a = A.create();
128128

129-
objs.b = new B();
129+
objs.b = B.create();
130130

131-
objs.c = new C();
131+
objs.c = C.create();
132132

133-
new LongLivedObject();
133+
LongLivedObject.create();
134134

135135
run(() => {
136136
let keys = Object.keys(objs);

packages/ember-runtime/tests/system/object/es-compatibility-test.js

+5-40
Original file line numberDiff line numberDiff line change
@@ -40,25 +40,6 @@ moduleFor(
4040
'passed-property',
4141
'passed property available on instance (create)'
4242
);
43-
calls = [];
44-
myObject = new MyObject({ passedProperty: 'passed-property' });
45-
46-
assert.deepEqual(calls, ['constructor', 'init'], 'constructor then init called (new)');
47-
assert.equal(
48-
myObject.postInitProperty,
49-
'post-init-property',
50-
'constructor property available on instance (new)'
51-
);
52-
assert.equal(
53-
myObject.initProperty,
54-
'init-property',
55-
'init property available on instance (new)'
56-
);
57-
assert.equal(
58-
myObject.passedProperty,
59-
'passed-property',
60-
'passed property available on instance (new)'
61-
);
6243
}
6344

6445
['@test normal method super'](assert) {
@@ -109,7 +90,7 @@ moduleFor(
10990

11091
[Foo, Bar, Baz, Qux, Quux, Corge].forEach((Class, index) => {
11192
calls = [];
112-
new Class().method();
93+
Class.create().method();
11394

11495
assert.deepEqual(
11596
calls,
@@ -192,22 +173,18 @@ moduleFor(
192173

193174
class MyObject extends EmberObject.extend(Mixin1, Mixin2) {}
194175

195-
let myObject = new MyObject();
176+
let myObject = MyObject.create();
196177
assert.equal(myObject.property1, 'data-1', 'includes the first mixin');
197178
assert.equal(myObject.property2, 'data-2', 'includes the second mixin');
198179
}
199180

200181
['@test using instanceof'](assert) {
201182
class MyObject extends EmberObject {}
202183

203-
let myObject1 = MyObject.create();
204-
let myObject2 = new MyObject();
184+
let myObject = MyObject.create();
205185

206-
assert.ok(myObject1 instanceof MyObject);
207-
assert.ok(myObject1 instanceof EmberObject);
208-
209-
assert.ok(myObject2 instanceof MyObject);
210-
assert.ok(myObject2 instanceof EmberObject);
186+
assert.ok(myObject instanceof MyObject);
187+
assert.ok(myObject instanceof EmberObject);
211188
}
212189

213190
['@test extending an ES subclass of EmberObject'](assert) {
@@ -229,10 +206,6 @@ moduleFor(
229206

230207
MyObject.create();
231208
assert.deepEqual(calls, ['constructor', 'init'], 'constructor then init called (create)');
232-
233-
calls = [];
234-
new MyObject();
235-
assert.deepEqual(calls, ['constructor', 'init'], 'constructor then init called (new)');
236209
}
237210

238211
['@test calling extend on an ES subclass of EmberObject'](assert) {
@@ -261,14 +234,6 @@ moduleFor(
261234
'constructor then init called (create)'
262235
);
263236

264-
calls = [];
265-
new MyObject();
266-
assert.deepEqual(
267-
calls,
268-
['before constructor', 'init', 'after constructor'],
269-
'constructor then init called (new)'
270-
);
271-
272237
let obj = MyObject.create({
273238
foo: 456,
274239
bar: 789,

packages/ember-runtime/tests/system/object/extend_test.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ moduleFor(
88
['@test Basic extend'](assert) {
99
let SomeClass = EmberObject.extend({ foo: 'BAR' });
1010
assert.ok(SomeClass.isClass, 'A class has isClass of true');
11-
let obj = new SomeClass();
11+
let obj = SomeClass.create();
1212
assert.equal(obj.foo, 'BAR');
1313
}
1414

1515
['@test Sub-subclass'](assert) {
1616
let SomeClass = EmberObject.extend({ foo: 'BAR' });
1717
let AnotherClass = SomeClass.extend({ bar: 'FOO' });
18-
let obj = new AnotherClass();
18+
let obj = AnotherClass.create();
1919
assert.equal(obj.foo, 'BAR');
2020
assert.equal(obj.bar, 'FOO');
2121
}
@@ -49,7 +49,7 @@ moduleFor(
4949
},
5050
});
5151

52-
let obj = new FinalClass();
52+
let obj = FinalClass.create();
5353
obj.foo();
5454
obj.bar();
5555
assert.equal(obj.fooCnt, 2, 'should invoke both');
@@ -76,9 +76,9 @@ moduleFor(
7676
});
7777
let AnotherClass = SomeClass.extend({ things: 'bar' });
7878
let YetAnotherClass = SomeClass.extend({ things: 'baz' });
79-
let some = new SomeClass();
80-
let another = new AnotherClass();
81-
let yetAnother = new YetAnotherClass();
79+
let some = SomeClass.create();
80+
let another = AnotherClass.create();
81+
let yetAnother = YetAnotherClass.create();
8282
assert.deepEqual(some.get('things'), ['foo'], 'base class should have just its value');
8383
assert.deepEqual(
8484
another.get('things'),
@@ -102,9 +102,9 @@ moduleFor(
102102
AnotherClass.reopenClass({ things: 'bar' });
103103
let YetAnotherClass = SomeClass.extend();
104104
YetAnotherClass.reopenClass({ things: 'baz' });
105-
let some = new SomeClass();
106-
let another = new AnotherClass();
107-
let yetAnother = new YetAnotherClass();
105+
let some = SomeClass.create();
106+
let another = AnotherClass.create();
107+
let yetAnother = YetAnotherClass.create();
108108
assert.deepEqual(
109109
get(some.constructor, 'things'),
110110
['foo'],

packages/ember-runtime/tests/system/object/observer_test.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ moduleFor(
1515
}),
1616
});
1717

18-
let obj = new MyClass();
18+
let obj = MyClass.create();
1919
assert.equal(get(obj, 'count'), 0, 'should not invoke observer immediately');
2020

2121
set(obj, 'bar', 'BAZ');
@@ -37,7 +37,7 @@ moduleFor(
3737
}),
3838
});
3939

40-
let obj = new Subclass();
40+
let obj = Subclass.create();
4141
assert.equal(get(obj, 'count'), 0, 'should not invoke observer immediately');
4242

4343
set(obj, 'bar', 'BAZ');
@@ -200,7 +200,7 @@ moduleFor(
200200
},
201201
});
202202

203-
let parent = new ParentClass();
203+
let parent = ParentClass.create();
204204

205205
assert.equal(changed, false, 'precond');
206206

packages/ember-runtime/tests/system/object/reopen_test.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ moduleFor(
1414
bar: 'BAR',
1515
});
1616

17-
assert.equal(new Subclass().foo(), 'FOO', 'Adds method');
18-
assert.equal(get(new Subclass(), 'bar'), 'BAR', 'Adds property');
17+
assert.equal(Subclass.create().foo(), 'FOO', 'Adds method');
18+
assert.equal(get(Subclass.create(), 'bar'), 'BAR', 'Adds property');
1919
}
2020

2121
['@test reopened properties inherited by subclasses'](assert) {
@@ -29,8 +29,8 @@ moduleFor(
2929
bar: 'BAR',
3030
});
3131

32-
assert.equal(new SubSub().foo(), 'FOO', 'Adds method');
33-
assert.equal(get(new SubSub(), 'bar'), 'BAR', 'Adds property');
32+
assert.equal(SubSub.create().foo(), 'FOO', 'Adds method');
33+
assert.equal(get(SubSub.create(), 'bar'), 'BAR', 'Adds property');
3434
}
3535

3636
['@test allows reopening already instantiated classes'](assert) {

packages/ember-testing/lib/setup_for_testing.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export default function setupForTesting() {
2929
let adapter = getAdapter();
3030
// if adapter is not manually set default to QUnit
3131
if (!adapter) {
32-
setAdapter(typeof self.QUnit === 'undefined' ? new Adapter() : new QUnitAdapter());
32+
setAdapter(typeof self.QUnit === 'undefined' ? Adapter.create() : QUnitAdapter.create());
3333
}
3434

3535
if (!jQueryDisabled) {

packages/ember-testing/tests/adapters/adapter_test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ moduleFor(
99
class extends AbstractTestCase {
1010
constructor() {
1111
super();
12-
adapter = new Adapter();
12+
adapter = Adapter.create();
1313
}
1414

1515
teardown() {

packages/ember-testing/tests/adapters/qunit_test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ moduleFor(
1515
delete QUnit.start;
1616
delete QUnit.stop;
1717

18-
adapter = new QUnitAdapter();
18+
adapter = QUnitAdapter.create();
1919
}
2020

2121
teardown() {

0 commit comments

Comments
 (0)