diff options
author | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 22:34:23 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 22:34:23 +0300 |
commit | 6438df3a1e0fb944485cebf07976160184697d72 (patch) | |
tree | 00b09bfd170e77ae9391b1a2f5a93ef6839f2597 /spec/frontend/projects/settings_service_desk/components | |
parent | 42bcd54d971da7ef2854b896a7b34f4ef8601067 (diff) |
Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42
Diffstat (limited to 'spec/frontend/projects/settings_service_desk/components')
-rw-r--r-- | spec/frontend/projects/settings_service_desk/components/service_desk_root_spec.js | 4 | ||||
-rw-r--r-- | spec/frontend/projects/settings_service_desk/components/service_desk_setting_spec.js | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/spec/frontend/projects/settings_service_desk/components/service_desk_root_spec.js b/spec/frontend/projects/settings_service_desk/components/service_desk_root_spec.js index 7e74a5deee1..c83b1852147 100644 --- a/spec/frontend/projects/settings_service_desk/components/service_desk_root_spec.js +++ b/spec/frontend/projects/settings_service_desk/components/service_desk_root_spec.js @@ -137,7 +137,7 @@ describe('ServiceDeskRoot', () => { .$nextTick() .then(waitForPromises) .then(() => { - expect(wrapper.html()).toContain('Changes were successfully made.'); + expect(wrapper.html()).toContain('Changes saved.'); }); }); @@ -160,7 +160,7 @@ describe('ServiceDeskRoot', () => { .$nextTick() .then(waitForPromises) .then(() => { - expect(wrapper.html()).toContain('An error occured while making the changes:'); + expect(wrapper.html()).toContain('An error occured while saving changes:'); }); }); diff --git a/spec/frontend/projects/settings_service_desk/components/service_desk_setting_spec.js b/spec/frontend/projects/settings_service_desk/components/service_desk_setting_spec.js index 173a7fc4e11..ddd9a7b2fad 100644 --- a/spec/frontend/projects/settings_service_desk/components/service_desk_setting_spec.js +++ b/spec/frontend/projects/settings_service_desk/components/service_desk_setting_spec.js @@ -185,7 +185,9 @@ describe('ServiceDeskSetting', () => { const expectedTemplates = [''].concat(templates); const dropdown = findTemplateDropdown(); - const dropdownList = Array.from(dropdown.element.children).map(option => option.innerText); + const dropdownList = Array.from(dropdown.element.children).map( + (option) => option.innerText, + ); expect(dropdown.element.children).toHaveLength(expectedTemplates.length); expect(dropdownList.includes('Bug')).toEqual(true); |