Skip to content

Commit

Permalink
fix(unittest): Fix merge error in TestRunnerOrchestratorSpec
Browse files Browse the repository at this point in the history
  • Loading branch information
nicojs committed Jul 30, 2016
1 parent 8aca3bd commit 1f6a05a
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions test/unit/TestRunnerOrchestratorSpec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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 = {
Expand Down

0 comments on commit 1f6a05a

Please sign in to comment.