Merge branch 'enelson/spyobjproperty' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/spyobjproperty

- Merges #1722 from @elliot-nelson
- Closes #1569
- Fixes #1442
This commit is contained in:
Gregg Van Hove
2019-06-25 16:25:19 -07:00
6 changed files with 136 additions and 43 deletions

View File

@@ -788,8 +788,8 @@ getJasmineRequireObj().Env = function(j$) {
return spyFactory.createSpy(name, originalFn);
};
this.createSpyObj = function(baseName, methodNames) {
return spyFactory.createSpyObj(baseName, methodNames);
this.createSpyObj = function(baseName, methodNames, propertyNames) {
return spyFactory.createSpyObj(baseName, methodNames, propertyNames);
};
var ensureIsFunction = function(fn, caller) {