Update object spread scenarios test

sandersn · sandersn · commit b9af986df1d4 · 2016-10-03T15:18:04.000-07:00
diff --git a/tests/baselines/reference/objectSpreadScenarios.js b/tests/baselines/reference/objectSpreadScenarios.js
@@ -1,7 +1,7 @@
 //// [objectSpreadScenarios.ts]
 interface A1 { a: boolean }
 interface B1 { b: number };
-function override<U>(initial: U, override: U): U {
+function override<U>(initial: U, override: U): { ...U, ...U } {
     return { ...initial, ...override };
 }
 function update<U>(this: { u: U }, override: U): void {
diff --git a/tests/baselines/reference/objectSpreadScenarios.symbols b/tests/baselines/reference/objectSpreadScenarios.symbols
@@ -7,13 +7,14 @@ interface B1 { b: number };
 >B1 : Symbol(B1, Decl(objectSpreadScenarios.ts, 0, 27))
 >b : Symbol(B1.b, Decl(objectSpreadScenarios.ts, 1, 14))
 
-function override<U>(initial: U, override: U): U {
+function override<U>(initial: U, override: U): { ...U, ...U } {
 >override : Symbol(override, Decl(objectSpreadScenarios.ts, 1, 27))
 >U : Symbol(U, Decl(objectSpreadScenarios.ts, 2, 18))
 >initial : Symbol(initial, Decl(objectSpreadScenarios.ts, 2, 21))
 >U : Symbol(U, Decl(objectSpreadScenarios.ts, 2, 18))
 >override : Symbol(override, Decl(objectSpreadScenarios.ts, 2, 32))
 >U : Symbol(U, Decl(objectSpreadScenarios.ts, 2, 18))
+>U : Symbol(U, Decl(objectSpreadScenarios.ts, 2, 18))
 >U : Symbol(U, Decl(objectSpreadScenarios.ts, 2, 18))
 
     return { ...initial, ...override };
diff --git a/tests/baselines/reference/objectSpreadScenarios.types b/tests/baselines/reference/objectSpreadScenarios.types
@@ -7,13 +7,14 @@ interface B1 { b: number };
 >B1 : B1
 >b : number
 
-function override<U>(initial: U, override: U): U {
->override : <U>(initial: U, override: U) => U
+function override<U>(initial: U, override: U): { ...U, ...U } {
+>override : <U>(initial: U, override: U) => { ...U; ...U }
 >U : U
 >initial : U
 >U : U
 >override : U
 >U : U
+>U : U
 >U : U
 
     return { ...initial, ...override };
@@ -72,10 +73,10 @@ let b1: B1 = { b: 101 };
 >101 : 101
 
 a1 = override(a1, { a: false });
->a1 = override(a1, { a: false }) : A1
+>a1 = override(a1, { a: false }) : { ...A1; ...A1 }
 >a1 : A1
->override(a1, { a: false }) : A1
->override : <U>(initial: U, override: U) => U
+>override(a1, { a: false }) : { ...A1; ...A1 }
+>override : <U>(initial: U, override: U) => { ...U; ...U }
 >a1 : A1
 >{ a: false } : { a: false; }
 >a : boolean
diff --git a/tests/cases/conformance/types/spread/objectSpreadScenarios.ts b/tests/cases/conformance/types/spread/objectSpreadScenarios.ts
@@ -1,6 +1,6 @@
 interface A1 { a: boolean }
 interface B1 { b: number };
-function override<U>(initial: U, override: U): U {
+function override<U>(initial: U, override: U): { ...U, ...U } {
     return { ...initial, ...override };
 }
 function update<U>(this: { u: U }, override: U): void {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`//// [objectSpreadScenarios.ts]`
`2`	`2`	`interface A1 { a: boolean }`
`3`	`3`	`interface B1 { b: number };`
`4`		`-function override<U>(initial: U, override: U): U {`
	`4`	`+function override<U>(initial: U, override: U): { ...U, ...U } {`
`5`	`5`	`return { ...initial, ...override };`
`6`	`6`	`}`
`7`	`7`	`function update<U>(this: { u: U }, override: U): void {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`interface A1 { a: boolean }`
`2`	`2`	`interface B1 { b: number };`
`3`		`-function override<U>(initial: U, override: U): U {`
	`3`	`+function override<U>(initial: U, override: U): { ...U, ...U } {`
`4`	`4`	`return { ...initial, ...override };`
`5`	`5`	`}`
`6`	`6`	`function update<U>(this: { u: U }, override: U): void {`