aboutsummaryrefslogtreecommitdiffstats
path: root/test/ng
diff options
context:
space:
mode:
authorMatias Niemelä2014-01-22 19:28:42 -0500
committerMatias Niemelä2014-02-06 01:22:14 -0500
commit4224cd5182bc93e4a210f75e0a4e4de7f3c544e8 (patch)
treef5fac86882816fc273975118b6f262f089436d3b /test/ng
parent906fdad0f95465842e336e057ea97d0633712189 (diff)
downloadangular.js-4224cd5182bc93e4a210f75e0a4e4de7f3c544e8.tar.bz2
fix(mocks): rename mock.animate to ngAnimateMock and ensure it contains all test helper code for ngAnimate
Closes #5822 Closes #5917
Diffstat (limited to 'test/ng')
-rwxr-xr-xtest/ng/compileSpec.js2
-rw-r--r--test/ng/directive/ngClassSpec.js4
-rwxr-xr-xtest/ng/directive/ngIfSpec.js2
-rw-r--r--test/ng/directive/ngIncludeSpec.js4
-rw-r--r--test/ng/directive/ngRepeatSpec.js2
-rw-r--r--test/ng/directive/ngShowHideSpec.js2
-rw-r--r--test/ng/directive/ngSwitchSpec.js2
7 files changed, 9 insertions, 9 deletions
diff --git a/test/ng/compileSpec.js b/test/ng/compileSpec.js
index c8cb70f8..085eb6e9 100755
--- a/test/ng/compileSpec.js
+++ b/test/ng/compileSpec.js
@@ -4490,7 +4490,7 @@ describe('$compile', function() {
describe('$animate animation hooks', function() {
- beforeEach(module('mock.animate'));
+ beforeEach(module('ngAnimateMock'));
it('should automatically fire the addClass and removeClass animation hooks',
inject(function($compile, $animate, $rootScope) {
diff --git a/test/ng/directive/ngClassSpec.js b/test/ng/directive/ngClassSpec.js
index 976c0c3f..b162fea6 100644
--- a/test/ng/directive/ngClassSpec.js
+++ b/test/ng/directive/ngClassSpec.js
@@ -309,7 +309,7 @@ describe('ngClass animations', function() {
var body, element, $rootElement;
it("should avoid calling addClass accidentally when removeClass is going on", function() {
- module('mock.animate');
+ module('ngAnimateMock');
inject(function($compile, $rootScope, $animate, $timeout) {
var element = angular.element('<div ng-class="val"></div>');
var body = jqLite(document.body);
@@ -416,7 +416,7 @@ describe('ngClass animations', function() {
});
it("should not remove classes if they're going to be added back right after", function() {
- module('mock.animate');
+ module('ngAnimateMock');
inject(function($rootScope, $compile, $animate) {
var className;
diff --git a/test/ng/directive/ngIfSpec.js b/test/ng/directive/ngIfSpec.js
index 81b54123..d40e6812 100755
--- a/test/ng/directive/ngIfSpec.js
+++ b/test/ng/directive/ngIfSpec.js
@@ -210,7 +210,7 @@ describe('ngIf animations', function () {
return element;
}
- beforeEach(module('mock.animate'));
+ beforeEach(module('ngAnimateMock'));
beforeEach(module(function() {
// we need to run animation on attached elements;
diff --git a/test/ng/directive/ngIncludeSpec.js b/test/ng/directive/ngIncludeSpec.js
index 38038559..ebb35147 100644
--- a/test/ng/directive/ngIncludeSpec.js
+++ b/test/ng/directive/ngIncludeSpec.js
@@ -353,7 +353,7 @@ describe('ngInclude', function() {
};
}
- beforeEach(module(spyOnAnchorScroll(), 'mock.animate'));
+ beforeEach(module(spyOnAnchorScroll(), 'ngAnimateMock'));
beforeEach(inject(
putIntoCache('template.html', 'CONTENT'),
putIntoCache('another.html', 'CONTENT')));
@@ -589,7 +589,7 @@ describe('ngInclude animations', function() {
dealoc(element);
});
- beforeEach(module('mock.animate'));
+ beforeEach(module('ngAnimateMock'));
afterEach(function(){
dealoc(element);
diff --git a/test/ng/directive/ngRepeatSpec.js b/test/ng/directive/ngRepeatSpec.js
index 8bcb9283..b672f86f 100644
--- a/test/ng/directive/ngRepeatSpec.js
+++ b/test/ng/directive/ngRepeatSpec.js
@@ -1149,7 +1149,7 @@ describe('ngRepeat animations', function() {
return element;
}
- beforeEach(module('mock.animate'));
+ beforeEach(module('ngAnimateMock'));
beforeEach(module(function() {
// we need to run animation on attached elements;
diff --git a/test/ng/directive/ngShowHideSpec.js b/test/ng/directive/ngShowHideSpec.js
index 8a25843c..4bbbbb78 100644
--- a/test/ng/directive/ngShowHideSpec.js
+++ b/test/ng/directive/ngShowHideSpec.js
@@ -73,7 +73,7 @@ describe('ngShow / ngHide animations', function() {
body.removeAttr('ng-animation-running');
});
- beforeEach(module('mock.animate'));
+ beforeEach(module('ngAnimateMock'));
beforeEach(module(function($animateProvider, $provide) {
return function(_$rootElement_) {
diff --git a/test/ng/directive/ngSwitchSpec.js b/test/ng/directive/ngSwitchSpec.js
index a8c91359..e039c4d5 100644
--- a/test/ng/directive/ngSwitchSpec.js
+++ b/test/ng/directive/ngSwitchSpec.js
@@ -223,7 +223,7 @@ describe('ngSwitch animations', function() {
return element;
}
- beforeEach(module('mock.animate'));
+ beforeEach(module('ngAnimateMock'));
beforeEach(module(function() {
// we need to run animation on attached elements;