Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 4 deletions

diff --git a/spec/frontend/sidebar/components/labels/labels_select_vue/dropdown_contents_create_view_spec.js b/spec/frontend/sidebar/components/labels/labels_select_vue/dropdown_contents_create_view_spec.js
index bb687720582..bb7554ff21d 100644
--- a/spec/frontend/sidebar/components/labels/labels_select_vue/dropdown_contents_create_view_spec.js
+++ b/spec/frontend/sidebar/components/labels/labels_select_vue/dropdown_contents_create_view_spec.js
@@ -170,11 +170,17 @@ describe('DropdownContentsCreateView', () => {
       });
 
       await nextTick();
-      const colorPreviewEl = wrapper.find('.color-input-container > .dropdown-label-color-preview');
-      const colorInputEl = wrapper.find('.color-input-container').findComponent(GlFormInput);
+      const colorPreviewEl = wrapper
+        .find('.color-input-container')
+        .findAllComponents(GlFormInput)
+        .at(0);
+      const colorInputEl = wrapper
+        .find('.color-input-container')
+        .findAllComponents(GlFormInput)
+        .at(1);
 
       expect(colorPreviewEl.exists()).toBe(true);
-      expect(colorPreviewEl.attributes('style')).toContain('background-color');
+      expect(colorPreviewEl.attributes('value')).toBe('#ff0000');
       expect(colorInputEl.exists()).toBe(true);
       expect(colorInputEl.attributes('placeholder')).toBe('Use custom color #FF0000');
       expect(colorInputEl.attributes('value')).toBe('#ff0000');
diff --git a/spec/frontend/sidebar/components/labels/labels_select_widget/dropdown_contents_create_view_spec.js b/spec/frontend/sidebar/components/labels/labels_select_widget/dropdown_contents_create_view_spec.js
index 42096d0626d..4ca0a813da2 100644
--- a/spec/frontend/sidebar/components/labels/labels_select_widget/dropdown_contents_create_view_spec.js
+++ b/spec/frontend/sidebar/components/labels/labels_select_widget/dropdown_contents_create_view_spec.js
@@ -99,7 +99,7 @@ describe('DropdownContentsCreateView', () => {
     findAllColors().at(0).vm.$emit('click', new Event('mouseclick'));
     await nextTick();
 
-    expect(findSelectedColor().attributes('style')).toBe('background-color: rgb(0, 153, 102);');
+    expect(findSelectedColor().attributes('value')).toBe('#009966');
   });
 
   it('shows correct color hex code after selecting a color', async () => {