aboutsummaryrefslogtreecommitdiffstats
path: root/test/ng/directive/ngShowHideSpec.js
diff options
context:
space:
mode:
authorMatias Niemelàˆ2013-05-07 17:11:39 -0400
committerMisko Hevery2013-05-08 16:03:31 -0700
commit11f712bc3e310302eb2e8691cf6d110bdcde1810 (patch)
tree5e8b27a3dc2a8b0b18a4e0560f21f007206772b5 /test/ng/directive/ngShowHideSpec.js
parent14757874a7cea7961f31211b245c417bd4b20512 (diff)
downloadangular.js-11f712bc3e310302eb2e8691cf6d110bdcde1810.tar.bz2
chore(ngAnimate): CSS classes X-setup/X-start -> X/X-active
BREAKING CHANGE: css classes foo-setup/foo-start become foo/foo-active The CSS transition classes have changed suffixes. To migrate rename .foo-setup {...} to .foo {...} .foo-start {...} to .foo-active {...} or for type: enter, leave, move, show, hide .foo-type-setup {...} to .foo-type {...} .foo-type-start {...} to .foo-type-active {...}
Diffstat (limited to 'test/ng/directive/ngShowHideSpec.js')
-rw-r--r--test/ng/directive/ngShowHideSpec.js32
1 files changed, 16 insertions, 16 deletions
diff --git a/test/ng/directive/ngShowHideSpec.js b/test/ng/directive/ngShowHideSpec.js
index 46bef95d..9b95440d 100644
--- a/test/ng/directive/ngShowHideSpec.js
+++ b/test/ng/directive/ngShowHideSpec.js
@@ -88,31 +88,31 @@ describe('ngShow / ngHide - ngAnimate', function() {
$scope.$digest();
if ($sniffer.transitions) {
- expect(element.attr('class')).toContain('custom-show-setup');
+ expect(element.attr('class')).toContain('custom-show');
window.setTimeout.expect(1).process();
- expect(element.attr('class')).toContain('custom-show-start');
+ expect(element.attr('class')).toContain('custom-show-active');
window.setTimeout.expect(1000).process();
} else {
expect(window.setTimeout.queue).toEqual([]);
}
- expect(element.attr('class')).not.toContain('custom-show-start');
- expect(element.attr('class')).not.toContain('custom-show-setup');
+ expect(element.attr('class')).not.toContain('custom-show-active');
+ expect(element.attr('class')).not.toContain('custom-show');
$scope.on = false;
$scope.$digest();
if ($sniffer.transitions) {
- expect(element.attr('class')).toContain('custom-hide-setup');
+ expect(element.attr('class')).toContain('custom-hide');
window.setTimeout.expect(1).process();
- expect(element.attr('class')).toContain('custom-hide-start');
+ expect(element.attr('class')).toContain('custom-hide-active');
window.setTimeout.expect(1000).process();
} else {
expect(window.setTimeout.queue).toEqual([]);
}
- expect(element.attr('class')).not.toContain('custom-hide-start');
- expect(element.attr('class')).not.toContain('custom-hide-setup');
+ expect(element.attr('class')).not.toContain('custom-hide-active');
+ expect(element.attr('class')).not.toContain('custom-hide');
}));
it('should skip animation if parent animation running', function() {
@@ -158,32 +158,32 @@ describe('ngShow / ngHide - ngAnimate', function() {
$scope.$digest();
if ($sniffer.transitions) {
- expect(element.attr('class')).toContain('custom-hide-setup');
+ expect(element.attr('class')).toContain('custom-hide');
window.setTimeout.expect(1).process();
- expect(element.attr('class')).toContain('custom-hide-start');
+ expect(element.attr('class')).toContain('custom-hide-active');
window.setTimeout.expect(1000).process();
} else {
expect(window.setTimeout.queue).toEqual([]);
}
- expect(element.attr('class')).not.toContain('custom-hide-start');
- expect(element.attr('class')).not.toContain('custom-hide-setup');
+ expect(element.attr('class')).not.toContain('custom-hide-active');
+ expect(element.attr('class')).not.toContain('custom-hide');
$scope.off = false;
$scope.$digest();
if ($sniffer.transitions) {
- expect(element.attr('class')).toContain('custom-show-setup');
+ expect(element.attr('class')).toContain('custom-show');
window.setTimeout.expect(1).process();
- expect(element.attr('class')).toContain('custom-show-start');
+ expect(element.attr('class')).toContain('custom-show-active');
window.setTimeout.expect(1000).process();
} else {
expect(window.setTimeout.queue).toEqual([]);
}
- expect(element.attr('class')).not.toContain('custom-show-start');
- expect(element.attr('class')).not.toContain('custom-show-setup');
+ expect(element.attr('class')).not.toContain('custom-show-active');
+ expect(element.attr('class')).not.toContain('custom-show');
}));
it('should disable animation when parent animation is running', function() {