From 1f6a05a9a2b0b8fb4cfab569a45adf9a1261b1c6 Mon Sep 17 00:00:00 2001
From: nicojs <jansennico@gmail.com>
Date: Mon, 18 Jul 2016 06:43:46 +0200
Subject: [PATCH] fix(unittest): Fix merge error in TestRunnerOrchestratorSpec

---
 test/unit/TestRunnerOrchestratorSpec.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/unit/TestRunnerOrchestratorSpec.ts b/test/unit/TestRunnerOrchestratorSpec.ts
index e2a6f3b8b0..cca39fea06 100644
--- a/test/unit/TestRunnerOrchestratorSpec.ts
+++ b/test/unit/TestRunnerOrchestratorSpec.ts
@@ -33,8 +33,8 @@ describe('TestRunnerOrchestrator', () => {
     { path: path.join(process.cwd(), 'bSpec.js'), shouldMutate: false }
   ];
   let strykerOptions: StrykerOptions = { testRunner: 'superRunner', port: 42, timeoutFactor: 1, timeoutMs: 0 };
-  let firstTestRunner: { run: sinon.SinonStub, dispose: sinon.SinonStub };
-  let secondTestRunner: { run: sinon.SinonStub, dispose: sinon.SinonStub };
+  let firstTestRunner: { init: sinon.SinonStub, run: sinon.SinonStub, dispose: sinon.SinonStub };
+  let secondTestRunner: { init: sinon.SinonStub, run: sinon.SinonStub, dispose: sinon.SinonStub };
   let selector: TestSelector;
   let reporter: Reporter;
 
@@ -57,14 +57,13 @@ describe('TestRunnerOrchestrator', () => {
       .withArgs({ timeout: 2 }).returns(Promise.resolve({ result: TestResult.Complete }))
       .withArgs({ timeout: 3 }).returns(Promise.resolve({ result: TestResult.Timeout }))
       .withArgs({ timeout: 4 }).returns(Promise.resolve({ result: TestResult.Error }))
-      
+
       // Initial test run
       .withArgs({ timeout: 10000 })
         .onCall(0).returns(Promise.resolve({ result: TestResult.Complete, succeeded: 1 }))
         .onCall(1).returns(Promise.resolve({ result: TestResult.Complete, failed: 1 }))
         .onCall(2).returns(Promise.resolve({ result: TestResult.Complete }));
             
-
     configureTestRunner(firstTestRunner.run);
     configureTestRunner(secondTestRunner.run);
     selector = {