diff --git a/app/javascript/widget/mixins/availability.js b/app/javascript/widget/mixins/availability.js index 1c5cbc37f..56f33b214 100644 --- a/app/javascript/widget/mixins/availability.js +++ b/app/javascript/widget/mixins/availability.js @@ -34,10 +34,14 @@ export default { openAllDay, } = this.currentDayAvailability; - if (openAllDay || closedAllDay) { + if (openAllDay) { return true; } + if (closedAllDay) { + return false; + } + const { utcOffset } = this.channelConfig; const today = this.getDateWithOffset(utcOffset); const currentHours = today.getHours(); diff --git a/app/javascript/widget/mixins/specs/availabilityMixin.spec.js b/app/javascript/widget/mixins/specs/availabilityMixin.spec.js index 5b9e28caa..aa0cfd64c 100644 --- a/app/javascript/widget/mixins/specs/availabilityMixin.spec.js +++ b/app/javascript/widget/mixins/specs/availabilityMixin.spec.js @@ -28,6 +28,10 @@ global.chatwootWebChannel = { }; describe('availabilityMixin', () => { + beforeEach(() => { + jest.useRealTimers(); + }); + it('returns valid isInBetweenWorkingHours if in different timezone', () => { const Component = { render() {}, @@ -40,7 +44,6 @@ describe('availabilityMixin', () => { const vm = new Constructor().$mount(); const wrapper = createWrapper(vm); expect(wrapper.vm.isInBetweenTheWorkingHours).toBe(true); - jest.useRealTimers(); }); it('returns valid isInBetweenWorkingHours if in same timezone', () => { @@ -55,6 +58,43 @@ describe('availabilityMixin', () => { const Constructor = Vue.extend(Component); const wrapper = createWrapper(new Constructor().$mount()); expect(wrapper.vm.isInBetweenTheWorkingHours).toBe(true); - jest.useRealTimers(); + }); + + it('returns false if closed all day', () => { + const Component = { + render() {}, + mixins: [availabilityMixin], + }; + global.chatwootWebChannel.utcOffset = '-07:00'; + global.chatwootWebChannel.workingHours = [ + { day_of_week: 3, closed_all_day: true }, + ]; + jest + .useFakeTimers('modern') + .setSystemTime(new Date('Thu Apr 14 2022 09:01:46 GMT+0530')); + + const Constructor = Vue.extend(Component); + const vm = new Constructor().$mount(); + const wrapper = createWrapper(vm); + expect(wrapper.vm.isInBetweenTheWorkingHours).toBe(false); + }); + + it('returns true if open all day', () => { + const Component = { + render() {}, + mixins: [availabilityMixin], + }; + global.chatwootWebChannel.utcOffset = '-07:00'; + global.chatwootWebChannel.workingHours = [ + { day_of_week: 3, open_all_day: true }, + ]; + jest + .useFakeTimers('modern') + .setSystemTime(new Date('Thu Apr 14 2022 09:01:46 GMT+0530')); + + const Constructor = Vue.extend(Component); + const vm = new Constructor().$mount(); + const wrapper = createWrapper(vm); + expect(wrapper.vm.isInBetweenTheWorkingHours).toBe(true); }); });