From 3c4f19a28de34aafd842a475d6e7b2d4a0512d34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Burzy=C5=84ski?= <mateuszburzynski@gmail.com>
Date: Thu, 24 Aug 2017 21:50:43 +0200
Subject: [PATCH] Adjusted Object Rest/Spread tests to use only allowed syntax
 from the latest spec (#6102)

---
 .../test/fixtures/types/RestProperty/actual.js   |  5 ++---
 .../test/fixtures/types/RestProperty/expected.js | 16 +++-------------
 .../destructuring/es7-object-rest/actual.js      |  2 +-
 .../destructuring/es7-object-rest/expected.js    |  7 ++-----
 .../object-rest/variable-destructuring/actual.js |  3 ---
 .../variable-destructuring/expected.js           | 10 ----------
 6 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/packages/babel-generator/test/fixtures/types/RestProperty/actual.js b/packages/babel-generator/test/fixtures/types/RestProperty/actual.js
index af90a6ba00..d7ae18c552 100644
--- a/packages/babel-generator/test/fixtures/types/RestProperty/actual.js
+++ b/packages/babel-generator/test/fixtures/types/RestProperty/actual.js
@@ -1,3 +1,2 @@
-var { ...{ z } } = { z: 1 };
-var { ...{ x = 5 } } = { x : 1 };
-({ x, ...{ y, z } } = o);
+var { ...z } = { z: 1 };
+({ x, y, ...z } = o);
diff --git a/packages/babel-generator/test/fixtures/types/RestProperty/expected.js b/packages/babel-generator/test/fixtures/types/RestProperty/expected.js
index dbae80a5b7..9201f33c0e 100644
--- a/packages/babel-generator/test/fixtures/types/RestProperty/expected.js
+++ b/packages/babel-generator/test/fixtures/types/RestProperty/expected.js
@@ -1,19 +1,9 @@
-var { ...{
-    z
-  }
+var { ...z
 } = {
   z: 1
 };
-var { ...{
-    x = 5
-  }
-} = {
-  x: 1
-};
 ({
   x,
-  ...{
-    y,
-    z
-  }
+  y,
+  ...z
 } = o);
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-es2015-destructuring/test/fixtures/destructuring/es7-object-rest/actual.js b/packages/babel-plugin-transform-es2015-destructuring/test/fixtures/destructuring/es7-object-rest/actual.js
index 44903552ea..20b5387a59 100644
--- a/packages/babel-plugin-transform-es2015-destructuring/test/fixtures/destructuring/es7-object-rest/actual.js
+++ b/packages/babel-plugin-transform-es2015-destructuring/test/fixtures/destructuring/es7-object-rest/actual.js
@@ -4,4 +4,4 @@ var { x, ...y } = z;
 var { [x]: x, ...y } = z;
 (function({ x, ...y }) { });
 
-({ x, ...{ y, z } } = o);
+({ x, y, ...z } = o);
diff --git a/packages/babel-plugin-transform-es2015-destructuring/test/fixtures/destructuring/es7-object-rest/expected.js b/packages/babel-plugin-transform-es2015-destructuring/test/fixtures/destructuring/es7-object-rest/expected.js
index d3384999ee..5c7315f73b 100644
--- a/packages/babel-plugin-transform-es2015-destructuring/test/fixtures/destructuring/es7-object-rest/expected.js
+++ b/packages/babel-plugin-transform-es2015-destructuring/test/fixtures/destructuring/es7-object-rest/expected.js
@@ -15,9 +15,6 @@ var _z3 = z,
 
 var _o = o;
 x = _o.x;
-
-var _babelHelpers$objectW = babelHelpers.objectWithoutProperties(_o, ["x"]);
-
-y = _babelHelpers$objectW.y;
-z = _babelHelpers$objectW.z;
+y = _o.y;
+z = babelHelpers.objectWithoutProperties(_o, ["x", "y"]);
 _o;
diff --git a/packages/babel-plugin-transform-object-rest-spread/test/fixtures/object-rest/variable-destructuring/actual.js b/packages/babel-plugin-transform-object-rest-spread/test/fixtures/object-rest/variable-destructuring/actual.js
index a8e761d5c9..6eed55d739 100644
--- a/packages/babel-plugin-transform-object-rest-spread/test/fixtures/object-rest/variable-destructuring/actual.js
+++ b/packages/babel-plugin-transform-object-rest-spread/test/fixtures/object-rest/variable-destructuring/actual.js
@@ -17,6 +17,3 @@ let {
 } = complex;
 
 let { x4: { ...y4 } } = z;
-
-var { ...{ z } } = { z: 1 };
-var { ...{ x = 5 } } = { x : 1 };
diff --git a/packages/babel-plugin-transform-object-rest-spread/test/fixtures/object-rest/variable-destructuring/expected.js b/packages/babel-plugin-transform-object-rest-spread/test/fixtures/object-rest/variable-destructuring/expected.js
index 211de3a015..0bebdd2fa2 100644
--- a/packages/babel-plugin-transform-object-rest-spread/test/fixtures/object-rest/variable-destructuring/expected.js
+++ b/packages/babel-plugin-transform-object-rest-spread/test/fixtures/object-rest/variable-destructuring/expected.js
@@ -40,13 +40,3 @@ let {
     g = babelHelpers.objectWithoutProperties(complex, ["x"]);
 let {} = z,
     y4 = babelHelpers.objectWithoutProperties(z.x4, []);
-var {
-  z
-} = babelHelpers.objectWithoutProperties({
-  z: 1
-}, []);
-var {
-  x = 5
-} = babelHelpers.objectWithoutProperties({
-  x: 1
-}, []);