From 639786083151ff93d70d31332bad143483140de0 Mon Sep 17 00:00:00 2001
From: Matt Ginzton
Date: Mon, 25 Feb 2013 23:20:41 -0800
Subject: 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.
---
 src/ngMock/angular-mocks.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ngMock/angular-mocks.js')

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);
   }
 
   /**
-- 
cgit v1.2.3