module ViewDateUtils

tests/view-dates/ViewDateUtils.js

@@ -1,26 +1,23 @@
 
-var ViewDateUtils = {
+export function expectRenderRange(start, end) {
+	var currentView = currentCalendar.getView();
+	var dateProfile = currentView.dateProfile;
 
-	expectRenderRange: function(start, end) {
-		var currentView = currentCalendar.getView();
-		var dateProfile = currentView.dateProfile;
+	var renderRangeStart = currentCalendar.msToUtcMoment(dateProfile.renderUnzonedRange.startMs, dateProfile.isRangeAllDay);
+	var renderRangeEnd = currentCalendar.msToUtcMoment(dateProfile.renderUnzonedRange.endMs, dateProfile.isRangeAllDay);
 
-		var renderRangeStart = currentCalendar.msToUtcMoment(dateProfile.renderUnzonedRange.startMs, dateProfile.isRangeAllDay);
-		var renderRangeEnd = currentCalendar.msToUtcMoment(dateProfile.renderUnzonedRange.endMs, dateProfile.isRangeAllDay);
+	expect(renderRangeStart).toEqualMoment(start);
+	expect(renderRangeEnd).toEqualMoment(end);
+}
 
-		expect(renderRangeStart).toEqualMoment(start);
-		expect(renderRangeEnd).toEqualMoment(end);
-	},
 
-	expectActiveRange: function(start, end) {
-		var currentView = currentCalendar.getView();
-		var dateProfile = currentView.dateProfile;
+export function expectActiveRange(start, end) {
+	var currentView = currentCalendar.getView();
+	var dateProfile = currentView.dateProfile;
 
-		var activeRangeStart = currentCalendar.msToUtcMoment(dateProfile.activeUnzonedRange.startMs, dateProfile.isRangeAllDay);
-		var activeRangeEnd = currentCalendar.msToUtcMoment(dateProfile.activeUnzonedRange.endMs, dateProfile.isRangeAllDay);
+	var activeRangeStart = currentCalendar.msToUtcMoment(dateProfile.activeUnzonedRange.startMs, dateProfile.isRangeAllDay);
+	var activeRangeEnd = currentCalendar.msToUtcMoment(dateProfile.activeUnzonedRange.endMs, dateProfile.isRangeAllDay);
 
-		expect(activeRangeStart).toEqualMoment(start);
-		expect(activeRangeEnd).toEqualMoment(end);
-	}
-
-};
+	expect(activeRangeStart).toEqualMoment(start);
+	expect(activeRangeEnd).toEqualMoment(end);
+}

tests/view-dates/dateAlignment.js

@@ -1,3 +1,4 @@
+import { expectActiveRange } from './ViewDateUtils';
 
 /*
 SEE ALSO: next/prev
@@ -16,7 +17,7 @@ describe('dateAlignment', function() {
 
 		it('aligns with the week', function() {
 			initCalendar();
-			ViewDateUtils.expectActiveRange('2017-06-11', '2017-06-14');
+			expectActiveRange('2017-06-11', '2017-06-14');
 		});
 	});
 
@@ -28,7 +29,7 @@ describe('dateAlignment', function() {
 
 		it('aligns with first visible day of the week', function() {
 			initCalendar();
-			ViewDateUtils.expectActiveRange('2017-06-12', '2017-06-17');
+			expectActiveRange('2017-06-12', '2017-06-17');
 		});
 	});
 });

tests/view-dates/dayCount.js

@@ -1,3 +1,4 @@
+import { expectActiveRange } from './ViewDateUtils';
 
 describe('dayCount', function() {
 	pushOptions({
@@ -22,7 +23,7 @@ describe('dayCount', function() {
 	}, function() {
 		it('renders the exact day count', function() {
 			initCalendar();
-			ViewDateUtils.expectActiveRange('2017-03-15', '2017-03-22');
+			expectActiveRange('2017-03-15', '2017-03-22');
 			ViewRenderUtils.expectDay('2017-03-15', true);
 			ViewRenderUtils.expectDay('2017-03-16', true);
 			ViewRenderUtils.expectDay('2017-03-17', true);
@@ -38,7 +39,7 @@ describe('dayCount', function() {
 			defaultView: 'agenda',
 			dayCount: 9
 		});
-		ViewDateUtils.expectActiveRange('2017-03-15', '2017-03-28');
+		expectActiveRange('2017-03-15', '2017-03-28');
 		ViewRenderUtils.expectDay('2017-03-15', true);
 		ViewRenderUtils.expectDay('2017-03-16', true);
 		ViewRenderUtils.expectDay('2017-03-17', true);

tests/view-dates/next.js

@@ -1,3 +1,4 @@
+import { expectActiveRange } from './ViewDateUtils';
 
 describe('next', function() {
 	pushOptions({
@@ -13,7 +14,7 @@ describe('next', function() {
 			it('moves forward by one week', function() {
 				initCalendar();
 				currentCalendar.next();
-				ViewDateUtils.expectActiveRange('2017-06-11', '2017-06-18');
+				expectActiveRange('2017-06-11', '2017-06-18');
 			});
 		})
 
@@ -25,7 +26,7 @@ describe('next', function() {
 			it('moves forward by two weeks', function() {
 				initCalendar();
 				currentCalendar.next();
-				ViewDateUtils.expectActiveRange('2017-06-18', '2017-06-25');
+				expectActiveRange('2017-06-18', '2017-06-25');
 			});
 		});
 
@@ -46,7 +47,7 @@ describe('next', function() {
 			it('moves forward by one month', function() {
 				initCalendar();
 				currentCalendar.next();
-				ViewDateUtils.expectActiveRange('2017-06-25', '2017-08-06');
+				expectActiveRange('2017-06-25', '2017-08-06');
 			});
 		});
 
@@ -58,7 +59,7 @@ describe('next', function() {
 			it('moves forward by two months', function() {
 				initCalendar();
 				currentCalendar.next();
-				ViewDateUtils.expectActiveRange('2017-07-30', '2017-09-10');
+				expectActiveRange('2017-07-30', '2017-09-10');
 			});
 		});
 	});
@@ -75,7 +76,7 @@ describe('next', function() {
 				it('moves forward three days', function() {
 					initCalendar();
 					currentCalendar.next();
-					ViewDateUtils.expectActiveRange('2017-06-11', '2017-06-14');
+					expectActiveRange('2017-06-11', '2017-06-14');
 				});
 			});
 
@@ -86,7 +87,7 @@ describe('next', function() {
 				it('moves forward two days', function() {
 					initCalendar();
 					currentCalendar.next();
-					ViewDateUtils.expectActiveRange('2017-06-10', '2017-06-13');
+					expectActiveRange('2017-06-10', '2017-06-13');
 				});
 			});
 		})
@@ -100,7 +101,7 @@ describe('next', function() {
 				it('moves forward one week', function() {
 					initCalendar();
 					currentCalendar.next();
-					ViewDateUtils.expectActiveRange('2017-06-11', '2017-06-14');
+					expectActiveRange('2017-06-11', '2017-06-14');
 				});
 			});
 
@@ -121,7 +122,7 @@ describe('next', function() {
 					called = false;
 					currentCalendar.next();
 
-					ViewDateUtils.expectActiveRange('2017-06-04', '2017-06-07'); // the same as how it started
+					expectActiveRange('2017-06-04', '2017-06-07'); // the same as how it started
 					expect(called).toBe(false);
 				});
 			});

tests/view-dates/prev.js

@@ -2,6 +2,9 @@
 SEE ALSO:
 - next (does core of date switching)
 */
+
+import { expectActiveRange } from './ViewDateUtils';
+
 describe('prev', function() {
 	pushOptions({
 		defaultDate: '2017-06-08'
@@ -15,7 +18,7 @@ describe('prev', function() {
 		it('moves back by one week', function() {
 			initCalendar();
 			currentCalendar.prev();
-			ViewDateUtils.expectActiveRange('2017-05-28', '2017-06-04');
+			expectActiveRange('2017-05-28', '2017-06-04');
 		});
 
 		describe('when two week dateIncrement', function() {
@@ -26,7 +29,7 @@ describe('prev', function() {
 			it('moves back by two weeks', function() {
 				initCalendar();
 				currentCalendar.prev();
-				ViewDateUtils.expectActiveRange('2017-05-21', '2017-05-28');
+				expectActiveRange('2017-05-21', '2017-05-28');
 			});
 		});
 	});

tests/view-dates/validRange.js

@@ -1,3 +1,4 @@
+import { expectActiveRange, expectRenderRange } from './ViewDateUtils';
 
 describe('validRange', function() {
 	pushOptions({
@@ -16,8 +17,8 @@ describe('validRange', function() {
 
 			it('allows full renderRange but restricts activeRange', function() {
 				initCalendar();
-				ViewDateUtils.expectRenderRange('2017-06-04', '2017-06-11');
-				ViewDateUtils.expectActiveRange('2017-06-06', '2017-06-11');
+				expectRenderRange('2017-06-04', '2017-06-11');
+				expectActiveRange('2017-06-06', '2017-06-11');
 			});
 		});
 
@@ -28,8 +29,8 @@ describe('validRange', function() {
 
 			it('allows full renderRange but restricts activeRange', function() {
 				initCalendar();
-				ViewDateUtils.expectRenderRange('2017-06-04', '2017-06-11');
-				ViewDateUtils.expectActiveRange('2017-06-04', '2017-06-05');
+				expectRenderRange('2017-06-04', '2017-06-11');
+				expectActiveRange('2017-06-04', '2017-06-05');
 			});
 		});
 
@@ -40,8 +41,8 @@ describe('validRange', function() {
 
 			it('initializes at earliest partially visible week', function() {
 				initCalendar();
-				ViewDateUtils.expectRenderRange('2017-06-11', '2017-06-18');
-				ViewDateUtils.expectActiveRange('2017-06-14', '2017-06-18');
+				expectRenderRange('2017-06-11', '2017-06-18');
+				expectActiveRange('2017-06-14', '2017-06-18');
 			});
 		});
 
@@ -52,8 +53,8 @@ describe('validRange', function() {
 
 			it('initializes at latest partially visible week', function() {
 				initCalendar();
-				ViewDateUtils.expectRenderRange('2017-05-21', '2017-05-28');
-				ViewDateUtils.expectActiveRange('2017-05-21', '2017-05-24');
+				expectRenderRange('2017-05-21', '2017-05-28');
+				expectActiveRange('2017-05-21', '2017-05-24');
 			});
 		});
 
@@ -95,8 +96,8 @@ describe('validRange', function() {
 				initCalendar();
 
 				expect(validRangeSpy).toHaveBeenCalled();
-				ViewDateUtils.expectRenderRange('2017-06-04', '2017-06-11');
-				ViewDateUtils.expectActiveRange('2017-06-06', '2017-06-11');
+				expectRenderRange('2017-06-04', '2017-06-11');
+				expectActiveRange('2017-06-06', '2017-06-11');
 			});
 
 			it('can return a range object with moments', function() {
@@ -107,8 +108,8 @@ describe('validRange', function() {
 				initCalendar();
 
 				expect(validRangeSpy).toHaveBeenCalled();
-				ViewDateUtils.expectRenderRange('2017-06-04', '2017-06-11');
-				ViewDateUtils.expectActiveRange('2017-06-06', '2017-06-11');
+				expectRenderRange('2017-06-04', '2017-06-11');
+				expectActiveRange('2017-06-06', '2017-06-11');
 			});
 
 			it('does not cause side effects when given date is mutated', function() {
@@ -135,8 +136,8 @@ describe('validRange', function() {
 			});
 			it('renders earliest three valid days', function() {
 				initCalendar();
-				ViewDateUtils.expectRenderRange('2017-06-14', '2017-06-17');
-				ViewDateUtils.expectActiveRange('2017-06-14', '2017-06-17');
+				expectRenderRange('2017-06-14', '2017-06-17');
+				expectActiveRange('2017-06-14', '2017-06-17');
 			});
 		});
 
@@ -146,8 +147,8 @@ describe('validRange', function() {
 			});
 			it('renders latest possible valid day and two invalid days', function() {
 				initCalendar();
-				ViewDateUtils.expectRenderRange('2017-05-30', '2017-06-02');
-				ViewDateUtils.expectActiveRange('2017-05-30', '2017-05-31');
+				expectRenderRange('2017-05-30', '2017-06-02');
+				expectActiveRange('2017-05-30', '2017-05-31');
 			});
 		});
 	});
@@ -165,8 +166,8 @@ describe('validRange', function() {
 
 		it('pushes view to nearest valid range', function() {
 			initCalendar();
-			ViewDateUtils.expectRenderRange('2036-05-04', '2036-05-10');
-			ViewDateUtils.expectActiveRange('2036-05-04', '2036-05-10');
+			expectRenderRange('2036-05-04', '2036-05-10');
+			expectActiveRange('2036-05-04', '2036-05-10');
 		});
 
 	});

tests/view-dates/view-duration.js

@@ -1,3 +1,4 @@
+import { expectActiveRange } from './ViewDateUtils';
 
 describe('view duration', function() {
 	pushOptions({
@@ -11,7 +12,7 @@ describe('view duration', function() {
 		});
 		it('aligns with start of week', function() {
 			initCalendar();
-			ViewDateUtils.expectActiveRange('2017-03-12', '2017-03-19');
+			expectActiveRange('2017-03-12', '2017-03-19');
 		});
 	});
 
@@ -21,7 +22,7 @@ describe('view duration', function() {
 		});
 		it('aligns with start of week', function() {
 			initCalendar();
-			ViewDateUtils.expectActiveRange('2017-03-15', '2017-03-22');
+			expectActiveRange('2017-03-15', '2017-03-22');
 		});
 	});
 });

tests/view-dates/visibleRange.js

@@ -1,3 +1,4 @@
+import { expectActiveRange } from './ViewDateUtils';
 
 describe('visibleRange', function() {
 
@@ -34,7 +35,7 @@ describe('visibleRange', function() {
 			}, function() {
 				it('gets set to the given range', function() {
 					initCalendar();
-					ViewDateUtils.expectActiveRange(startInput, endInput);
+					expectActiveRange(startInput, endInput);
 				});
 			});
 
@@ -51,7 +52,7 @@ describe('visibleRange', function() {
 					},
 					defaultView: 'myCustomView'
 				});
-				ViewDateUtils.expectActiveRange(startInput, endInput);
+				expectActiveRange(startInput, endInput);
 			});
 
 			it('ignores dateAlignment', function() {
@@ -62,7 +63,7 @@ describe('visibleRange', function() {
 						end: endInput
 					}
 				});
-				ViewDateUtils.expectActiveRange(startInput, endInput);
+				expectActiveRange(startInput, endInput);
 			});
 
 			it('works as a dynamic option', function() {
@@ -73,7 +74,7 @@ describe('visibleRange', function() {
 					start: startInput,
 					end: endInput
 				});
-				ViewDateUtils.expectActiveRange(startInput, endInput);
+				expectActiveRange(startInput, endInput);
 			});
 		});
 
@@ -144,7 +145,7 @@ describe('visibleRange', function() {
 					initCalendar({
 						defaultDate: '2017-08-01'
 					})
-					ViewDateUtils.expectActiveRange('2017-08-01', '2017-08-02');
+					expectActiveRange('2017-08-01', '2017-08-02');
 				});
 			});
 		});
@@ -160,7 +161,7 @@ describe('visibleRange', function() {
 					}
 				});
 				currentCalendar.changeView('agendaDay');
-				ViewDateUtils.expectActiveRange('2017-06-26', '2017-06-27');
+				expectActiveRange('2017-06-26', '2017-06-27');
 			});
 
 			it('constrains the current date to the end of visibleRange', function() {
@@ -172,7 +173,7 @@ describe('visibleRange', function() {
 					}
 				});
 				currentCalendar.changeView('agendaDay');
-				ViewDateUtils.expectActiveRange('2017-06-28', '2017-06-29');
+				expectActiveRange('2017-06-28', '2017-06-29');
 			});
 		});
 	});
@@ -191,7 +192,7 @@ describe('visibleRange', function() {
 
 		it('respects the given range', function() {
 			initCalendar();
-			ViewDateUtils.expectActiveRange('2017-06-07', '2017-06-10');
+			expectActiveRange('2017-06-07', '2017-06-10');
 		});
 	});
 
@@ -209,7 +210,7 @@ describe('visibleRange', function() {
 					end: '2017-07-04'
 				}
 			});
-			ViewDateUtils.expectActiveRange('2015-06-08', '2015-06-11');
+			expectActiveRange('2015-06-08', '2015-06-11');
 		});
 	});
 
@@ -226,7 +227,7 @@ describe('visibleRange', function() {
 					end: '2017-07-04'
 				}
 			});
-			ViewDateUtils.expectActiveRange('2015-06-07', '2015-06-14');
+			expectActiveRange('2015-06-07', '2015-06-14');
 		});
 	});
-});
+});

tests/view-type/changeView.js

@@ -1,3 +1,4 @@
+import { expectActiveRange } from './ViewDateUtils';
 
 describe('changeView', function() {
 	pushOptions({
@@ -8,13 +9,13 @@ describe('changeView', function() {
 	it('can change views', function() {
 		initCalendar();
 		currentCalendar.changeView('agendaWeek');
-		ViewDateUtils.expectActiveRange('2017-06-04', '2017-06-11');
+		expectActiveRange('2017-06-04', '2017-06-11');
 	});
 
 	it('can change views and navigate date', function() {
 		initCalendar();
 		currentCalendar.changeView('agendaDay', '2017-06-26');
-		ViewDateUtils.expectActiveRange('2017-06-26', '2017-06-27');
+		expectActiveRange('2017-06-26', '2017-06-27');
 	});
 
 	it('can change views and change activeRange', function() {
@@ -23,7 +24,7 @@ describe('changeView', function() {
 			start: '2017-07-04',
 			end: '2017-07-08'
 		});
-		ViewDateUtils.expectActiveRange('2017-07-04', '2017-07-08');
+		expectActiveRange('2017-07-04', '2017-07-08');
 	});
 
 	describe('when switching away from view, then back', function() {