Przeglądaj źródła

make tests less fragile

Adam Shaw 9 lat temu
rodzic
commit
2539568721

+ 4 - 2
tests/automated/event-dnd.js

@@ -390,8 +390,10 @@ describe('eventDrop', function() {
 
 		options.eventAfterAllRender = function() {
 			if (!eventsRendered) { // because event rerendering will happen upon drop
-				dragFunc();
-				eventsRendered = true;
+				setTimeout(function() { // because initial scroll state and/or height freezing might not be done
+					dragFunc();
+					eventsRendered = true;
+				}, 0);
 			}
 		};
 		options.eventDragStart = function(event, jsEvent, uiEvent, view) {

+ 4 - 2
tests/automated/event-resize.js

@@ -460,8 +460,10 @@ describe('eventResize', function() {
 
 		options.eventAfterAllRender = function() {
 			if (!eventsRendered) { // because event rerendering will happen when resize is over
-				resizeStartFunc();
-				eventsRendered = true;
+				setTimeout(function() { // because initial scroll state and/or height freezing might not be done
+					resizeStartFunc();
+					eventsRendered = true;
+				}, 0);
 			}
 		};
 		options.eventResizeStart = function(event, jsEvent, uiEvent, view) {

+ 1 - 1
tests/automated/refetchEvents.js

@@ -115,7 +115,7 @@ describe('refetchEvents', function() {
 							expect($('.fetch0').length).toEqual(0);
 							expect($('.fetch1').length).toEqual(3);
 							done();
-						}, 101);
+						}, 200);
 					}
 				};
 

+ 12 - 6
tests/automated/removeEventSource.js

@@ -144,8 +144,10 @@ describe('removeEventSource', function() {
 				if (!(callCnt++)) { // only the first time
 					expectEventCnt(2);
 					$('#cal').fullCalendar('removeEventSource', eventInput);
-					expectEventCnt(0);
-					done();
+					setTimeout(function() { // because event rerender will queue up for later
+						expectEventCnt(0);
+						done();
+					}, 0);
 				}
 			};
 			options.events = eventInput;
@@ -158,8 +160,10 @@ describe('removeEventSource', function() {
 				if (!(callCnt++)) { // only the first time
 					expectEventCnt(2);
 					$('#cal').fullCalendar('removeEventSource', eventInput);
-					expectEventCnt(0);
-					done();
+					setTimeout(function() { // because event rerender will queue up for later
+						expectEventCnt(0);
+						done();
+					}, 0);
 				}
 			};
 			options.eventSources = [ eventInput ];
@@ -172,8 +176,10 @@ describe('removeEventSource', function() {
 				if ((callCnt++) === 1) { // the second time (the first time is upon initial render)
 					expectEventCnt(2);
 					$('#cal').fullCalendar('removeEventSource', eventInput);
-					expectEventCnt(0);
-					done();
+					setTimeout(function() { // because event rerender will queue up for later
+						expectEventCnt(0);
+						done();
+					}, 0);
 				}
 			};
 			$('#cal').fullCalendar(options);