From d4a5b0855caf74542903963fc012e75ca7ef3a48 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 7 Nov 2016 09:56:48 -0800
Subject: [PATCH] Add --target esnext tests and update baselines

---
 src/harness/unittests/commandLineParsing.ts      |  2 +-
 .../unittests/convertCompilerOptionsFromJson.ts  |  2 +-
 .../reference/objectSpreadNoTransform.js         |  8 ++++++++
 .../reference/objectSpreadNoTransform.symbols    | 10 ++++++++++
 .../reference/objectSpreadNoTransform.types      | 16 ++++++++++++++++
 .../types/spread/objectSpreadNoTransform.ts      |  3 +++
 6 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 tests/baselines/reference/objectSpreadNoTransform.js
 create mode 100644 tests/baselines/reference/objectSpreadNoTransform.symbols
 create mode 100644 tests/baselines/reference/objectSpreadNoTransform.types
 create mode 100644 tests/cases/conformance/types/spread/objectSpreadNoTransform.ts

diff --git a/src/harness/unittests/commandLineParsing.ts b/src/harness/unittests/commandLineParsing.ts
index c15490738fa..890f167e2dd 100644
--- a/src/harness/unittests/commandLineParsing.ts
+++ b/src/harness/unittests/commandLineParsing.ts
@@ -165,7 +165,7 @@ namespace ts {
                         start: undefined,
                         length: undefined,
                     }, {
-                            messageText: "Argument for '--target' option must be: 'es3', 'es5', 'es6', 'es2015', 'es2016', 'es2017'",
+                            messageText: "Argument for '--target' option must be: 'es3', 'es5', 'es6', 'es2015', 'es2016', 'es2017', 'esnext'",
                             category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
                             code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
 
diff --git a/src/harness/unittests/convertCompilerOptionsFromJson.ts b/src/harness/unittests/convertCompilerOptionsFromJson.ts
index 2942675f0ac..23c372b5313 100644
--- a/src/harness/unittests/convertCompilerOptionsFromJson.ts
+++ b/src/harness/unittests/convertCompilerOptionsFromJson.ts
@@ -176,7 +176,7 @@ namespace ts {
                         file: undefined,
                         start: 0,
                         length: 0,
-                        messageText: "Argument for '--target' option must be: 'es3', 'es5', 'es6', 'es2015', 'es2016', 'es2017'",
+                        messageText: "Argument for '--target' option must be: 'es3', 'es5', 'es6', 'es2015', 'es2016', 'es2017', 'esnext'",
                         code: Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
                         category: Diagnostics.Argument_for_0_option_must_be_Colon_1.category
                     }]
diff --git a/tests/baselines/reference/objectSpreadNoTransform.js b/tests/baselines/reference/objectSpreadNoTransform.js
new file mode 100644
index 00000000000..8916c621969
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadNoTransform.js
@@ -0,0 +1,8 @@
+//// [objectSpreadNoTransform.ts]
+const y = { a: 'yes', b: 'no' };
+const o = { x: 1, ...y };
+
+
+//// [objectSpreadNoTransform.js]
+const y = { a: 'yes', b: 'no' };
+const o = { x: 1, ...y };
diff --git a/tests/baselines/reference/objectSpreadNoTransform.symbols b/tests/baselines/reference/objectSpreadNoTransform.symbols
new file mode 100644
index 00000000000..4d77bc84830
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadNoTransform.symbols
@@ -0,0 +1,10 @@
+=== tests/cases/conformance/types/spread/objectSpreadNoTransform.ts ===
+const y = { a: 'yes', b: 'no' };
+>y : Symbol(y, Decl(objectSpreadNoTransform.ts, 0, 5))
+>a : Symbol(a, Decl(objectSpreadNoTransform.ts, 0, 11))
+>b : Symbol(b, Decl(objectSpreadNoTransform.ts, 0, 21))
+
+const o = { x: 1, ...y };
+>o : Symbol(o, Decl(objectSpreadNoTransform.ts, 1, 5))
+>x : Symbol(x, Decl(objectSpreadNoTransform.ts, 1, 11))
+
diff --git a/tests/baselines/reference/objectSpreadNoTransform.types b/tests/baselines/reference/objectSpreadNoTransform.types
new file mode 100644
index 00000000000..3a412e2894e
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadNoTransform.types
@@ -0,0 +1,16 @@
+=== tests/cases/conformance/types/spread/objectSpreadNoTransform.ts ===
+const y = { a: 'yes', b: 'no' };
+>y : { a: string; b: string; }
+>{ a: 'yes', b: 'no' } : { a: string; b: string; }
+>a : string
+>'yes' : "yes"
+>b : string
+>'no' : "no"
+
+const o = { x: 1, ...y };
+>o : { a: string; b: string; x: number; }
+>{ x: 1, ...y } : { a: string; b: string; x: number; }
+>x : number
+>1 : 1
+>y : any
+
diff --git a/tests/cases/conformance/types/spread/objectSpreadNoTransform.ts b/tests/cases/conformance/types/spread/objectSpreadNoTransform.ts
new file mode 100644
index 00000000000..00039117a20
--- /dev/null
+++ b/tests/cases/conformance/types/spread/objectSpreadNoTransform.ts
@@ -0,0 +1,3 @@
+// @target: esnext
+const y = { a: 'yes', b: 'no' };
+const o = { x: 1, ...y };