Loading tests/javascript/unit/store/settings.test.js +0 −15 Original line number Diff line number Diff line Loading @@ -66,10 +66,7 @@ describe('store/settings test suite', () => { disableAppointments: false, canSubscribeLink: true, attachmentsFolder: '/Calendar', <<<<<<< HEAD ======= showResources: true, >>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4 }) }) Loading Loading @@ -181,10 +178,7 @@ describe('store/settings test suite', () => { disableAppointments: false, canSubscribeLink: true, attachmentsFolder: '/Calendar', <<<<<<< HEAD ======= showResources: true, >>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4 } const settings = { Loading @@ -206,10 +200,7 @@ describe('store/settings test suite', () => { disableAppointments: false, canSubscribeLink: true, attachmentsFolder: '/Attachments', <<<<<<< HEAD ======= showResources: true, >>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4 } settingsStore.mutations.loadSettingsFromServer(state, settings) Loading @@ -234,10 +225,7 @@ Initial settings: - disableAppointments: false - CanSubscribeLink: true - attachmentsFolder: /Attachments <<<<<<< HEAD ======= - ShowResources: true >>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4 `) expect(state).toEqual({ appVersion: '2.1.0', Loading @@ -259,10 +247,7 @@ Initial settings: disableAppointments: false, canSubscribeLink: true, attachmentsFolder: '/Attachments', <<<<<<< HEAD ======= showResources: true, >>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4 }) }) Loading Loading
tests/javascript/unit/store/settings.test.js +0 −15 Original line number Diff line number Diff line Loading @@ -66,10 +66,7 @@ describe('store/settings test suite', () => { disableAppointments: false, canSubscribeLink: true, attachmentsFolder: '/Calendar', <<<<<<< HEAD ======= showResources: true, >>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4 }) }) Loading Loading @@ -181,10 +178,7 @@ describe('store/settings test suite', () => { disableAppointments: false, canSubscribeLink: true, attachmentsFolder: '/Calendar', <<<<<<< HEAD ======= showResources: true, >>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4 } const settings = { Loading @@ -206,10 +200,7 @@ describe('store/settings test suite', () => { disableAppointments: false, canSubscribeLink: true, attachmentsFolder: '/Attachments', <<<<<<< HEAD ======= showResources: true, >>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4 } settingsStore.mutations.loadSettingsFromServer(state, settings) Loading @@ -234,10 +225,7 @@ Initial settings: - disableAppointments: false - CanSubscribeLink: true - attachmentsFolder: /Attachments <<<<<<< HEAD ======= - ShowResources: true >>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4 `) expect(state).toEqual({ appVersion: '2.1.0', Loading @@ -259,10 +247,7 @@ Initial settings: disableAppointments: false, canSubscribeLink: true, attachmentsFolder: '/Attachments', <<<<<<< HEAD ======= showResources: true, >>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4 }) }) Loading