Add latest changes from gitlab-org/gitlab@master

4 files changed, 33 insertions, 12 deletions

diff --git a/spec/frontend/design_management/components/__snapshots__/image_spec.js.snap b/spec/frontend/design_management/components/__snapshots__/image_spec.js.snap
index 7cffd3cf3e8..1f4e579f075 100644
--- a/spec/frontend/design_management/components/__snapshots__/image_spec.js.snap
+++ b/spec/frontend/design_management/components/__snapshots__/image_spec.js.snap
@@ -1,5 +1,19 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`Design management large image component renders SVG with proper height and width 1`] = `
+<div
+  class="gl-mx-auto gl-my-auto js-design-image"
+>
+  <!---->
+   
+  <img
+    alt="test"
+    class="mh-100 img-fluid"
+    src="mockImage.svg"
+  />
+</div>
+`;
+
 exports[`Design management large image component renders image 1`] = `
 <div
   class="gl-mx-auto gl-my-auto js-design-image"
diff --git a/spec/frontend/design_management/components/image_spec.js b/spec/frontend/design_management/components/image_spec.js
index 8163cb0d87a..95d2ad504de 100644
--- a/spec/frontend/design_management/components/image_spec.js
+++ b/spec/frontend/design_management/components/image_spec.js
@@ -42,6 +42,16 @@ describe('Design management large image component', () => {
     expect(wrapper.element).toMatchSnapshot();
   });
 
+  it('renders SVG with proper height and width', () => {
+    createComponent({
+      isLoading: false,
+      image: 'mockImage.svg',
+      name: 'test',
+    });
+
+    expect(wrapper.element).toMatchSnapshot();
+  });
+
   it('sets correct classes and styles if imageStyle is set', async () => {
     createComponent(
       {
diff --git a/spec/frontend/design_management/components/list/__snapshots__/item_spec.js.snap b/spec/frontend/design_management/components/list/__snapshots__/item_spec.js.snap
index 096d776a7d2..3517c0f7a44 100644
--- a/spec/frontend/design_management/components/list/__snapshots__/item_spec.js.snap
+++ b/spec/frontend/design_management/components/list/__snapshots__/item_spec.js.snap
@@ -21,12 +21,14 @@ exports[`Design management list item component with notes renders item with mult
   >
     <!---->
      
-    <gl-intersection-observer-stub>
+    <gl-intersection-observer-stub
+      class="gl-flex-grow-1"
+    >
       <!---->
        
       <img
         alt="test"
-        class="gl-display-block gl-mx-auto gl-max-w-full gl-max-h-full design-img"
+        class="gl-display-block gl-mx-auto gl-max-w-full gl-max-h-full gl-w-auto design-img"
         data-qa-filename="test"
         data-qa-selector="design_image"
         data-testid="design-img-1"
@@ -98,12 +100,14 @@ exports[`Design management list item component with notes renders item with sing
   >
     <!---->
      
-    <gl-intersection-observer-stub>
+    <gl-intersection-observer-stub
+      class="gl-flex-grow-1"
+    >
       <!---->
        
       <img
         alt="test"
-        class="gl-display-block gl-mx-auto gl-max-w-full gl-max-h-full design-img"
+        class="gl-display-block gl-mx-auto gl-max-w-full gl-max-h-full gl-w-auto design-img"
         data-qa-filename="test"
         data-qa-selector="design_image"
         data-testid="design-img-1"
diff --git a/spec/frontend/work_items/components/work_item_detail_spec.js b/spec/frontend/work_items/components/work_item_detail_spec.js
index cc4a4416253..64a7502671e 100644
--- a/spec/frontend/work_items/components/work_item_detail_spec.js
+++ b/spec/frontend/work_items/components/work_item_detail_spec.js
@@ -767,17 +767,10 @@ describe('WorkItemDetail component', () => {
     });
   });
 
-  it('does not render created/updated by default', async () => {
+  it('renders created/updated', async () => {
     createComponent();
     await waitForPromises();
 
-    expect(findCreatedUpdated().exists()).toBe(false);
-  });
-
-  it('renders created/updated when the work_items_mvc flag is on', async () => {
-    createComponent({ workItemsMvcEnabled: true });
-    await waitForPromises();
-
     expect(findCreatedUpdated().exists()).toBe(true);
   });
 });