From e544d5fa239166750fcdc30c9eddbe85f466e78d Mon Sep 17 00:00:00 2001 From: Sergei Z Date: Fri, 16 May 2014 21:18:19 +0200 Subject: [PATCH] feat(ngMock): add support of mocha tdd interface Closes #7489 --- src/ngMock/.jshintrc | 4 +--- src/ngMock/angular-mocks.js | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/ngMock/.jshintrc b/src/ngMock/.jshintrc index 46d8799bfc25..9d19c8f496ef 100644 --- a/src/ngMock/.jshintrc +++ b/src/ngMock/.jshintrc @@ -18,8 +18,6 @@ "browser": true, "globals": { "angular": false, - "expect": false, - "beforeEach": false, - "afterEach": false + "expect": false } } \ No newline at end of file diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js index ed944bb2b8be..a44b90b5aa3e 100644 --- a/src/ngMock/angular-mocks.js +++ b/src/ngMock/angular-mocks.js @@ -1976,11 +1976,11 @@ if(window.jasmine || window.mocha) { }; - beforeEach(function() { + (window.beforeEach || window.setup)(function() { currentSpec = this; }); - afterEach(function() { + (window.afterEach || window.teardown)(function() { var injector = currentSpec.$injector; currentSpec.$injector = null;