merge master fix one conflict

Author: Brian Ojeda

.gitignore

@@ -12,3 +12,4 @@ npm-debug.log*
 /coverage
 
 .node-version
+.vscode

CHANGELOG.md

@@ -1,13 +1,132 @@
 # Change Log
 
+## [v3.2.5](https://github.com/testdouble/testdouble.js/tree/v3.2.5) (2017-09-07)
+[Full Changelog](https://github.com/testdouble/testdouble.js/compare/v3.2.4...v3.2.5)
+
+**Closed issues:**
+
+- Missing support for async functions? \(Node 8\) [\#284](https://github.com/testdouble/testdouble.js/issues/284)
+- redacted [\#283](https://github.com/testdouble/testdouble.js/issues/283)
+- Stubbing priority [\#280](https://github.com/testdouble/testdouble.js/issues/280)
+
+**Merged pull requests:**
+
+- Upgrade lodash \(and support async functions\) [\#285](https://github.com/testdouble/testdouble.js/pull/285) ([rosston](https://github.com/rosston))
+- Add previous/next links to documentation files [\#282](https://github.com/testdouble/testdouble.js/pull/282) ([randycoulman](https://github.com/randycoulman))
+
+## [v3.2.4](https://github.com/testdouble/testdouble.js/tree/v3.2.4) (2017-08-06)
+[Full Changelog](https://github.com/testdouble/testdouble.js/compare/v3.2.3...v3.2.4)
+
+**Closed issues:**
+
+- td.constructor\(\) ReferenceError: td is not defined [\#279](https://github.com/testdouble/testdouble.js/issues/279)
+
+## [v3.2.3](https://github.com/testdouble/testdouble.js/tree/v3.2.3) (2017-08-01)
+[Full Changelog](https://github.com/testdouble/testdouble.js/compare/v3.2.2...v3.2.3)
+
+**Fixed bugs:**
+
+- Verifying a td.constructor\(\) fails [\#278](https://github.com/testdouble/testdouble.js/issues/278)
+
+**Closed issues:**
+
+- Invocation sequence testing [\#277](https://github.com/testdouble/testdouble.js/issues/277)
+- Cannot assign to read only property 'constructor' after updating to v3.2.x [\#271](https://github.com/testdouble/testdouble.js/issues/271)
+
+## [v3.2.2](https://github.com/testdouble/testdouble.js/tree/v3.2.2) (2017-06-30)
+[Full Changelog](https://github.com/testdouble/testdouble.js/compare/v3.2.1...v3.2.2)
+
+**Implemented enhancements:**
+
+- Generator support [\#273](https://github.com/testdouble/testdouble.js/issues/273)
+
+**Merged pull requests:**
+
+- Don't blow up when imitating a thing with generators on it [\#274](https://github.com/testdouble/testdouble.js/pull/274) ([searls](https://github.com/searls))
+
+## [v3.2.1](https://github.com/testdouble/testdouble.js/tree/v3.2.1) (2017-06-26)
+[Full Changelog](https://github.com/testdouble/testdouble.js/compare/v3.2.0...v3.2.1)
+
+**Closed issues:**
+
+- Tests failing with 'TypeError: Cannot read property 'isPrototypeOf' of null' after updating 3.2.0 [\#270](https://github.com/testdouble/testdouble.js/issues/270)
+
+## [v3.2.0](https://github.com/testdouble/testdouble.js/tree/v3.2.0) (2017-06-24)
+[Full Changelog](https://github.com/testdouble/testdouble.js/compare/v3.1.1...v3.2.0)
+
+**Implemented enhancements:**
+
+- Single-layer property replacement is inappropriate for ES modules [\#262](https://github.com/testdouble/testdouble.js/issues/262)
+
+**Closed issues:**
+
+- td.constructor\(\) breaks instanceof [\#267](https://github.com/testdouble/testdouble.js/issues/267)
+
+**Merged pull requests:**
+
+- imitate / replace things deeply \(instead of shallow\) [\#268](https://github.com/testdouble/testdouble.js/pull/268) ([searls](https://github.com/searls))
+
+## [v3.1.1](https://github.com/testdouble/testdouble.js/tree/v3.1.1) (2017-06-20)
+[Full Changelog](https://github.com/testdouble/testdouble.js/compare/v3.1.0...v3.1.1)
+
+## [v3.1.0](https://github.com/testdouble/testdouble.js/tree/v3.1.0) (2017-06-18)
+[Full Changelog](https://github.com/testdouble/testdouble.js/compare/v3.0.0...v3.1.0)
+
+**Fixed bugs:**
+
+- td.replace throws with objects created with Object.create [\#257](https://github.com/testdouble/testdouble.js/issues/257)
+- getters are executed when using td.constructor\(\) [\#218](https://github.com/testdouble/testdouble.js/issues/218)
+
+**Closed issues:**
+
+- Verify that constructor is passed certain values [\#256](https://github.com/testdouble/testdouble.js/issues/256)
+- Is there any sample code that mock aws sdk? [\#251](https://github.com/testdouble/testdouble.js/issues/251)
+- Cannot use `td.object` with "callable objects" [\#232](https://github.com/testdouble/testdouble.js/issues/232)
+
+**Merged pull requests:**
+
+- Allow stubbing of custom instances & Object.create\(\) [\#264](https://github.com/testdouble/testdouble.js/pull/264) ([searls](https://github.com/searls))
+- Enable tsc in ci pipeline take 2 [\#260](https://github.com/testdouble/testdouble.js/pull/260) ([duluca](https://github.com/duluca))
+- TypeScript typing thenResolve takes variable args [\#258](https://github.com/testdouble/testdouble.js/pull/258) ([miyu](https://github.com/miyu))
+- Test testdouble.js with testdouble.js! [\#255](https://github.com/testdouble/testdouble.js/pull/255) ([searls](https://github.com/searls))
+
+## [v3.0.0](https://github.com/testdouble/testdouble.js/tree/v3.0.0) (2017-06-02)
+[Full Changelog](https://github.com/testdouble/testdouble.js/compare/v2.1.2...v3.0.0)
+
+**Fixed bugs:**
+
+- Figure out babel+instanceof+constructor problems with class extension  [\#241](https://github.com/testdouble/testdouble.js/issues/241)
+- Mocking a Class [\#157](https://github.com/testdouble/testdouble.js/issues/157)
+
+**Closed issues:**
+
+- `td.verify` reporting after resolving promises [\#250](https://github.com/testdouble/testdouble.js/issues/250)
+- Replacing dependency with td.replace\(path, replacement\) doesn't work [\#249](https://github.com/testdouble/testdouble.js/issues/249)
+- Verify constructor [\#248](https://github.com/testdouble/testdouble.js/issues/248)
+- td.replace \(\) breaks the cache in require [\#244](https://github.com/testdouble/testdouble.js/issues/244)
+- Faking internal calls [\#243](https://github.com/testdouble/testdouble.js/issues/243)
+- ECMAScript 2015 Classes with td.constructor\(\) [\#240](https://github.com/testdouble/testdouble.js/issues/240)
+- TypeScript: Better Generic Support for td.object\(\) [\#236](https://github.com/testdouble/testdouble.js/issues/236)
+- How to Replace Imported Constructor in Another File [\#235](https://github.com/testdouble/testdouble.js/issues/235)
+- Mocha Spec Reporter [\#234](https://github.com/testdouble/testdouble.js/issues/234)
+- TypeError: 'x' is not a function [\#233](https://github.com/testdouble/testdouble.js/issues/233)
+- Inifinite recursion problem [\#231](https://github.com/testdouble/testdouble.js/issues/231)
+- Invoke callback within object [\#230](https://github.com/testdouble/testdouble.js/issues/230)
+- Testing Constructor invocations [\#229](https://github.com/testdouble/testdouble.js/issues/229)
+- Stubbing chained API objects yields a warning [\#228](https://github.com/testdouble/testdouble.js/issues/228)
+
+**Merged pull requests:**
+
+- Stop extending types when replacing constructors [\#254](https://github.com/testdouble/testdouble.js/pull/254) ([searls](https://github.com/searls))
+- Fix \#236; Add another overload and its test [\#237](https://github.com/testdouble/testdouble.js/pull/237) ([sgtoj](https://github.com/sgtoj))
+
 ## [v2.1.2](https://github.com/testdouble/testdouble.js/tree/v2.1.2) (2017-03-29)
 [Full Changelog](https://github.com/testdouble/testdouble.js/compare/v2.1.1...v2.1.2)
 
 **Closed issues:**
 
 - TypeError when used with node -r flag [\#226](https://github.com/testdouble/testdouble.js/issues/226)
 - When replacing a node library calling it from other modules does not work as expected [\#225](https://github.com/testdouble/testdouble.js/issues/225)
-- Consider using \_.isObjectLike rather than \_.isPlainObject within td.object [\#224](https://github.com/testdouble/testdouble.js/issues/224)
 
 ## [v2.1.1](https://github.com/testdouble/testdouble.js/tree/v2.1.1) (2017-03-28)
 [Full Changelog](https://github.com/testdouble/testdouble.js/compare/v2.1.0...v2.1.1)
@@ -182,7 +301,6 @@
 
 **Closed issues:**
 
-- Mocking a Class [\#157](https://github.com/testdouble/testdouble.js/issues/157)
 - Matcher for a specific position [\#156](https://github.com/testdouble/testdouble.js/issues/156)
 
 **Merged pull requests:**

README.md

@@ -70,66 +70,66 @@ numbered for easy reading in the priority-order we anticipate people needing the
 Here's a rough outline:
 
 1. [Installation](docs/1-installation.md#installing-testdoublejs)
-  1. [for Node.js](docs/1-installation.md#for-use-in-nodejs-or-browserify)
-  2. [for browsers](docs/1-installation.md#for-use-in-browsers)
-  3. [initial configuration](docs/1-installation.md#configuring-testdoublejs-setting-up-in-your-test-suite)
-2. [Purpose of testdouble.js](docs/2-howto-purpose.md#background)
-  1. [in unit tests](docs/2-howto-purpose.md#test-doubles-and-unit-tests)
-  2. [in integration tests](docs/2-howto-purpose.md#test-doubles-and-integration-tests)
+   1. [for Node.js](docs/1-installation.md#for-use-in-nodejs-or-browserify)
+   2. [for browsers](docs/1-installation.md#for-use-in-browsers)
+   3. [initial configuration](docs/1-installation.md#configuring-testdoublejs-setting-up-in-your-test-suite)
+2. [Purpose of testdouble.js](docs/2-howto-purpose.md#purpose)
+   1. [in unit tests](docs/2-howto-purpose.md#test-doubles-and-unit-tests)
+   2. [in integration tests](docs/2-howto-purpose.md#test-doubles-and-integration-tests)
 3. [Getting started tutorial](docs/3-getting-started.md#getting-started)
 4. [Creating test doubles](docs/4-creating-test-doubles.md#creating-test-doubles)
-  1. [test double functions with `td.function()`](docs/4-creating-test-doubles.md#tdfunctionname)
-  2. [test double objects with `td.object()`](docs/4-creating-test-doubles.md#tdobject)
-  3. [test double constructors with `td.constructor()`](docs/4-creating-test-doubles.md#tdconstructor)
+   1. [test double functions with `td.function()`](docs/4-creating-test-doubles.md#tdfunctionname)
+   2. [test double objects with `td.object()`](docs/4-creating-test-doubles.md#tdobject)
+   3. [test double constructors with `td.constructor()`](docs/4-creating-test-doubles.md#tdconstructor)
 5. [Stubbing responses](docs/5-stubbing-results.md#stubbing-behavior)
-  1. [td.when() API](docs/5-stubbing-results.md#tdwhen)
-  2. [equality argument matching](docs/5-stubbing-results.md#simple-precise-argument-stubbing)
-  3. [one-liner stubbings](docs/5-stubbing-results.md#one-liner-stubbings)
-  4. [stubbing sequential return values](docs/5-stubbing-results.md#stubbing-sequential-return-values)
-  5. [argument matchers](docs/5-stubbing-results.md#loosening-stubbings-with-argument-matchers)
-    1. [td.matchers.anything()](docs/5-stubbing-results.md#tdmatchersanything)
-    2. [td.matchers.isA()](docs/5-stubbing-results.md#tdmatchersisa)
-    3. [td.matchers.contains()](docs/5-stubbing-results.md#tdmatcherscontains)
-      1. [matching strings](docs/5-stubbing-results.md#strings)
-      2. [matching arrays](docs/5-stubbing-results.md#arrays)
-      3. [matching objects](docs/5-stubbing-results.md#objects)
-    4. [td.matchers.argThat()](docs/5-stubbing-results.md#tdmatchersargthat)
-    5. [td.matchers.not()](docs/5-stubbing-results.md#tdmatchersnot)
-  6. [Stubbing callback APIs](docs/5-stubbing-results.md#stubbing-callback-apis)
-  7. [Stub exceptions with thenThrow](docs/5-stubbing-results.md#stub-exceptions-with-thenthrow)
-  8. [Stub promises with thenResolve and thenReject](docs/5-stubbing-results.md#stub-promises-with-thenresolve-and-thenreject)
-  9. [Stub side effects with thenDo](docs/5-stubbing-results.md#stub-side-effects-with-thendo)
-  10. [Configuring stubbings](docs/5-stubbing-results.md#configuring-stubbings)
-    1. [ignoreExtraArgs](docs/5-stubbing-results.md#ignoreextraargs)
-    2. [times](docs/5-stubbing-results.md#times)
-    3. [defer](docs/5-stubbing-results.md#defer)
-    4. [delay](docs/5-stubbing-results.md#delay)
+   1. [td.when() API](docs/5-stubbing-results.md#tdwhen)
+   2. [equality argument matching](docs/5-stubbing-results.md#simple-precise-argument-stubbing)
+   3. [one-liner stubbings](docs/5-stubbing-results.md#one-liner-stubbings)
+   4. [stubbing sequential return values](docs/5-stubbing-results.md#stubbing-sequential-return-values)
+   5. [argument matchers](docs/5-stubbing-results.md#loosening-stubbings-with-argument-matchers)
+      1. [td.matchers.anything()](docs/5-stubbing-results.md#tdmatchersanything)
+      2. [td.matchers.isA()](docs/5-stubbing-results.md#tdmatchersisa)
+      3. [td.matchers.contains()](docs/5-stubbing-results.md#tdmatcherscontains)
+         1. [matching strings](docs/5-stubbing-results.md#strings)
+         2. [matching arrays](docs/5-stubbing-results.md#arrays)
+         3. [matching objects](docs/5-stubbing-results.md#objects)
+      4. [td.matchers.argThat()](docs/5-stubbing-results.md#tdmatchersargthat)
+      5. [td.matchers.not()](docs/5-stubbing-results.md#tdmatchersnot)
+   6. [Stubbing callback APIs](docs/5-stubbing-results.md#stubbing-callback-apis)
+   7. [Stub exceptions with thenThrow](docs/5-stubbing-results.md#stub-exceptions-with-thenthrow)
+   8. [Stub promises with thenResolve and thenReject](docs/5-stubbing-results.md#stub-promises-with-thenresolve-and-thenreject)
+   9. [Stub side effects with thenDo](docs/5-stubbing-results.md#stub-side-effects-with-thendo)
+   10. [Configuring stubbings](docs/5-stubbing-results.md#configuring-stubbings)
+      1. [ignoreExtraArgs](docs/5-stubbing-results.md#ignoreextraargs)
+      2. [times](docs/5-stubbing-results.md#times)
+      3. [defer](docs/5-stubbing-results.md#defer)
+      4. [delay](docs/5-stubbing-results.md#delay)
 6. [Verifying invocations](docs/6-verifying-invocations.md#verifying-interactions)
-  1. [td.verify() API](docs/6-verifying-invocations.md#tdverify)
-  2. [equality argument matching](docs/6-verifying-invocations.md#arguments)
-  3. [argument matchers](docs/6-verifying-invocations.md#relaxing-verifications-with-argument-matchers)
-    1. [td.matchers.anything()](docs/6-verifying-invocations.md#tdmatchersanything)
-    2. [td.matchers.isA()](docs/6-verifying-invocations.md#tdmatchersisa)
-    3. [td.matchers.contains()](docs/6-verifying-invocations.md#tdmatcherscontains)
-      1. [matching strings](docs/6-verifying-invocations.md#strings)
-      2. [matching arrays](docs/6-verifying-invocations.md#arrays)
-      3. [matching objects](docs/6-verifying-invocations.md#objects)
-    4. [td.matchers.argThat()](docs/6-verifying-invocations.md#tdmatchersargthat)
-  4. [Argument captors](docs/6-verifying-invocations.md#multi-phase-assertions-with-argument-captors)
-  5. [Configuring verifications](docs/6-verifying-invocations.md#configuring-verifications)
-    1. [ignoreExtraArgs](docs/6-verifying-invocations.md#ignoreextraargs)
-    2. [times](docs/6-verifying-invocations.md#times)
+   1. [td.verify() API](docs/6-verifying-invocations.md#tdverify)
+   2. [equality argument matching](docs/6-verifying-invocations.md#arguments)
+   3. [argument matchers](docs/6-verifying-invocations.md#relaxing-verifications-with-argument-matchers)
+      1. [td.matchers.anything()](docs/6-verifying-invocations.md#tdmatchersanything)
+      2. [td.matchers.isA()](docs/6-verifying-invocations.md#tdmatchersisa)
+      3. [td.matchers.contains()](docs/6-verifying-invocations.md#tdmatcherscontains)
+         1. [matching strings](docs/6-verifying-invocations.md#strings)
+         2. [matching arrays](docs/6-verifying-invocations.md#arrays)
+         3. [matching objects](docs/6-verifying-invocations.md#objects)
+      4. [td.matchers.argThat()](docs/6-verifying-invocations.md#tdmatchersargthat)
+   4. [Argument captors](docs/6-verifying-invocations.md#multi-phase-assertions-with-argument-captors)
+   5. [Configuring verifications](docs/6-verifying-invocations.md#configuring-verifications)
+      1. [ignoreExtraArgs](docs/6-verifying-invocations.md#ignoreextraargs)
+      2. [times](docs/6-verifying-invocations.md#times)
 7. [Replacing dependencies with test doubles](docs/7-replacing-dependencies.md#replacing-real-dependencies-with-test-doubles)
-  1. [for Node.js](docs/7-replacing-dependencies.md#nodejs)
-  2. [for Browser JS](docs/7-replacing-dependencies.md#browser)
-  3. [td.replace() API](docs/7-replacing-dependencies.md#testdoublereplace-api)
+   1. [for Node.js](docs/7-replacing-dependencies.md#nodejs)
+   2. [for Browser JS](docs/7-replacing-dependencies.md#browser)
+   3. [td.replace() API](docs/7-replacing-dependencies.md#testdoublereplace-api)
 8. [Writing custom argument matchers](docs/8-custom-matchers.md#custom-argument-matchers)
 9. [Debugging with testdouble.js](docs/9-debugging.md#debugging-with-testdoublejs)
-  1. [td.explain() API](docs/9-debugging.md#tdexplainsometestdouble)
+   1. [td.explain() API](docs/9-debugging.md#tdexplainsometestdouble)
 10. [Plugins](docs/A-plugins.md#plugins)
-  1. [testdouble-chai](https://github.com/basecase/testdouble-chai)
-  2. [testdouble-jasmine](https://github.com/BrianGenisio/testdouble-jasmine)
+    1. [testdouble-chai](https://github.com/basecase/testdouble-chai)
+    2. [testdouble-jasmine](https://github.com/BrianGenisio/testdouble-jasmine)
 11. [Frequently Asked Questions](docs/B-frequently-asked-questions.md#frequently-asked-questions)
-  1. [Why doesn't `td.replace()` work with external CommonJS modules?](docs/B-frequently-asked-questions.md#why-doesnt-tdreplace-work-with-external-commonjs-modules)
-12. [Configuration](docs/C-configuration.md)
-  1. [td.config](docs/C-configuration.md#tdconfig)
+    1. [Why shouldn't I call both td.when and td.verify for a single interaction with a test double?](docs/B-frequently-asked-questions.md#why-shouldnt-i-call-both-tdwhen-and-tdverify-for-a-single-interaction-with-a-test-double)
+12. [Configuration](docs/C-configuration.md#configuration)
+    1. [td.config](docs/C-configuration.md#tdconfig)