Просмотр исходного кода

simply bad async tests now that core is better

Adam Shaw 9 лет назад
Родитель
Сommit
4b7b8e31a7
3 измененных файлов с 25 добавлено и 24 удалено
  1. 2 4
      tests/automated/event-dnd.js
  2. 2 4
      tests/automated/event-resize.js
  3. 21 16
      tests/automated/removeEventSource.js

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

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

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

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

+ 21 - 16
tests/automated/removeEventSource.js

@@ -141,13 +141,14 @@ describe('removeEventSource', function() {
 		it('correctly removes events provided via `events` at initialization', function(done) {
 			var callCnt = 0;
 			options.eventAfterAllRender = function() {
-				if (!(callCnt++)) { // only the first time
+				callCnt++;
+				if (callCnt === 1) {
 					expectEventCnt(2);
 					$('#cal').fullCalendar('removeEventSource', eventInput);
-					setTimeout(function() { // because event rerender will queue up for later
-						expectEventCnt(0);
-						done();
-					}, 0);
+				}
+				else if (callCnt === 2) {
+					expectEventCnt(0);
+					done();
 				}
 			};
 			options.events = eventInput;
@@ -157,13 +158,14 @@ describe('removeEventSource', function() {
 		it('correctly removes events provided via `eventSources` at initialization', function(done) {
 			var callCnt = 0;
 			options.eventAfterAllRender = function() {
-				if (!(callCnt++)) { // only the first time
+				callCnt++;
+				if (callCnt === 1) {
 					expectEventCnt(2);
 					$('#cal').fullCalendar('removeEventSource', eventInput);
-					setTimeout(function() { // because event rerender will queue up for later
-						expectEventCnt(0);
-						done();
-					}, 0);
+				}
+				else if (callCnt === 2) {
+					expectEventCnt(0);
+					done();
 				}
 			};
 			options.eventSources = [ eventInput ];
@@ -173,17 +175,20 @@ describe('removeEventSource', function() {
 		it('correctly removes events provided via `addEventSource` method', function(done) {
 			var callCnt = 0;
 			options.eventAfterAllRender = function() {
-				if ((callCnt++) === 1) { // the second time (the first time is upon initial render)
+				callCnt++;
+				if (callCnt === 1) {
+					$('#cal').fullCalendar('addEventSource', eventInput);
+				}
+				else if (callCnt === 2) {
 					expectEventCnt(2);
 					$('#cal').fullCalendar('removeEventSource', eventInput);
-					setTimeout(function() { // because event rerender will queue up for later
-						expectEventCnt(0);
-						done();
-					}, 0);
+				}
+				else if (callCnt === 3) {
+					expectEventCnt(0);
+					done();
 				}
 			};
 			$('#cal').fullCalendar(options);
-			$('#cal').fullCalendar('addEventSource', eventInput);
 		});
 	}