Skip to content

Commit

Permalink
remove new usage from tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@pzuraq
pzuraq committed Jul 10, 2018
1 parent 20f08df commit cb408aa
Show file tree
Hide file tree
Showing 13 changed files with 61 additions and 100 deletions.
8 changes: 4 additions & 4 deletions packages/ember-runtime/tests/helpers/array.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ class CopyableNativeArray extends AbstractArrayHelper {

class CopyableArray extends AbstractArrayHelper {
newObject() {
return new CopyableObject();
return CopyableObject.create();
}

isEqual(a, b) {
Expand Down Expand Up @@ -274,15 +274,15 @@ const CopyableObject = EmberObject.extend(Copyable, {
},

copy() {
let ret = new CopyableObject();
let ret = CopyableObject.create();
set(ret, 'id', get(this, 'id'));
return ret;
},
});

class MutableArrayHelpers extends NativeArrayHelpers {
newObject(ary) {
return new TestMutableArray(super.newObject(ary));
return TestMutableArray.create(super.newObject(ary));
}

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

class EmberArrayHelpers extends MutableArrayHelpers {
newObject(ary) {
return new TestArray(super.newObject(ary));
return TestArray.create(super.newObject(ary));
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/ember-runtime/tests/mixins/array_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ moduleFor(
}

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

assert.deepEqual(testArray.slice(-2), [3, 4], 'slice(-2)');
assert.deepEqual(testArray.slice(-2, -1), [3], 'slice(-2, -1');
Expand Down Expand Up @@ -248,7 +248,7 @@ moduleFor(
'EmberArray.@each support',
class extends AbstractTestCase {
beforeEach() {
ary = new TestArray({
ary = TestArray.create({
_content: [
{ isDone: true, desc: 'Todo 1' },
{ isDone: false, desc: 'Todo 2' },
Expand Down
44 changes: 20 additions & 24 deletions packages/ember-runtime/tests/system/core_object_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,31 @@ import { moduleFor, AbstractTestCase, buildOwner } from 'internal-test-helpers';
moduleFor(
'Ember.CoreObject',
class extends AbstractTestCase {
['@test works with new (one arg)'](assert) {
let obj = new CoreObject({
firstName: 'Stef',
lastName: 'Penner',
});

assert.equal(obj.firstName, 'Stef');
assert.equal(obj.lastName, 'Penner');
}

['@test works with new (> 1 arg)'](assert) {
let obj = new CoreObject(
{
['@test throws deprecation with new (one arg)']() {
expectDeprecation(() => {
new CoreObject({
firstName: 'Stef',
lastName: 'Penner',
},
{
other: 'name',
}
);

assert.equal(obj.firstName, 'Stef');
assert.equal(obj.lastName, 'Penner');
});
}, /using `new` with EmberObject has been deprecated/);
}

assert.equal(obj.other, undefined); // doesn't support multiple pojo' to the constructor
['@test throws deprecation with new (> 1 arg)']() {
expectDeprecation(() => {
new CoreObject(
{
firstName: 'Stef',
lastName: 'Penner',
},
{
other: 'name',
}
);
}, /using `new` with EmberObject has been deprecated/);
}

['@test toString should be not be added as a property when calling toString()'](assert) {
let obj = new CoreObject({
let obj = CoreObject.create({
firstName: 'Foo',
lastName: 'Bar',
});
Expand All @@ -54,7 +50,7 @@ moduleFor(
},
}).create();

let obj = new CoreObject({
let obj = CoreObject.create({
someProxyishThing,
});

Expand Down
12 changes: 6 additions & 6 deletions packages/ember-runtime/tests/system/object/computed_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ moduleFor(
}),
});

testWithDefault(assert, 'FOO', new MyClass(), 'foo');
testWithDefault(assert, 'FOO', MyClass.create(), 'foo');
}

['@test computed property on subclass'](assert) {
Expand All @@ -39,7 +39,7 @@ moduleFor(
}),
});

testWithDefault(assert, 'BAR', new Subclass(), 'foo');
testWithDefault(assert, 'BAR', Subclass.create(), 'foo');
}

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

testWithDefault(assert, 'BAR', new Subclass(), 'foo');
testWithDefault(assert, 'BAR', Subclass.create(), 'foo');
}

['@test complex depndent keys'](assert) {
Expand All @@ -75,8 +75,8 @@ moduleFor(
count: 20,
});

let obj1 = new MyClass();
let obj2 = new Subclass();
let obj1 = MyClass.create();
let obj2 = Subclass.create();

testWithDefault(assert, 'BIFF 1', obj1, 'foo');
testWithDefault(assert, 'BIFF 21', obj2, 'foo');
Expand Down Expand Up @@ -121,7 +121,7 @@ moduleFor(
}).property('bar2.baz'),
});

let obj2 = new Subclass();
let obj2 = Subclass.create();

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

Expand Down
8 changes: 4 additions & 4 deletions packages/ember-runtime/tests/system/object/destroy_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,13 @@ moduleFor(
}),
});

objs.a = new A();
objs.a = A.create();

objs.b = new B();
objs.b = B.create();

objs.c = new C();
objs.c = C.create();

new LongLivedObject();
LongLivedObject.create();

run(() => {
let keys = Object.keys(objs);
Expand Down
45 changes: 5 additions & 40 deletions packages/ember-runtime/tests/system/object/es-compatibility-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,25 +40,6 @@ moduleFor(
'passed-property',
'passed property available on instance (create)'
);
calls = [];
myObject = new MyObject({ passedProperty: 'passed-property' });

assert.deepEqual(calls, ['constructor', 'init'], 'constructor then init called (new)');
assert.equal(
myObject.postInitProperty,
'post-init-property',
'constructor property available on instance (new)'
);
assert.equal(
myObject.initProperty,
'init-property',
'init property available on instance (new)'
);
assert.equal(
myObject.passedProperty,
'passed-property',
'passed property available on instance (new)'
);
}

['@test normal method super'](assert) {
Expand Down Expand Up @@ -109,7 +90,7 @@ moduleFor(

[Foo, Bar, Baz, Qux, Quux, Corge].forEach((Class, index) => {
calls = [];
new Class().method();
Class.create().method();

assert.deepEqual(
calls,
Expand Down Expand Up @@ -192,22 +173,18 @@ moduleFor(

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

let myObject = new MyObject();
let myObject = MyObject.create();
assert.equal(myObject.property1, 'data-1', 'includes the first mixin');
assert.equal(myObject.property2, 'data-2', 'includes the second mixin');
}

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

let myObject1 = MyObject.create();
let myObject2 = new MyObject();
let myObject = MyObject.create();

assert.ok(myObject1 instanceof MyObject);
assert.ok(myObject1 instanceof EmberObject);

assert.ok(myObject2 instanceof MyObject);
assert.ok(myObject2 instanceof EmberObject);
assert.ok(myObject instanceof MyObject);
assert.ok(myObject instanceof EmberObject);
}

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

MyObject.create();
assert.deepEqual(calls, ['constructor', 'init'], 'constructor then init called (create)');

calls = [];
new MyObject();
assert.deepEqual(calls, ['constructor', 'init'], 'constructor then init called (new)');
}

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

calls = [];
new MyObject();
assert.deepEqual(
calls,
['before constructor', 'init', 'after constructor'],
'constructor then init called (new)'
);

let obj = MyObject.create({
foo: 456,
bar: 789,
Expand Down
18 changes: 9 additions & 9 deletions packages/ember-runtime/tests/system/object/extend_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ moduleFor(
['@test Basic extend'](assert) {
let SomeClass = EmberObject.extend({ foo: 'BAR' });
assert.ok(SomeClass.isClass, 'A class has isClass of true');
let obj = new SomeClass();
let obj = SomeClass.create();
assert.equal(obj.foo, 'BAR');
}

['@test Sub-subclass'](assert) {
let SomeClass = EmberObject.extend({ foo: 'BAR' });
let AnotherClass = SomeClass.extend({ bar: 'FOO' });
let obj = new AnotherClass();
let obj = AnotherClass.create();
assert.equal(obj.foo, 'BAR');
assert.equal(obj.bar, 'FOO');
}
Expand Down Expand Up @@ -49,7 +49,7 @@ moduleFor(
},
});

let obj = new FinalClass();
let obj = FinalClass.create();
obj.foo();
obj.bar();
assert.equal(obj.fooCnt, 2, 'should invoke both');
Expand All @@ -76,9 +76,9 @@ moduleFor(
});
let AnotherClass = SomeClass.extend({ things: 'bar' });
let YetAnotherClass = SomeClass.extend({ things: 'baz' });
let some = new SomeClass();
let another = new AnotherClass();
let yetAnother = new YetAnotherClass();
let some = SomeClass.create();
let another = AnotherClass.create();
let yetAnother = YetAnotherClass.create();
assert.deepEqual(some.get('things'), ['foo'], 'base class should have just its value');
assert.deepEqual(
another.get('things'),
Expand All @@ -102,9 +102,9 @@ moduleFor(
AnotherClass.reopenClass({ things: 'bar' });
let YetAnotherClass = SomeClass.extend();
YetAnotherClass.reopenClass({ things: 'baz' });
let some = new SomeClass();
let another = new AnotherClass();
let yetAnother = new YetAnotherClass();
let some = SomeClass.create();
let another = AnotherClass.create();
let yetAnother = YetAnotherClass.create();
assert.deepEqual(
get(some.constructor, 'things'),
['foo'],
Expand Down
6 changes: 3 additions & 3 deletions packages/ember-runtime/tests/system/object/observer_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ moduleFor(
}),
});

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

set(obj, 'bar', 'BAZ');
Expand All @@ -37,7 +37,7 @@ moduleFor(
}),
});

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

set(obj, 'bar', 'BAZ');
Expand Down Expand Up @@ -200,7 +200,7 @@ moduleFor(
},
});

let parent = new ParentClass();
let parent = ParentClass.create();

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

Expand Down
8 changes: 4 additions & 4 deletions packages/ember-runtime/tests/system/object/reopen_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ moduleFor(
bar: 'BAR',
});

assert.equal(new Subclass().foo(), 'FOO', 'Adds method');
assert.equal(get(new Subclass(), 'bar'), 'BAR', 'Adds property');
assert.equal(Subclass.create().foo(), 'FOO', 'Adds method');
assert.equal(get(Subclass.create(), 'bar'), 'BAR', 'Adds property');
}

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

assert.equal(new SubSub().foo(), 'FOO', 'Adds method');
assert.equal(get(new SubSub(), 'bar'), 'BAR', 'Adds property');
assert.equal(SubSub.create().foo(), 'FOO', 'Adds method');
assert.equal(get(SubSub.create(), 'bar'), 'BAR', 'Adds property');
}

['@test allows reopening already instantiated classes'](assert) {
Expand Down
2 changes: 1 addition & 1 deletion packages/ember-testing/lib/setup_for_testing.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default function setupForTesting() {
let adapter = getAdapter();
// if adapter is not manually set default to QUnit
if (!adapter) {
setAdapter(typeof self.QUnit === 'undefined' ? new Adapter() : new QUnitAdapter());
setAdapter(typeof self.QUnit === 'undefined' ? Adapter.create() : QUnitAdapter.create());
}

if (!jQueryDisabled) {
Expand Down
2 changes: 1 addition & 1 deletion packages/ember-testing/tests/adapters/adapter_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ moduleFor(
class extends AbstractTestCase {
constructor() {
super();
adapter = new Adapter();
adapter = Adapter.create();
}

teardown() {
Expand Down
2 changes: 1 addition & 1 deletion packages/ember-testing/tests/adapters/qunit_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ moduleFor(
delete QUnit.start;
delete QUnit.stop;

adapter = new QUnitAdapter();
adapter = QUnitAdapter.create();
}

teardown() {
Expand Down
Loading

0 comments on commit cb408aa

Please sign in to comment.