From 0856f8988211f2fabb5919504f1612c9a4e4899f Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Thu, 22 Mar 2018 21:11:22 +0530 Subject: [PATCH] Migrate -transform-block-scoping and -transform-classes to jest expect --- .../for-await/async-generator-exec/exec.js | 2 +- .../test/fixtures/exec/block-scoped-2.js | 4 ++-- .../test/fixtures/exec/block-scoped.js | 8 ++++---- .../fixtures/exec/closure-wrap-collision.js | 4 ++-- .../test/fixtures/exec/collision-for.js | 2 +- .../fixtures/exec/destructuring-defaults.js | 2 +- .../test/fixtures/exec/for-continuation.js | 10 +++++----- .../test/fixtures/exec/for-loop-head.js | 4 ++-- .../test/fixtures/exec/label.js | 6 +++--- .../test/fixtures/exec/multiple.js | 4 ++-- .../test/fixtures/exec/nested-labels-2.js | 20 +++++++++---------- .../test/fixtures/exec/nested-labels-3.js | 20 +++++++++---------- .../test/fixtures/exec/nested-labels-4.js | 4 ++-- .../test/fixtures/exec/nested-labels.js | 20 +++++++++---------- .../test/fixtures/exec/scope-bindings.js | 2 +- .../test/fixtures/pass/assignment.js | 2 +- .../test/fixtures/pass/call.js | 2 +- .../test/fixtures/pass/destructuring.js | 6 +++--- .../test/fixtures/pass/update.js | 2 +- .../fixtures/exec/class-prototype-chain.js | 18 ++++++++--------- .../test/fixtures/exec/declaration-binding.js | 2 +- .../test/fixtures/exec/expression-binding.js | 2 +- .../exec/retain-no-call-on-reassign.js | 4 ++-- .../test/fixtures/exec/return-symbol.js | 4 ++-- .../test/fixtures/exec/shadow-container.js | 2 +- .../test/fixtures/exec/super-change-proto.js | 2 +- .../test/fixtures/exec/super-return.js | 4 ++-- 27 files changed, 81 insertions(+), 81 deletions(-) diff --git a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/async-generator-exec/exec.js b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/async-generator-exec/exec.js index 3cf76d12ef..9ae8a1bdd4 100644 --- a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/async-generator-exec/exec.js +++ b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/async-generator-exec/exec.js @@ -21,6 +21,6 @@ function forEach(ai, fn) { var output = 0; return forEach(genAnswers(), function(val) { output += val.value }) .then(function () { - assert.equal(output, 42); + expect(output).toBe(42); }); diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/block-scoped-2.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/block-scoped-2.js index 1759efe2be..5679a76891 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/block-scoped-2.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/block-scoped-2.js @@ -1,4 +1,4 @@ -assert.equal((() => { +expect((() => { let sum = 0; let a = 0; { @@ -9,4 +9,4 @@ assert.equal((() => { } } return sum; -})(), 10); +})()).toBe(10); diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/block-scoped.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/block-scoped.js index d90256cbb2..ed58a00a47 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/block-scoped.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/block-scoped.js @@ -1,13 +1,13 @@ let x = 1; { let x = 2; - assert.equal(x, 2); + expect(x).toBe(2); { let x = 3; - assert.equal(x, 3); + expect(x).toBe(3); x++; - assert.equal(x, 4); + expect(x).toBe(4); } } -assert.equal(x, 1); +expect(x).toBe(1); diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/closure-wrap-collision.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/closure-wrap-collision.js index 41f893eccc..19e996bccd 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/closure-wrap-collision.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/closure-wrap-collision.js @@ -4,6 +4,6 @@ for (let i = 1; i < 3; i += 1) { })(); } -assert.throws(function () { +expect(function () { i; -}, ReferenceError); +}).toThrow(ReferenceError); diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/collision-for.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/collision-for.js index 367c09b2e5..ce244695c7 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/collision-for.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/collision-for.js @@ -1,6 +1,6 @@ let x = 0; for (;;) { let x = 1; - assert.equal(x, 1); + expect(x).toBe(1); break; } diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/destructuring-defaults.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/destructuring-defaults.js index a440bcb047..75b4499d0e 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/destructuring-defaults.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/destructuring-defaults.js @@ -1,5 +1,5 @@ var fields = [{ name: "title" }, { name: "content" }]; for (let { name, value = "Default value" } of fields) { - assert.equal(value, "Default value"); + expect(value).toBe("Default value"); } diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/for-continuation.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/for-continuation.js index 4e99464f72..404d59ac15 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/for-continuation.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/for-continuation.js @@ -5,8 +5,8 @@ for (let i = 0; i < 10; i++) { i += 1; } -assert.equal(fns[0](), 1); -assert.equal(fns[1](), 3); -assert.equal(fns[2](), 5); -assert.equal(fns[3](), 7); -assert.equal(fns[4](), 9); +expect(fns[0]()).toBe(1); +expect(fns[1]()).toBe(3); +expect(fns[2]()).toBe(5); +expect(fns[3]()).toBe(7); +expect(fns[4]()).toBe(9); diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/for-loop-head.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/for-loop-head.js index 59aaae854b..0d73347599 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/for-loop-head.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/for-loop-head.js @@ -1,5 +1,5 @@ -assert.equal((function(){ +expect(function(){ let a = 1; for (let a = 0; a < 8; a++) {} return a; -}()), 1); +}()).toBe(1); diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/label.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/label.js index 426c57a5a6..01b0549b5d 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/label.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/label.js @@ -10,6 +10,6 @@ for (let i in nums) { } } -assert.equal(heh.length, 2); -assert.equal(heh[0](2), 2); -assert.equal(heh[1](4), 8); +expect(heh).toHaveLength(2); +expect(heh[0](2)).toBe(2); +expect(heh[1](4)).toBe(8); diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/multiple.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/multiple.js index 34f8f1aefa..e21af63fe9 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/multiple.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/multiple.js @@ -1,4 +1,4 @@ for (let i = 0, x = 2; i < 5; i++); -assert.ok(typeof i === "undefined"); -assert.ok(typeof x === "undefined"); +expect(typeof i).toBe("undefined"); +expect(typeof x).toBe("undefined"); diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/nested-labels-2.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/nested-labels-2.js index 0d9b2bde64..e0f204ac2c 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/nested-labels-2.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/nested-labels-2.js @@ -9,14 +9,14 @@ } } - assert.deepEqual(stack[0](), [0, 0]); - assert.deepEqual(stack[1](), [0, 1]); - assert.deepEqual(stack[2](), [0, 2]); - assert.deepEqual(stack[3](), [0, 3]); - assert.deepEqual(stack[4](), [0, 4]); - assert.deepEqual(stack[5](), [0, 5]); - assert.deepEqual(stack[6](), [0, 6]); - assert.deepEqual(stack[7](), [0, 7]); - assert.deepEqual(stack[8](), [0, 8]); - assert.deepEqual(stack[9](), [0, 9]); + expect(stack[0]()).toEqual([0, 0]); + expect(stack[1]()).toEqual([0, 1]); + expect(stack[2]()).toEqual([0, 2]); + expect(stack[3]()).toEqual([0, 3]); + expect(stack[4]()).toEqual([0, 4]); + expect(stack[5]()).toEqual([0, 5]); + expect(stack[6]()).toEqual([0, 6]); + expect(stack[7]()).toEqual([0, 7]); + expect(stack[8]()).toEqual([0, 8]); + expect(stack[9]()).toEqual([0, 9]); })(); diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/nested-labels-3.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/nested-labels-3.js index f405cb32df..7504ddc789 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/nested-labels-3.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/nested-labels-3.js @@ -12,14 +12,14 @@ } } - assert.deepEqual(stack[0](), [0, 0, 0]); - assert.deepEqual(stack[1](), [0, 1, 0]); - assert.deepEqual(stack[2](), [0, 2, 0]); - assert.deepEqual(stack[3](), [0, 3, 0]); - assert.deepEqual(stack[4](), [0, 4, 0]); - assert.deepEqual(stack[5](), [0, 5, 0]); - assert.deepEqual(stack[6](), [0, 6, 0]); - assert.deepEqual(stack[7](), [0, 7, 0]); - assert.deepEqual(stack[8](), [0, 8, 0]); - assert.deepEqual(stack[9](), [0, 9, 0]); + expect(stack[0]()).toEqual([0, 0, 0]); + expect(stack[1]()).toEqual([0, 1, 0]); + expect(stack[2]()).toEqual([0, 2, 0]); + expect(stack[3]()).toEqual([0, 3, 0]); + expect(stack[4]()).toEqual([0, 4, 0]); + expect(stack[5]()).toEqual([0, 5, 0]); + expect(stack[6]()).toEqual([0, 6, 0]); + expect(stack[7]()).toEqual([0, 7, 0]); + expect(stack[8]()).toEqual([0, 8, 0]); + expect(stack[9]()).toEqual([0, 9, 0]); })(); diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/nested-labels-4.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/nested-labels-4.js index f6a7fa54f1..9e69c724b0 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/nested-labels-4.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/nested-labels-4.js @@ -9,6 +9,6 @@ } } - assert.deepEqual(stack.length, 1); - assert.deepEqual(stack[0](), [0, 0]); + expect(stack).toHaveLength(1); + expect(stack[0]()).toEqual([0, 0]); })(); diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/nested-labels.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/nested-labels.js index d9cb24977e..54c16fd376 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/nested-labels.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/nested-labels.js @@ -9,14 +9,14 @@ } } - assert.deepEqual(stack[0](), [0, 0]); - assert.deepEqual(stack[1](), [0, 1]); - assert.deepEqual(stack[2](), [0, 2]); - assert.deepEqual(stack[3](), [0, 3]); - assert.deepEqual(stack[4](), [0, 4]); - assert.deepEqual(stack[5](), [0, 5]); - assert.deepEqual(stack[6](), [0, 6]); - assert.deepEqual(stack[7](), [0, 7]); - assert.deepEqual(stack[8](), [0, 8]); - assert.deepEqual(stack[9](), [0, 9]); + expect(stack[0]()).toEqual([0, 0]); + expect(stack[1]()).toEqual([0, 1]); + expect(stack[2]()).toEqual([0, 2]); + expect(stack[3]()).toEqual([0, 3]); + expect(stack[4]()).toEqual([0, 4]); + expect(stack[5]()).toEqual([0, 5]); + expect(stack[6]()).toEqual([0, 6]); + expect(stack[7]()).toEqual([0, 7]); + expect(stack[8]()).toEqual([0, 8]); + expect(stack[9]()).toEqual([0, 9]); })(); diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/scope-bindings.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/scope-bindings.js index 5c889d243b..9d9e2f634b 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/scope-bindings.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/scope-bindings.js @@ -33,4 +33,4 @@ if (x) { var bar = 1; }`; -assert.equal(res.code, expected); +expect(res.code).toBe(expected); diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/pass/assignment.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/pass/assignment.js index 8df3c85142..ae6c2603a0 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/pass/assignment.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/pass/assignment.js @@ -1,3 +1,3 @@ let a = 1; a = 2; -assert.equal(a, 2); +expect(a).toBe(2);; diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/pass/call.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/pass/call.js index a6b9c61003..1a6e252d32 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/pass/call.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/pass/call.js @@ -4,4 +4,4 @@ function b() { return a + 1; } -assert.equal(b(), 2); +expect(b()).toBe(2);; diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/pass/destructuring.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/pass/destructuring.js index 3a9e4b23b2..ac48e70daa 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/pass/destructuring.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/pass/destructuring.js @@ -1,9 +1,9 @@ function foo( { x: { y: { z: a = 10 } = {}, w: b = 20 }, a: c = 30 } ) { - assert.equal(a, 10); - assert.equal(b, 20); - assert.equal(c, 30); + expect(a).toBe(10);; + expect(b).toBe(20);; + expect(c).toBe(30);; } foo({ x: {} }); diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/pass/update.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/pass/update.js index b38b49bbd1..fa81e58715 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/pass/update.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/pass/update.js @@ -1,3 +1,3 @@ let a = 1; a++; -assert.equal(a, 2); +expect(a).toBe(2);; diff --git a/packages/babel-plugin-transform-classes/test/fixtures/exec/class-prototype-chain.js b/packages/babel-plugin-transform-classes/test/fixtures/exec/class-prototype-chain.js index c8e5d97d62..aec347cffc 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/exec/class-prototype-chain.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/exec/class-prototype-chain.js @@ -5,19 +5,19 @@ B.b = function() { class C extends B {} -assert.equal(Object.getPrototypeOf(C), B); -assert.equal(Object.getPrototypeOf(C.prototype), B.prototype); +expect(Object.getPrototypeOf(C)).toBe(B); +expect(Object.getPrototypeOf(C.prototype)).toBe(B.prototype); -assert.equal(C.b(), 'B.b'); +expect(C.b()).toBe('B.b'); class D extends Object {} -assert.ok(D instanceof Object) -assert.ok(D.prototype instanceof Object); -assert.equal(D.keys, Object.keys); +expect(D instanceof Object).toBeTruthy(); +expect(D.prototype instanceof Object).toBeTruthy(); +expect(D.keys).toBe(Object.keys); class E {} -assert.equal(Object.getPrototypeOf(E), Function.prototype); -assert.equal(Object.getPrototypeOf(E.prototype), Object.prototype); -assert.isFalse('keys' in E); +expect(Object.getPrototypeOf(E)).toBe(Function.prototype); +expect(Object.getPrototypeOf(E.prototype)).toBe(Object.prototype); +expect(E).not.toContain('keys'); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/exec/declaration-binding.js b/packages/babel-plugin-transform-classes/test/fixtures/exec/declaration-binding.js index 2c35e5b5ff..7a1eb05dea 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/exec/declaration-binding.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/exec/declaration-binding.js @@ -6,4 +6,4 @@ class Foo { var Bar = Foo; Foo = 5; -assert.equal((new Bar).bar(), Bar); +expect((new Bar).bar()).toBe(Bar); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/exec/expression-binding.js b/packages/babel-plugin-transform-classes/test/fixtures/exec/expression-binding.js index ff776071e8..bea185a735 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/exec/expression-binding.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/exec/expression-binding.js @@ -6,4 +6,4 @@ var Foo = class Foo { var Bar = Foo; Foo = 5; -assert.equal((new Bar).bar(), Bar); +expect((new Bar).bar()).toBe(Bar); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/exec/retain-no-call-on-reassign.js b/packages/babel-plugin-transform-classes/test/fixtures/exec/retain-no-call-on-reassign.js index dbf35b7b66..347fc6ec9e 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/exec/retain-no-call-on-reassign.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/exec/retain-no-call-on-reassign.js @@ -6,6 +6,6 @@ class Foo { var Bar = Foo; Foo = 5; -assert.throws(function () { +expect(function () { Bar.call(6); -}, /Cannot call a class as a function/); +}).toThrow("Cannot call a class as a function"); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/exec/return-symbol.js b/packages/babel-plugin-transform-classes/test/fixtures/exec/return-symbol.js index 425fec9fea..5ba74db45e 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/exec/return-symbol.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/exec/return-symbol.js @@ -5,5 +5,5 @@ class Foo { } const f = new Foo; -assert.ok(f instanceof Foo); -assert.ok(typeof f === "object"); +expect(f instanceof Foo).toBeTruthy(); +expect(typeof f).toBe("object"); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/exec/shadow-container.js b/packages/babel-plugin-transform-classes/test/fixtures/exec/shadow-container.js index 5fe6288481..d80feeacaa 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/exec/shadow-container.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/exec/shadow-container.js @@ -7,4 +7,4 @@ function build(val) { } var Class = build.call({ key: "foo" }, "bar"); -assert.equal(new Class().foo(), "bar"); +expect(new Class().foo()).toBe("bar"); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/exec/super-change-proto.js b/packages/babel-plugin-transform-classes/test/fixtures/exec/super-change-proto.js index 01058549c9..015d68c9af 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/exec/super-change-proto.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/exec/super-change-proto.js @@ -18,4 +18,4 @@ class Derived extends Base { } new Derived().p(); -assert.equal(log, '[Derived][Base][OtherBase]'); +expect(log).toBe('[Derived][Base][OtherBase]'); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/exec/super-return.js b/packages/babel-plugin-transform-classes/test/fixtures/exec/super-return.js index 9531b4bd65..981e571e32 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/exec/super-return.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/exec/super-return.js @@ -6,8 +6,8 @@ class Foo { class Bar extends Foo { constructor() { - assert.equal(super().i, 1); - assert.equal(this.i, 1); + expect(super().i).toBe(1); + expect(this.i).toBe(1); } }