From 6a51f80340ea55a03b7ddf358785ac5c58e601f3 Mon Sep 17 00:00:00 2001
From: Rui Peres <rui.peres@mailonline.co.uk>
Date: Fri, 8 Jul 2016 20:11:29 +0200
Subject: [PATCH 1/2] Added missing test to #3043

---
 ReactiveCocoaTests/Swift/SignalProducerSpec.swift | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/ReactiveCocoaTests/Swift/SignalProducerSpec.swift b/ReactiveCocoaTests/Swift/SignalProducerSpec.swift
index 8c4eb7ac2e..ce258a1711 100644
--- a/ReactiveCocoaTests/Swift/SignalProducerSpec.swift
+++ b/ReactiveCocoaTests/Swift/SignalProducerSpec.swift
@@ -2243,6 +2243,19 @@ class SignalProducerSpec: QuickSpec {
 					observer.sendCompleted()
 				}
 			}
+
+			describe("init(values) ambiguity") {
+				it("should not be a SignalProducer<SignalProducer<Int, NoError>, NoError>") {
+
+					let producer1: SignalProducer<Int, NoError> = SignalProducer.empty
+					let producer2: SignalProducer<Int, NoError> = SignalProducer.empty
+
+					let producer = SignalProducer(values: [producer1, producer2])
+						.flatten(.Merge)
+
+					expect(producer is SignalProducer<Int, NoError>).to(beTrue())
+				}
+			}
 		}
 	}
 }

From 44e62e1706cd233807470a7211b1d5eea9549f91 Mon Sep 17 00:00:00 2001
From: Rui Peres <rui.peres@mailonline.co.uk>
Date: Fri, 8 Jul 2016 20:53:52 +0200
Subject: [PATCH 2/2] less kung fu. :P

---
 ReactiveCocoaTests/Swift/SignalProducerSpec.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ReactiveCocoaTests/Swift/SignalProducerSpec.swift b/ReactiveCocoaTests/Swift/SignalProducerSpec.swift
index ce258a1711..ed399eb52e 100644
--- a/ReactiveCocoaTests/Swift/SignalProducerSpec.swift
+++ b/ReactiveCocoaTests/Swift/SignalProducerSpec.swift
@@ -2253,7 +2253,7 @@ class SignalProducerSpec: QuickSpec {
 					let producer = SignalProducer(values: [producer1, producer2])
 						.flatten(.Merge)
 
-					expect(producer is SignalProducer<Int, NoError>).to(beTrue())
+					expect(producer is SignalProducer<Int, NoError>) == true
 				}
 			}
 		}