better tests for recent bugs

tests/automated-better/event-data/events-function.js

@@ -53,23 +53,4 @@ describe('events as a function', function() {
 			}
 		});
 	});
-
-	it('works with a subsequent gotoDate', function(done) {
-		initCalendar({
-			defaultView: 'month',
-			defaultDate: '2017-03-30',
-			events: function(start, end, timezone, callback) {
-				setTimeout(function() {
-					callback([{
-						title: 'test',
-						start: '2017-03-15'
-					}]);
-					setTimeout(function() { // can simplify?
-						done();
-					}, 1000);
-				}, 1000);
-			}
-		});
-		currentCalendar.gotoDate('2017-03-01');
-	});
 });

tests/automated-better/view-dates/gotoDate.js

@@ -0,0 +1,29 @@
+
+describe('gotoDate', function() {
+
+	describe('when asynchronicity', function() {
+		pushOptions({
+			events: function(start, end, timezone, callback) {
+				setTimeout(function() {
+					callback([]);
+				}, 0);
+			}
+		});
+
+		it('works when called right after initialization', function() {
+			initCalendar({
+				defaultView: 'month',
+				defaultDate: '2017-03-30'
+			});
+			currentCalendar.gotoDate('2017-06-01');
+		});
+
+		it('works when called right after initialization when date already in range', function() {
+			initCalendar({
+				defaultView: 'month',
+				defaultDate: '2017-03-30'
+			});
+			currentCalendar.gotoDate('2017-03-01');
+		});
+	})
+});

tests/automated-better/view-type/changeView.js

@@ -25,4 +25,36 @@ describe('changeView', function() {
 		});
 		ViewDateUtils.expectActiveRange('2017-07-04', '2017-07-08');
 	});
+
+	describe('when switching away from view, then back', function() {
+		it('correctly renders original view again', function(done) {
+			var renderCalls = 0;
+
+			initCalendar({
+				defaultView: 'month',
+				eventAfterAllRender: function(view) {
+					renderCalls++;
+
+					switch (renderCalls) {
+						case 1:
+							expect(view.type).toBe('month');
+							currentCalendar.changeView('agendaWeek');
+							break;
+						case 2:
+							expect(view.type).toBe('agendaWeek');
+							currentCalendar.changeView('basicWeek');
+							break;
+						case 3:
+							expect(view.type).toBe('basicWeek');
+							currentCalendar.changeView('month');
+							break;
+						case 4:
+							expect(view.type).toBe('month');
+							done();
+							break;
+					}
+				}
+			});
+		});
+	});
 });