diff options
| author | Matt Ginzton | 2013-02-25 23:20:41 -0800 |
|---|---|---|
| committer | Igor Minar | 2013-02-25 23:52:12 -0800 |
| commit | 639786083151ff93d70d31332bad143483140de0 (patch) | |
| tree | 970c23187aee5455600aa6a7e3cd024811159f80 /src/ngMock/angular-mocks.js | |
| parent | 398691beb3fc40a481afa258d181de06ec0d153c (diff) | |
| download | angular.js-639786083151ff93d70d31332bad143483140de0.tar.bz2 | |
fix(ngMock): fix isSpecRunning to work for Mocha
When running inside Mocha, don't look in Jasmine's spec.queue.running.
It's not there. This is documented as issue #1467; I think this issue was
also responsible for #1589 and recent complaints in #1253.
Closes #1467.
Diffstat (limited to 'src/ngMock/angular-mocks.js')
| -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 3bd93a40..b588cd62 100644 --- a/src/ngMock/angular-mocks.js +++ b/src/ngMock/angular-mocks.js @@ -1677,7 +1677,7 @@ window.jstestdriver && (function(window) { }); function isSpecRunning() { - return currentSpec && currentSpec.queue.running; + return currentSpec && (window.mocha || currentSpec.queue.running); } /** |