diff --git a/app/assets/javascripts/due_date_select.js.es6 b/app/assets/javascripts/due_date_select.js.es6 index f35c024e7166016b8c734b8c5404685efb9233c0..cb92b8c765818a255163b9a322b0cc21d2edabf3 100644 --- a/app/assets/javascripts/due_date_select.js.es6 +++ b/app/assets/javascripts/due_date_select.js.es6 @@ -2,10 +2,9 @@ (function(global) { class DueDateSelect { - constructor({ $dropdown, $loading, $context } = {}) { + constructor({ $dropdown, $loading } = {}) { const $dropdownParent = $dropdown.closest('.dropdown'); const $block = $dropdown.closest('.block'); - this.$context = $context || $('body'); this.$loading = $loading; this.$dropdown = $dropdown; this.$dropdownParent = $dropdownParent; @@ -81,7 +80,7 @@ } parseSelectedDate() { - this.rawSelectedDate = this.$context.find(`input[name='${this.fieldName}']`).val(); + this.rawSelectedDate = $(`input[name='${this.fieldName}']`).val(); if (this.rawSelectedDate.length) { // Avoid time zone inconsistency using the utils.createDateObject @@ -180,6 +179,5 @@ } global.DueDateSelectors = DueDateSelectors; - global.DueDateSelect = DueDateSelect; })(window.gl || (window.gl = {})); diff --git a/spec/javascripts/datetime_utility_spec.js.es6 b/spec/javascripts/datetime_utility_spec.js.es6 index a597e713f3e43841b7131ab209ae834e0895069b..8ece24555c5f86e90b8ab87b5299f59ce0e9beb0 100644 --- a/spec/javascripts/datetime_utility_spec.js.es6 +++ b/spec/javascripts/datetime_utility_spec.js.es6 @@ -2,38 +2,6 @@ (() => { describe('Date time utils', () => { - describe('create date object', () => { - describe('using dashes', () => { - it('should instantiate the date object using integer params', () => { - spyOn(window, 'Date'); - gl.utils.createDateObject('2016-11-12'); - expect(window.Date).toHaveBeenCalledWith(2016, 10, 12); - }); - - it('should return the right date object ', () => { - const date = gl.utils.createDateObject('2016-11-12'); - expect(date.getDate()).toBe(12); - expect(date.getMonth()).toBe(10); - expect(date.getFullYear()).toBe(2016); - }); - }); - - describe('using slashes', () => { - it('should also instantiate the date object using integer params', () => { - spyOn(window, 'Date'); - gl.utils.createDateObject('2016/08/02'); - expect(window.Date).toHaveBeenCalledWith(2016, 7, 2); - }); - - it('should return the right date object', () => { - const date = gl.utils.createDateObject('2016/08/02'); - expect(date.getDate()).toBe(2); - expect(date.getMonth()).toBe(7); - expect(date.getFullYear()).toBe(2016); - }); - }); - }); - describe('get day name', () => { it('should return Sunday', () => { const day = gl.utils.getDayName(new Date('07/17/2016')); diff --git a/spec/javascripts/due_date_select_spec.js.es6 b/spec/javascripts/due_date_select_spec.js.es6 deleted file mode 100644 index 202787edb199b6ed76b8cf6d76425cbd0681922e..0000000000000000000000000000000000000000 --- a/spec/javascripts/due_date_select_spec.js.es6 +++ /dev/null @@ -1,25 +0,0 @@ -//= require lib/utils/datetime_utility -//= require jquery -//= require jquery-ui/datepicker -//= require gl_dropdown -//= require due_date_select - -(() => { - describe('Due Date Select', () => { - describe('parseSelectedDate()', () => { - it('call create date object', () => { - const $dom = $(fixture.preload('due_date_select.html')[0]); - - const dueDateSelect = new gl.DueDateSelect({ - $context: $dom, - $dropdown: $dom.find('.js-due-date-select'), - $loading: $dom.find('.block-loading'), - }); - - spyOn(gl.utils, 'createDateObject'); - dueDateSelect.parseSelectedDate(); - expect(gl.utils.createDateObject).toHaveBeenCalledWith('2016-11-20'); - }); - }); - }); -})(); diff --git a/spec/javascripts/fixtures/due_date_select.html.haml b/spec/javascripts/fixtures/due_date_select.html.haml deleted file mode 100644 index ed7dcb0d6589cbd9f69cab2257529ae80887b1b4..0000000000000000000000000000000000000000 --- a/spec/javascripts/fixtures/due_date_select.html.haml +++ /dev/null @@ -1,29 +0,0 @@ -.block.due_date - .sidebar-collapsed-icon - %i.fa.fa-calendar - %span.js-due-date-sidebar-value - Nov 20, 2016 - .title.hide-collapsed - Due date - %i.fa.fa-spinner.fa-spin.block-loading - %a.edit-link.pull-right{ href: "#"} Edit - .value.hide-collapsed - %span.value-content - %span.bold - Nov 20, 2016 - %span.no-value.js-remove-due-date-holder - %a.js-remove-due-date{ href: "#", role: "button" } - remove due date - .selectbox.hide-collapsed - %input{type: "hidden", name: "issue[due_date]", id: "issue[due_date]", value: "2016-11-20"} - .dropdown - %button.dropdown-menu-toggle.js-due-date-select{ type: 'button', data: { toggle: 'dropdown', field_name: "issue[due_date]", ability_name: "issue", issue_update: "/h5bp/html5-boilerplate/issues/10.json" } } - %span.dropdown-toggle-text Due date - %i.fa.fa-chevron-down - .dropdown-menu.dropdown-menu-due-date - .dropdown-title - %span Due Date - %button.dropdown-title-button.dropdown-menu-close{ type: "button" } - %i.fa.fa-times.dropdown-menu-close-icon - .dropdown-content - .js-due-date-calendar