Merge d8ae9ef into 7056546

charliekassel · Jun 12, 2019 · 630edc6 · 630edc6
2 parents 7056546 + d8ae9ef
commit 630edc6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/src/components/Datepicker.vue b/src/components/Datepicker.vue
@@ -62,6 +62,7 @@
       :selectedDate="selectedDate"
       :showMonthView="showMonthView"
       :allowedToShowView="allowedToShowView"
+      :full-month-name="fullMonthName"
       :disabledDates="disabledDates"
       :calendarClass="calendarClass"
       :calendarStyle="calendarStyle"

diff --git a/src/components/PickerMonth.vue b/src/components/PickerMonth.vue
@@ -27,6 +27,7 @@ export default {
     selectedDate: Date,
     pageDate: Date,
     pageTimestamp: Number,
+    fullMonthName: Boolean,
     disabledDates: Object,
     calendarClass: [String, Object, Array],
     calendarStyle: Object,
@@ -50,8 +51,9 @@ export default {
         ? new Date(Date.UTC(d.getUTCFullYear(), 0, d.getUTCDate()))
         : new Date(d.getFullYear(), 0, d.getDate(), d.getHours(), d.getMinutes())
       for (let i = 0; i < 12; i++) {
+        const month = this.fullMonthName ? this.utils.getMonthName(i, this.translation.months) : this.utils.getMonthNameAbbr(i, this.translation.monthsAbbr)
         months.push({
-          month: this.utils.getMonthName(i, this.translation.months),
+          month,
           timestamp: dObj.getTime(),
           isSelected: this.isSelectedMonth(dObj),
           isDisabled: this.isDisabledMonth(dObj)

diff --git a/test/unit/jest.conf.js b/test/unit/jest.conf.js
@@ -2,6 +2,8 @@ const path = require('path')
 
 module.exports = {
   rootDir: path.resolve(__dirname, '../../'),
+  testURL: 'http://localhost/',
+  verbose: true,
   moduleFileExtensions: [
     'js',
     'json',

diff --git a/test/unit/specs/DateInput/typedDates.spec.js b/test/unit/specs/DateInput/typedDates.spec.js
@@ -40,7 +40,7 @@ describe('DateInput', () => {
   it('emits closeCalendar when return is pressed', () => {
     const input = wrapper.find('input')
     const blurSpy = jest.spyOn(input.element, 'blur')
-    input.trigger('keyup', {keyCode: 13})
+    input.trigger('keyup.enter')
     expect(blurSpy).toBeCalled()
   })
 

diff --git a/test/unit/specs/PickerMonth/pickerMonth.spec.js b/test/unit/specs/PickerMonth/pickerMonth.spec.js
@@ -46,4 +46,10 @@ describe('PickerMonth', () => {
     yearBtn.trigger('click')
     expect(wrapper.emitted().showYearCalendar).toBeTruthy()
   })
+
+  it('shows abbreviated month names when full-month-name is false', () => {
+    const firstMonth = wrapper.find('.month')
+    const abbreviatedMonth = en._monthsAbbr[0]
+    expect(firstMonth.text()).toEqual(abbreviatedMonth)
+  })
 })