module ViewRenderUtils

tests/view-dates/dayCount.js

@@ -1,4 +1,5 @@
 import { expectActiveRange } from './ViewDateUtils';
+import { expectDay } from '../view-render/ViewRenderUtils';
 
 describe('dayCount', function() {
 	pushOptions({
@@ -24,13 +25,13 @@ describe('dayCount', function() {
 		it('renders the exact day count', function() {
 			initCalendar();
 			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);
-			ViewRenderUtils.expectDay('2017-03-18', false); // sat
-			ViewRenderUtils.expectDay('2017-03-19', false); // sun
-			ViewRenderUtils.expectDay('2017-03-20', true);
-			ViewRenderUtils.expectDay('2017-03-21', true);
+			expectDay('2017-03-15', true);
+			expectDay('2017-03-16', true);
+			expectDay('2017-03-17', true);
+			expectDay('2017-03-18', false); // sat
+			expectDay('2017-03-19', false); // sun
+			expectDay('2017-03-20', true);
+			expectDay('2017-03-21', true);
 		});
 	});
 
@@ -40,18 +41,18 @@ describe('dayCount', function() {
 			dayCount: 9
 		});
 		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);
-		ViewRenderUtils.expectDay('2017-03-18', false); // sat
-		ViewRenderUtils.expectDay('2017-03-19', false); // sun
-		ViewRenderUtils.expectDay('2017-03-20', true);
-		ViewRenderUtils.expectDay('2017-03-21', true);
-		ViewRenderUtils.expectDay('2017-03-22', true);
-		ViewRenderUtils.expectDay('2017-03-23', true);
-		ViewRenderUtils.expectDay('2017-03-24', true);
-		ViewRenderUtils.expectDay('2017-03-25', false); // sat
-		ViewRenderUtils.expectDay('2017-03-26', false); // sun
-		ViewRenderUtils.expectDay('2017-03-27', true);
+		expectDay('2017-03-15', true);
+		expectDay('2017-03-16', true);
+		expectDay('2017-03-17', true);
+		expectDay('2017-03-18', false); // sat
+		expectDay('2017-03-19', false); // sun
+		expectDay('2017-03-20', true);
+		expectDay('2017-03-21', true);
+		expectDay('2017-03-22', true);
+		expectDay('2017-03-23', true);
+		expectDay('2017-03-24', true);
+		expectDay('2017-03-25', false); // sat
+		expectDay('2017-03-26', false); // sun
+		expectDay('2017-03-27', true);
 	});
 });

tests/view-render/ViewRenderUtils.js

@@ -1,40 +1,38 @@
 
-var ViewRenderUtils = {
-
-	expectDayRange: function(start, end) {
-		start = this.processWholeDay(start);
-		end = this.processWholeDay(end);
-
-		var dayBefore = start.clone().subtract(1, 'day');
-		this.expectDay(dayBefore, false);
-
-		var date = start.clone();
-		while (date < end) {
-			this.expectDay(date, true);
-			date.add(1, 'day');
-		}
-
-		// `date` is now the first day after the range
-		this.expectDay(date, false);
-	},
-
-	expectDay: function(date, bool) {
-		date = this.processWholeDay(date);
-		var els = $('td.fc-day[data-date="' + date.format() + '"]');
-
-		if (bool) {
-			expect(els).toBeInDOM();
-		}
-		else {
-			expect(els).not.toBeInDOM();
-		}
-	},
-
-	processWholeDay: function(date) {
-		date = $.fullCalendar.moment.parseZone(date);
-		expect(date.hasTime()).toBe(false);
-		expect(date.hasZone()).toBe(false);
-		return date;
+export function expectDayRange(start, end) {
+	start = processWholeDay(start);
+	end = processWholeDay(end);
+
+	var dayBefore = start.clone().subtract(1, 'day');
+	expectDay(dayBefore, false);
+
+	var date = start.clone();
+	while (date < end) {
+		expectDay(date, true);
+		date.add(1, 'day');
 	}
 
-};
+	// `date` is now the first day after the range
+	expectDay(date, false);
+}
+
+
+export function expectDay(date, bool) {
+	date = processWholeDay(date);
+	var els = $('td.fc-day[data-date="' + date.format() + '"]');
+
+	if (bool) {
+		expect(els).toBeInDOM();
+	}
+	else {
+		expect(els).not.toBeInDOM();
+	}
+}
+
+
+function processWholeDay(date) {
+	date = $.fullCalendar.moment.parseZone(date);
+	expect(date.hasTime()).toBe(false);
+	expect(date.hasZone()).toBe(false);
+	return date;
+}

tests/view-render/showNonCurrentDates.js

@@ -1,3 +1,5 @@
+import { expectDayRange } from './ViewRenderUtils';
+
 
 describe('showNonCurrentDates', function() {
 	pushOptions({
@@ -12,7 +14,7 @@ describe('showNonCurrentDates', function() {
 
 		it('does not render other months\' dates', function() {
 			initCalendar();
-			ViewRenderUtils.expectDayRange('2017-06-01', '2017-07-01');
+			expectDayRange('2017-06-01', '2017-07-01');
 		});
 	});
 
@@ -24,7 +26,7 @@ describe('showNonCurrentDates', function() {
 
 		it('has no effect', function() {
 			initCalendar();
-			ViewRenderUtils.expectDayRange('2017-05-28', '2017-06-04');
+			expectDayRange('2017-05-28', '2017-06-04');
 		});
 	});
 });

tests/view-render/validRange.js

@@ -1,3 +1,5 @@
+import { expectDayRange } from './ViewRenderUtils';
+
 
 describe('validRange rendering', function() {
 
@@ -12,7 +14,7 @@ describe('validRange rendering', function() {
 
 			it('does not render days before', function() {
 				initCalendar();
-				ViewRenderUtils.expectDayRange('2017-06-07', '2017-07-09');
+				expectDayRange('2017-06-07', '2017-07-09');
 			});
 		});
 
@@ -25,7 +27,7 @@ describe('validRange rendering', function() {
 
 			it('does not render days before', function() {
 				initCalendar();
-				ViewRenderUtils.expectDayRange('2017-06-06', '2017-06-11');
+				expectDayRange('2017-06-06', '2017-06-11');
 			});
 		});
 	});
@@ -41,7 +43,7 @@ describe('validRange rendering', function() {
 
 			it('does not render days on or after', function() {
 				initCalendar();
-				ViewRenderUtils.expectDayRange('2017-05-28', '2017-06-07');
+				expectDayRange('2017-05-28', '2017-06-07');
 			});
 		});
 
@@ -54,7 +56,7 @@ describe('validRange rendering', function() {
 
 			it('does not render days on or after', function() {
 				initCalendar();
-				ViewRenderUtils.expectDayRange('2017-06-04', '2017-06-06');
+				expectDayRange('2017-06-04', '2017-06-06');
 			});
 		});
 	});