@@ -52,11 +52,22 @@ describe('collapse directive', function() {
52
52
assertCallbacks ( { collapsed : true } ) ;
53
53
} ) ;
54
54
55
+ it ( 'should not trigger any animation on initialization if isCollapsed = true' , function ( ) {
56
+ var wrapperFn = function ( ) {
57
+ $animate . flush ( ) ;
58
+ } ;
59
+
60
+ scope . isCollapsed = true ;
61
+ compileFn ( scope ) ;
62
+ scope . $digest ( ) ;
63
+
64
+ expect ( wrapperFn ) . toThrowError ( / N o p e n d i n g a n i m a t i o n s r e a d y t o b e c l o s e d o r f l u s h e d / ) ;
65
+ } ) ;
66
+
55
67
it ( 'should collapse if isCollapsed = true on subsequent use' , function ( ) {
56
68
scope . isCollapsed = false ;
57
69
compileFn ( scope ) ;
58
70
scope . $digest ( ) ;
59
- $animate . flush ( ) ;
60
71
initCallbacks ( ) ;
61
72
scope . isCollapsed = true ;
62
73
scope . $digest ( ) ;
@@ -65,21 +76,38 @@ describe('collapse directive', function() {
65
76
assertCallbacks ( { collapsing : true , collapsed : true } ) ;
66
77
} ) ;
67
78
68
- it ( 'should be shown on initialization if isCollapsed = false ' , function ( ) {
79
+ it ( 'should show after toggled from collapsed ' , function ( ) {
69
80
initCallbacks ( ) ;
70
- scope . isCollapsed = false ;
81
+ scope . isCollapsed = true ;
71
82
compileFn ( scope ) ;
72
83
scope . $digest ( ) ;
84
+ expect ( element . height ( ) ) . toBe ( 0 ) ;
85
+ assertCallbacks ( { collapsed : true } ) ;
86
+ scope . collapsed . calls . reset ( ) ;
87
+
88
+ scope . isCollapsed = false ;
89
+ scope . $digest ( ) ;
73
90
$animate . flush ( ) ;
74
91
expect ( element . height ( ) ) . not . toBe ( 0 ) ;
75
92
assertCallbacks ( { expanding : true , expanded : true } ) ;
76
93
} ) ;
77
94
95
+ it ( 'should not trigger any animation on initialization if isCollapsed = false' , function ( ) {
96
+ var wrapperFn = function ( ) {
97
+ $animate . flush ( ) ;
98
+ } ;
99
+
100
+ scope . isCollapsed = false ;
101
+ compileFn ( scope ) ;
102
+ scope . $digest ( ) ;
103
+
104
+ expect ( wrapperFn ) . toThrowError ( / N o p e n d i n g a n i m a t i o n s r e a d y t o b e c l o s e d o r f l u s h e d / ) ;
105
+ } ) ;
106
+
78
107
it ( 'should expand if isCollapsed = false on subsequent use' , function ( ) {
79
108
scope . isCollapsed = false ;
80
109
compileFn ( scope ) ;
81
110
scope . $digest ( ) ;
82
- $animate . flush ( ) ;
83
111
scope . isCollapsed = true ;
84
112
scope . $digest ( ) ;
85
113
$animate . flush ( ) ;
@@ -95,7 +123,6 @@ describe('collapse directive', function() {
95
123
scope . isCollapsed = false ;
96
124
compileFn ( scope ) ;
97
125
scope . $digest ( ) ;
98
- $animate . flush ( ) ;
99
126
scope . isCollapsed = true ;
100
127
scope . $digest ( ) ;
101
128
$animate . flush ( ) ;
@@ -114,7 +141,6 @@ describe('collapse directive', function() {
114
141
scope . isCollapsed = false ;
115
142
compileFn ( scope ) ;
116
143
scope . $digest ( ) ;
117
- $animate . flush ( ) ;
118
144
expect ( element . attr ( 'aria-expanded' ) ) . toBe ( 'true' ) ;
119
145
120
146
scope . isCollapsed = true ;
@@ -127,7 +153,6 @@ describe('collapse directive', function() {
127
153
scope . isCollapsed = false ;
128
154
compileFn ( scope ) ;
129
155
scope . $digest ( ) ;
130
- $animate . flush ( ) ;
131
156
expect ( element . attr ( 'aria-hidden' ) ) . toBe ( 'false' ) ;
132
157
133
158
scope . isCollapsed = true ;
@@ -153,7 +178,6 @@ describe('collapse directive', function() {
153
178
scope . exp = false ;
154
179
scope . isCollapsed = false ;
155
180
scope . $digest ( ) ;
156
- $animate . flush ( ) ;
157
181
var collapseHeight = element . height ( ) ;
158
182
scope . exp = true ;
159
183
scope . $digest ( ) ;
@@ -164,7 +188,6 @@ describe('collapse directive', function() {
164
188
scope . exp = true ;
165
189
scope . isCollapsed = false ;
166
190
scope . $digest ( ) ;
167
- $animate . flush ( ) ;
168
191
var collapseHeight = element . height ( ) ;
169
192
scope . exp = false ;
170
193
scope . $digest ( ) ;
0 commit comments