Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 2 deletions

diff --git a/spec/frontend/registry/settings/components/settings_form_spec.js b/spec/frontend/registry/settings/components/settings_form_spec.js
index 6d69b987c7f..f93a5b9fb6d 100644
--- a/spec/frontend/registry/settings/components/settings_form_spec.js
+++ b/spec/frontend/registry/settings/components/settings_form_spec.js
@@ -82,8 +82,13 @@ describe('Settings Form', () => {
 
     it(`${elementName} form element change updated ${modelName} with ${value}`, () => {
       const element = findFormElements(elementName, formGroup);
-      element.vm.$emit('input', value);
-      expect(wrapper.vm[modelName]).toBe(value);
+      const modelUpdateEvent = element.vm.$options.model
+        ? element.vm.$options.model.event
+        : 'input';
+      element.vm.$emit(modelUpdateEvent, value);
+      return wrapper.vm.$nextTick().then(() => {
+        expect(wrapper.vm[modelName]).toBe(value);
+      });
     });
   });