Add tests for pick events, remove unnecessary date manip

eternicode · eternicode · commit 7af808c90cba · 2012-07-08T22:38:58.000-04:00
diff --git a/js/bootstrap-datepicker.js b/js/bootstrap-datepicker.js
@@ -415,7 +415,6 @@
 							this.viewDate.setDate(1);
 							if (target.is('.month')) {
 								var month = target.parent().find('span').index(target);
-								this.viewDate.setDate(1);
 								this.viewDate.setMonth(month);
 								this.element.trigger({
 									type: 'pickMonth',
@@ -424,8 +423,6 @@
 							} else {
 								var year = parseInt(target.text(), 10)||0;
 								this.viewDate.setFullYear(year);
-								this.viewDate.setDate(1);
-								this.viewDate.setMonth(0);
 								this.element.trigger({
 									type: 'pickYear',
 									date: this.viewDate
diff --git a/tests/suites/events.js b/tests/suites/events.js
@@ -0,0 +1,80 @@
+module('Events', {
+    setup: function(){
+        this.input = $('<input type="text" value="31-03-2011">')
+                        .appendTo('#qunit-fixture')
+                        .datepicker({format: "dd-mm-yyyy"})
+                        .focus(); // Activate for visibility checks
+        this.dp = this.input.data('datepicker')
+        this.picker = this.dp.picker;
+    },
+    teardown: function(){
+        this.picker.remove();
+    }
+});
+
+test('Selecting a year from decade view triggers pickYear', function(){
+    var target,
+        triggered = 0;
+
+    this.input.on('pickYear', function(){
+        triggered++;
+    });
+
+    equal(this.dp.viewMode, 0);
+    target = this.picker.find('.datepicker-days thead th.switch');
+    ok(target.is(':visible'), 'View switcher is visible');
+
+    target.click();
+    ok(this.picker.find('.datepicker-months').is(':visible'), 'Month picker is visible');
+    equal(this.dp.viewMode, 1);
+    // Not modified when switching modes
+    datesEqual(this.dp.viewDate, new Date(2011, 2, 31));
+    datesEqual(this.dp.date, new Date(2011, 2, 31));
+
+    target = this.picker.find('.datepicker-months thead th.switch');
+    ok(target.is(':visible'), 'View switcher is visible');
+
+    target.click();
+    ok(this.picker.find('.datepicker-years').is(':visible'), 'Year picker is visible');
+    equal(this.dp.viewMode, 2);
+    // Not modified when switching modes
+    datesEqual(this.dp.viewDate, new Date(2011, 2, 31));
+    datesEqual(this.dp.date, new Date(2011, 2, 31));
+
+    // Change years to test internal state changes
+    target = this.picker.find('.datepicker-years tbody span:contains(2010)');
+    target.click();
+    equal(this.dp.viewMode, 1);
+    // Only viewDate modified
+    datesEqual(this.dp.viewDate, new Date(2010, 2, 1));
+    datesEqual(this.dp.date, new Date(2011, 2, 31));
+    equal(triggered, 1);
+});
+
+test('Selecting a month from year view triggers pickMonth', function(){
+    var target,
+        triggered = 0;
+
+    this.input.on('pickMonth', function(){
+        triggered++;
+    });
+
+    equal(this.dp.viewMode, 0);
+    target = this.picker.find('.datepicker-days thead th.switch');
+    ok(target.is(':visible'), 'View switcher is visible');
+
+    target.click();
+    ok(this.picker.find('.datepicker-months').is(':visible'), 'Month picker is visible');
+    equal(this.dp.viewMode, 1);
+    // Not modified when switching modes
+    datesEqual(this.dp.viewDate, new Date(2011, 2, 31));
+    datesEqual(this.dp.date, new Date(2011, 2, 31));
+
+    target = this.picker.find('.datepicker-months tbody span:contains(Apr)');
+    target.click();
+    equal(this.dp.viewMode, 0);
+    // Only viewDate modified
+    datesEqual(this.dp.viewDate, new Date(2011, 3, 1));
+    datesEqual(this.dp.date, new Date(2011, 2, 31));
+    equal(triggered, 1);
+});
diff --git a/tests/tests.html b/tests/tests.html
@@ -29,6 +29,7 @@
         <script src="suites/keyboard_navigation/2012.js"></script>
         <script src="suites/keyboard_navigation/2011.js"></script>
         <script src="suites/component.js"></script>
+        <script src="suites/events.js"></script>
         <script src="suites/options.js"></script>
     </head>
     <body>
