aboutsummaryrefslogtreecommitdiffstats
path: root/test/ng/directive
diff options
context:
space:
mode:
authorMatias Niemelä2013-05-07 10:29:29 -0400
committerMisko Hevery2013-05-08 15:40:37 -0700
commit88c3480aff79e1ff5b1ed8bd7f1e05df8ea1e068 (patch)
tree1eb4e66c454fdb802d080096209c111e8d22b733 /test/ng/directive
parent0cb04e2e9171ca60d4779cb9e0b4fe73f0926ace (diff)
downloadangular.js-88c3480aff79e1ff5b1ed8bd7f1e05df8ea1e068.tar.bz2
feat($sniffer): Add support for supportsAnimations flag for detecting CSS Animations browser support
Diffstat (limited to 'test/ng/directive')
-rwxr-xr-xtest/ng/directive/ngIfSpec.js10
-rw-r--r--test/ng/directive/ngIncludeSpec.js6
-rw-r--r--test/ng/directive/ngRepeatSpec.js8
-rw-r--r--test/ng/directive/ngShowHideSpec.js10
-rw-r--r--test/ng/directive/ngSwitchSpec.js12
-rw-r--r--test/ng/directive/ngViewSpec.js12
6 files changed, 29 insertions, 29 deletions
diff --git a/test/ng/directive/ngIfSpec.js b/test/ng/directive/ngIfSpec.js
index 081ba5bf..3fa523a7 100755
--- a/test/ng/directive/ngIfSpec.js
+++ b/test/ng/directive/ngIfSpec.js
@@ -120,7 +120,7 @@ describe('ngIf ngAnimate', function () {
expect(element.children().length).toBe(1);
var first = element.children()[0];
- if ($sniffer.supportsTransitions) {
+ if ($sniffer.transitions) {
expect(first.className).toContain('custom-enter-setup');
window.setTimeout.expect(1).process();
expect(first.className).toContain('custom-enter-start');
@@ -147,7 +147,7 @@ describe('ngIf ngAnimate', function () {
expect(element.children().length).toBe(1);
var first = element.children()[0];
- if ($sniffer.supportsTransitions) {
+ if ($sniffer.transitions) {
window.setTimeout.expect(1).process();
window.setTimeout.expect(1000).process();
} else {
@@ -155,9 +155,9 @@ describe('ngIf ngAnimate', function () {
}
$scope.$apply('value = false');
- expect(element.children().length).toBe($sniffer.supportsTransitions ? 1 : 0);
+ expect(element.children().length).toBe($sniffer.transitions ? 1 : 0);
- if ($sniffer.supportsTransitions) {
+ if ($sniffer.transitions) {
expect(first.className).toContain('custom-leave-setup');
window.setTimeout.expect(1).process();
expect(first.className).toContain('custom-leave-start');
@@ -180,7 +180,7 @@ describe('ngIf ngAnimate', function () {
))($scope);
$scope.$apply('value = true');
- if ($sniffer.supportsTransitions) {
+ if ($sniffer.transitions) {
window.setTimeout.expect(1).process();
window.setTimeout.expect(500).process();
} else {
diff --git a/test/ng/directive/ngIncludeSpec.js b/test/ng/directive/ngIncludeSpec.js
index 1ce55bb4..46507041 100644
--- a/test/ng/directive/ngIncludeSpec.js
+++ b/test/ng/directive/ngIncludeSpec.js
@@ -351,7 +351,7 @@ describe('ngInclude ngAnimate', function() {
var child = jqLite(element.children()[0]);
applyCSS(child, 'transition', '1s linear all');
- if ($sniffer.supportsTransitions) {
+ if ($sniffer.transitions) {
expect(child.attr('class')).toContain('custom-enter-setup');
window.setTimeout.expect(1).process();
@@ -384,7 +384,7 @@ describe('ngInclude ngAnimate', function() {
$rootScope.tpl = '';
$rootScope.$digest();
- if ($sniffer.supportsTransitions) {
+ if ($sniffer.transitions) {
expect(child.attr('class')).toContain('custom-leave-setup');
window.setTimeout.expect(1).process();
@@ -417,7 +417,7 @@ describe('ngInclude ngAnimate', function() {
$rootScope.tpl = 'enter';
$rootScope.$digest();
- if ($sniffer.supportsTransitions) {
+ if ($sniffer.transitions) {
window.setTimeout.expect(1).process();
window.setTimeout.expect(500).process();
} else {
diff --git a/test/ng/directive/ngRepeatSpec.js b/test/ng/directive/ngRepeatSpec.js
index ac1ce7e7..91dcd27f 100644
--- a/test/ng/directive/ngRepeatSpec.js
+++ b/test/ng/directive/ngRepeatSpec.js
@@ -608,7 +608,7 @@ describe('ngRepeat ngAnimate', function() {
applyCSS(kids[i], 'transition', '1s linear all');
}
- if ($sniffer.supportsTransitions) {
+ if ($sniffer.transitions) {
angular.forEach(kids, function(kid) {
expect(kid.attr('class')).toContain('custom-enter-setup');
window.setTimeout.expect(1).process();
@@ -654,7 +654,7 @@ describe('ngRepeat ngAnimate', function() {
//the last element gets pushed down when it animates
var kid = jqLite(element.children()[1]);
- if ($sniffer.supportsTransitions) {
+ if ($sniffer.transitions) {
expect(kid.attr('class')).toContain('custom-leave-setup');
window.setTimeout.expect(1).process();
expect(kid.attr('class')).toContain('custom-leave-start');
@@ -696,7 +696,7 @@ describe('ngRepeat ngAnimate', function() {
var left = jqLite(kids[1]);
var right = jqLite(kids[2]);
- if ($sniffer.supportsTransitions) {
+ if ($sniffer.transitions) {
expect(first.attr('class')).toContain('custom-move-setup');
window.setTimeout.expect(1).process();
expect(left.attr('class')).toContain('custom-move-setup');
@@ -743,7 +743,7 @@ describe('ngRepeat ngAnimate', function() {
applyCSS(first, cssProp, cssValue);
applyCSS(second, cssProp, cssValue);
- if ($sniffer.supportsTransitions) {
+ if ($sniffer.transitions) {
window.setTimeout.expect(1).process();
window.setTimeout.expect(1).process();
window.setTimeout.expect(500).process();
diff --git a/test/ng/directive/ngShowHideSpec.js b/test/ng/directive/ngShowHideSpec.js
index ecc5b2dc..46bef95d 100644
--- a/test/ng/directive/ngShowHideSpec.js
+++ b/test/ng/directive/ngShowHideSpec.js
@@ -87,7 +87,7 @@ describe('ngShow / ngHide - ngAnimate', function() {
))($scope);
$scope.$digest();
- if ($sniffer.supportsTransitions) {
+ if ($sniffer.transitions) {
expect(element.attr('class')).toContain('custom-show-setup');
window.setTimeout.expect(1).process();
@@ -102,7 +102,7 @@ describe('ngShow / ngHide - ngAnimate', function() {
$scope.on = false;
$scope.$digest();
- if ($sniffer.supportsTransitions) {
+ if ($sniffer.transitions) {
expect(element.attr('class')).toContain('custom-hide-setup');
window.setTimeout.expect(1).process();
expect(element.attr('class')).toContain('custom-hide-start');
@@ -133,7 +133,7 @@ describe('ngShow / ngHide - ngAnimate', function() {
$rootElement.controller('ngAnimate').running = false;
$rootScope.val = false;
$rootScope.$digest();
- if ($sniffer.supportsTransitions) {
+ if ($sniffer.transitions) {
window.setTimeout.expect(1).process();
window.setTimeout.expect(0).process();
} else {
@@ -157,7 +157,7 @@ describe('ngShow / ngHide - ngAnimate', function() {
))($scope);
$scope.$digest();
- if ($sniffer.supportsTransitions) {
+ if ($sniffer.transitions) {
expect(element.attr('class')).toContain('custom-hide-setup');
window.setTimeout.expect(1).process();
@@ -173,7 +173,7 @@ describe('ngShow / ngHide - ngAnimate', function() {
$scope.off = false;
$scope.$digest();
- if ($sniffer.supportsTransitions) {
+ if ($sniffer.transitions) {
expect(element.attr('class')).toContain('custom-show-setup');
window.setTimeout.expect(1).process();
expect(element.attr('class')).toContain('custom-show-start');
diff --git a/test/ng/directive/ngSwitchSpec.js b/test/ng/directive/ngSwitchSpec.js
index ee51e194..373ce4e1 100644
--- a/test/ng/directive/ngSwitchSpec.js
+++ b/test/ng/directive/ngSwitchSpec.js
@@ -261,7 +261,7 @@ describe('ngSwitch ngAnimate', function() {
expect(element.children().length).toBe(1);
var first = element.children()[0];
- if ($sniffer.supportsTransitions) {
+ if ($sniffer.transitions) {
expect(first.className).toContain('cool-enter-setup');
window.setTimeout.expect(1).process();
@@ -292,7 +292,7 @@ describe('ngSwitch ngAnimate', function() {
$scope.val = 'two';
$scope.$digest();
- if ($sniffer.supportsTransitions) {
+ if ($sniffer.transitions) {
window.setTimeout.expect(1).process();
window.setTimeout.expect(1000).process();
} else {
@@ -302,11 +302,11 @@ describe('ngSwitch ngAnimate', function() {
$scope.val = 'three';
$scope.$digest();
- expect(element.children().length).toBe($sniffer.supportsTransitions ? 2 : 1);
+ expect(element.children().length).toBe($sniffer.transitions ? 2 : 1);
var first = element.children()[0];
- if ($sniffer.supportsTransitions) {
+ if ($sniffer.transitions) {
expect(first.className).toContain('cool-leave-setup');
window.setTimeout.expect(1).process();
window.setTimeout.expect(1).process();
@@ -315,7 +315,7 @@ describe('ngSwitch ngAnimate', function() {
}
- if ($sniffer.supportsTransitions) {
+ if ($sniffer.transitions) {
expect(first.className).toContain('cool-leave-start');
window.setTimeout.expect(1000).process();
window.setTimeout.expect(1000).process();
@@ -339,7 +339,7 @@ describe('ngSwitch ngAnimate', function() {
$rootScope.val = 'one';
$rootScope.$digest();
- if ($sniffer.supportsTransitions) {
+ if ($sniffer.transitions) {
window.setTimeout.expect(1).process();
window.setTimeout.expect(500).process();
} else {
diff --git a/test/ng/directive/ngViewSpec.js b/test/ng/directive/ngViewSpec.js
index c31c2449..908408b3 100644
--- a/test/ng/directive/ngViewSpec.js
+++ b/test/ng/directive/ngViewSpec.js
@@ -554,7 +554,7 @@ describe('ngView', function() {
var child = jqLite(element.children()[0]);
applyCSS(child, 'transition', '1s linear all');
- if ($sniffer.supportsTransitions) {
+ if ($sniffer.transitions) {
expect(child.attr('class')).toContain('custom-enter-setup');
window.setTimeout.expect(1).process();
@@ -583,7 +583,7 @@ describe('ngView', function() {
$location.path('/');
$rootScope.$digest();
- if ($sniffer.supportsTransitions) {
+ if ($sniffer.transitions) {
expect(child.attr('class')).toContain('custom-leave-setup');
window.setTimeout.expect(1).process();
@@ -614,9 +614,9 @@ describe('ngView', function() {
var child = jqLite(element.children()[0]);
applyCSS(child, 'transition', '0.5s linear all');
- if($sniffer.supportsTransitions) {
+ if($sniffer.transitions) {
window.setTimeout.expect(1).process();
- window.setTimeout.expect($sniffer.supportsTransitions ? 500 : 0).process();
+ window.setTimeout.expect($sniffer.transitions ? 500 : 0).process();
} else {
expect(window.setTimeout.queue).toEqual([]);
}
@@ -641,7 +641,7 @@ describe('ngView', function() {
$location.path('/foo');
$rootScope.$digest();
- if ($sniffer.supportsTransitions) {
+ if ($sniffer.transitions) {
$window.setTimeout.expect(1).process();
$window.setTimeout.expect(0).process();
}
@@ -650,7 +650,7 @@ describe('ngView', function() {
$location.path('/bar');
$rootScope.$digest();
expect(n(element.text())).toEqual('1234');
- if ($sniffer.supportsTransitions) {
+ if ($sniffer.transitions) {
$window.setTimeout.expect(1).process();
$window.setTimeout.expect(1).process();
} else {