From b624a4cb540bbf64edaf6d1c9ce77c0188c2cb56 Mon Sep 17 00:00:00 2001
From: Lorenz van Herwaarden <lvanherwaarden@gitlab.com>
Date: Wed, 30 Oct 2024 12:07:28 +0000
Subject: [PATCH] Update @gitlab/ui to v100
Fix GlBadge snapshots and tests.
---
.../__snapshots__/environment_header_spec.js.snap | 2 ++
.../service_level_agreement_form_spec.js.snap | 1 +
.../__snapshots__/false_positive_badge_spec.js.snap | 2 ++
.../common/components/workspace_state_indicator_spec.js | 2 +-
package.json | 2 +-
.../__snapshots__/findings_drawer_details_spec.js.snap | 4 ++++
.../__snapshots__/collapsible_section_spec.js.snap | 2 ++
.../widget/__snapshots__/dynamic_content_spec.js.snap | 2 ++
yarn.lock | 8 ++++----
9 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/ee/spec/frontend/environments_dashboard/components/__snapshots__/environment_header_spec.js.snap b/ee/spec/frontend/environments_dashboard/components/__snapshots__/environment_header_spec.js.snap
index 9ed947018e26e..52f6690145ba0 100644
--- a/ee/spec/frontend/environments_dashboard/components/__snapshots__/environment_header_spec.js.snap
+++ b/ee/spec/frontend/environments_dashboard/components/__snapshots__/environment_header_spec.js.snap
@@ -124,6 +124,8 @@ exports[`Environment Header with environments grouped into a folder matches the
<gl-badge-stub
class="dashboard-card-icon"
iconsize="md"
+ tag="span"
+ target="_self"
variant="muted"
>
5
diff --git a/ee/spec/frontend/incidents_settings/components/__snapshots__/service_level_agreement_form_spec.js.snap b/ee/spec/frontend/incidents_settings/components/__snapshots__/service_level_agreement_form_spec.js.snap
index 722f40c0f4d80..f12313defb4f7 100644
--- a/ee/spec/frontend/incidents_settings/components/__snapshots__/service_level_agreement_form_spec.js.snap
+++ b/ee/spec/frontend/incidents_settings/components/__snapshots__/service_level_agreement_form_spec.js.snap
@@ -45,6 +45,7 @@ exports[`Alert integration settings form should match the default snapshot 1`] =
<gl-form-select-stub
class="gl-border-gray-400 gl-leading-normal gl-ml-3 gl-w-auto"
options="[object Object],[object Object]"
+ selectclass=""
value="minutes"
/>
</div>
diff --git a/ee/spec/frontend/vulnerabilities/__snapshots__/false_positive_badge_spec.js.snap b/ee/spec/frontend/vulnerabilities/__snapshots__/false_positive_badge_spec.js.snap
index 662addac07267..a7f5136d0adc6 100644
--- a/ee/spec/frontend/vulnerabilities/__snapshots__/false_positive_badge_spec.js.snap
+++ b/ee/spec/frontend/vulnerabilities/__snapshots__/false_positive_badge_spec.js.snap
@@ -7,6 +7,8 @@ exports[`False positive badge component should render the alert badge 1`] = `
<gl-badge-stub
icon="false-positive"
iconsize="md"
+ tag="span"
+ target="_self"
variant="warning"
/>
<gl-popover-stub
diff --git a/ee/spec/frontend/workspaces/common/components/workspace_state_indicator_spec.js b/ee/spec/frontend/workspaces/common/components/workspace_state_indicator_spec.js
index 5f11dc9aac958..18ae85aa2a560 100644
--- a/ee/spec/frontend/workspaces/common/components/workspace_state_indicator_spec.js
+++ b/ee/spec/frontend/workspaces/common/components/workspace_state_indicator_spec.js
@@ -35,7 +35,7 @@ describe('WorkspaceStateIndicator', () => {
const badge = wrapper.findComponent(GlBadge);
- expect(badge.props()).toEqual({
+ expect(badge.props()).toMatchObject({
icon: iconName,
iconSize: 'md',
iconOpticallyAligned: false,
diff --git a/package.json b/package.json
index 8eb598f8feb78..3cebf1603b97e 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
"@gitlab/fonts": "^1.3.0",
"@gitlab/query-language": "^0.0.5-a-20241017",
"@gitlab/svgs": "3.119.0",
- "@gitlab/ui": "99.0.0",
+ "@gitlab/ui": "100.0.0",
"@gitlab/web-ide": "^0.0.1-dev-20240909013227",
"@mattiasbuelens/web-streams-adapter": "^0.1.0",
"@rails/actioncable": "7.0.8-4",
diff --git a/spec/frontend/diffs/components/shared/__snapshots__/findings_drawer_details_spec.js.snap b/spec/frontend/diffs/components/shared/__snapshots__/findings_drawer_details_spec.js.snap
index dd5ea00b8e5ca..3e126db3e6030 100644
--- a/spec/frontend/diffs/components/shared/__snapshots__/findings_drawer_details_spec.js.snap
+++ b/spec/frontend/diffs/components/shared/__snapshots__/findings_drawer_details_spec.js.snap
@@ -16,6 +16,8 @@ exports[`Findings Drawer Details General Rendering matches the snapshot with det
<gl-badge-stub
class="text-capitalize"
iconsize="md"
+ tag="span"
+ target="_self"
variant="warning"
>
detected
@@ -78,6 +80,8 @@ exports[`Findings Drawer Details General Rendering matches the snapshot with dis
<gl-badge-stub
class="text-capitalize"
iconsize="md"
+ tag="span"
+ target="_self"
variant="warning"
>
detected
diff --git a/spec/frontend/merge_request_dashboard/components/__snapshots__/collapsible_section_spec.js.snap b/spec/frontend/merge_request_dashboard/components/__snapshots__/collapsible_section_spec.js.snap
index 44efb45b7ef85..6cb8119534370 100644
--- a/spec/frontend/merge_request_dashboard/components/__snapshots__/collapsible_section_spec.js.snap
+++ b/spec/frontend/merge_request_dashboard/components/__snapshots__/collapsible_section_spec.js.snap
@@ -26,6 +26,8 @@ exports[`Merge request dashboard collapsible section renders section 1`] = `
class="gl-ml-1"
iconsize="md"
size="sm"
+ tag="span"
+ target="_self"
variant="neutral"
>
3
diff --git a/spec/frontend/vue_merge_request_widget/components/widget/__snapshots__/dynamic_content_spec.js.snap b/spec/frontend/vue_merge_request_widget/components/widget/__snapshots__/dynamic_content_spec.js.snap
index 928473a133d33..98c915c5a96ea 100644
--- a/spec/frontend/vue_merge_request_widget/components/widget/__snapshots__/dynamic_content_spec.js.snap
+++ b/spec/frontend/vue_merge_request_widget/components/widget/__snapshots__/dynamic_content_spec.js.snap
@@ -72,6 +72,8 @@ exports[`~/vue_merge_request_widget/components/widget/dynamic_content.vue render
</div>
<gl-badge-stub
iconsize="md"
+ tag="span"
+ target="_self"
variant="info"
>
Badge is optional. Text to be displayed inside badge
diff --git a/yarn.lock b/yarn.lock
index 7b15443a6cac7..9a4a52831f6b4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1401,10 +1401,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-3.119.0.tgz#becbeea7e7ee241baecdad02b9ad04de7a8aed04"
integrity sha512-Os/PF37pCY75uLA0dmGaZe13BmirzlWH+pFLinCAPRChEC7KhHCJtIy0efRAxzkA4uatmHpJHxftuTc7NeiSNQ==
-"@gitlab/ui@99.0.0":
- version "99.0.0"
- resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-99.0.0.tgz#068f4defb9fe80264d0bd54e32df7b25892b710b"
- integrity sha512-f5g4dk43ZjqjxSGee44JvB4Nh9m0GybcFEMtLwvgoKQl60oEdLD7hQZv/fh1+IVcXbp0RgOEyy3wsSW9/iItKg==
+"@gitlab/ui@100.0.0":
+ version "100.0.0"
+ resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-100.0.0.tgz#9894da3d20676492cbb98972bd637abea2ac8ca3"
+ integrity sha512-ekrMwtpGv4xlsg35NtwKHNT4WcdFLgRj+26GkEynrPPuMHWmZZ4SlyHK52evAn9fLFdptAEoNzbwf8uClx+cgA==
dependencies:
"@floating-ui/dom" "1.4.3"
echarts "^5.3.2"
--
GitLab