Skip to content

Commit 5d87168

Browse files
authored
Merge pull request #1 from kgroat/dot-ts
Fixed compile time errors
2 parents d4a3b21 + 0bff619 commit 5d87168

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+393
-166
lines changed

.circleci/config.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
defaults: &defaults
2+
- checkout
3+
- run: npm install
4+
- run: npm run test:ci
5+
- run: npm run cover:ci
6+
- store_artifacts:
7+
path: coverage
8+
prefix: coverage
9+
10+
version: 2.0
11+
jobs:
12+
"node-4":
13+
docker:
14+
- image: circleci/node:4-browsers
15+
environment:
16+
- CODECLIMATE_REPO_TOKEN: c92188dcdeaca7d9732f8ea38fdd41d6bff18dc27a8d6f8b64a5b1311b7b6c21
17+
steps: *defaults
18+
"node-6":
19+
docker:
20+
- image: circleci/node:6-browsers
21+
environment:
22+
- CODECLIMATE_REPO_TOKEN: c92188dcdeaca7d9732f8ea38fdd41d6bff18dc27a8d6f8b64a5b1311b7b6c21
23+
steps: *defaults
24+
"node-8":
25+
docker:
26+
- image: circleci/node:8-browsers
27+
environment:
28+
- CODECLIMATE_REPO_TOKEN: c92188dcdeaca7d9732f8ea38fdd41d6bff18dc27a8d6f8b64a5b1311b7b6c21
29+
steps: *defaults
30+
31+
workflows:
32+
version: 2
33+
build:
34+
jobs:
35+
- "node-4"
36+
- "node-6"
37+
- "node-8"

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ npm-debug.log*
1111
/lib
1212
/coverage
1313
/dist
14+
/ts
1415

1516
.node-version
1617
.vscode

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ cache:
1414
- examples/node/node_modules
1515
- examples/webpack/node_modules
1616
after_script:
17-
- node -v | grep "v8" && npm run cover && npm run cover:report
17+
- npm run cover:ci
1818
addons:
1919
code_climate:
2020
repo_token: c92188dcdeaca7d9732f8ea38fdd41d6bff18dc27a8d6f8b64a5b1311b7b6c21

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Change Log
22

3+
## [v3.6.0](https://github.com/testdouble/testdouble.js/tree/v3.6.0) (2018-03-24)
4+
[Full Changelog](https://github.com/testdouble/testdouble.js/compare/v3.5.2...v3.6.0)
5+
6+
**Closed issues:**
7+
8+
- td.replace a required method? [\#353](https://github.com/testdouble/testdouble.js/issues/353)
9+
10+
**Merged pull requests:**
11+
12+
- Avoid implicit any for TypeScript definitions [\#351](https://github.com/testdouble/testdouble.js/pull/351) ([rayalan](https://github.com/rayalan))
13+
- Merge Circle CI config to master [\#349](https://github.com/testdouble/testdouble.js/pull/349) ([searls](https://github.com/searls))
14+
- Merge in Circle CI config [\#348](https://github.com/testdouble/testdouble.js/pull/348) ([searls](https://github.com/searls))
15+
316
## [v3.5.2](https://github.com/testdouble/testdouble.js/tree/v3.5.2) (2018-02-26)
417
[Full Changelog](https://github.com/testdouble/testdouble.js/compare/v3.5.1...v3.5.2)
518

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# testdouble.js
22

3-
[![Build Status](https://travis-ci.org/testdouble/testdouble.js.svg?branch=master)](https://travis-ci.org/testdouble/testdouble.js)
3+
[![Build Status](https://circleci.com/gh/testdouble/testdouble.js/tree/master.svg?style=svg)](https://circleci.com/gh/testdouble/testdouble.js/tree/master)
44
[![npmjs](https://img.shields.io/badge/npm-testdouble-red.svg)](https://www.npmjs.com/package/testdouble)
55
[![unpkg](https://img.shields.io/badge/unpkg-download-blue.svg)](https://unpkg.com/testdouble/dist/)
66
[![Test Coverage](https://codeclimate.com/github/testdouble/testdouble.js/badges/coverage.svg)](https://codeclimate.com/github/testdouble/testdouble.js/coverage)

examples/jest-broken/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/jest-broken/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
},
1111
"devDependencies": {
1212
"jest": "^22.2.2",
13-
"testdouble-jest": "testdouble/testdouble-jest"
13+
"testdouble-jest": "github:testdouble/testdouble-jest"
1414
}
1515
}

examples/jest/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
},
1111
"devDependencies": {
1212
"jest": "^22.2.2",
13-
"testdouble-jest": "testdouble/testdouble-jest"
13+
"testdouble-jest": "github:testdouble/testdouble-jest"
1414
},
1515
"jest": {
16-
"setupTestFrameworkScriptFile": "./helper.js"
16+
"setupTestFrameworkScriptFile": "./support/helper.js"
1717
}
1818
}

examples/jest/helper.js renamed to examples/jest/support/helper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
global.td = require('../..')
1+
global.td = require('../../..')
22
global.expect = require('expect')
33

44
require('testdouble-jest')(td, jest)

index.d.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
export type DoubledObject < T > = T
66

7-
export type DoubledObjectWithKey < T extends string > = { [K in T] }
7+
export type DoubledObjectWithKey < T extends string > = { [K in T] : any }
88

99
export type TestDouble < T > = T
1010

@@ -29,6 +29,7 @@ export interface Explanation {
2929
callCount: number;
3030
calls: Call[];
3131
description: string;
32+
isTestDouble: boolean;
3233
}
3334

3435
export interface Matchers {

0 commit comments

Comments
 (0)