diff options
| author | John Papa | 2014-01-07 07:33:39 -0500 |
|---|---|---|
| committer | Igor Minar | 2014-01-27 22:26:18 -0800 |
| commit | 95f0bf9b526fda8964527c6d4aef1ad50a47f1f3 (patch) | |
| tree | f384e15c4b90e87ea75450acb1104e6dca0b2cb5 | |
| parent | 8a0be355a9685d9fbdb4989513c4374c2b5470d7 (diff) | |
| download | angular.js-95f0bf9b526fda8964527c6d4aef1ad50a47f1f3.tar.bz2 | |
fix(mocks): refactor currentSpec to work w/ Jasmine 2
Closes #5662
| -rw-r--r-- | src/ngMock/angular-mocks.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js index 74b9c2d6..b09d26cd 100644 --- a/src/ngMock/angular-mocks.js +++ b/src/ngMock/angular-mocks.js @@ -1947,7 +1947,7 @@ if(window.jasmine || window.mocha) { var currentSpec = null, isSpecRunning = function() { - return currentSpec && (window.mocha || currentSpec.queue.running); + return !!currentSpec; }; |