Skip to content
Snippets Groups Projects
Commit 15faa674 authored by Mike Greiling's avatar Mike Greiling :speech_balloon:
Browse files

Merge branch 'renovate/gitlab-uisvg' into 'master'

Update dependency @gitlab/ui to v49.5.1

See merge request gitlab-org/gitlab!103040



Merged-by: default avatarMike Greiling <mike@pixelcog.com>
Approved-by: default avatarPaul Gascou-Vaillancourt <pgascouvaillancourt@gitlab.com>
Approved-by: default avatarMike Greiling <mike@pixelcog.com>
Co-authored-by: default avatarPaul Gascou-Vaillancourt <paul.gascvail@gmail.com>
Co-authored-by: default avatarIllya Klymov <xanf@xanf.me>
Co-authored-by: default avatarnickbrandt <nbrandt@gitlab.com>
Co-authored-by: default avatarGitLab Renovate Bot <gitlab-bot@gitlab.com>
parents ee0220a4 d1f603f8
No related branches found
No related tags found
2 merge requests!103838Draft: Run test in MR with ce570f0 merging into fef465,!103040Update dependency @gitlab/ui to v49.5.1
Pipeline #691309813 failed
Showing
with 38 additions and 40 deletions
...@@ -50,10 +50,12 @@ describe('New vulnerability - Section Identifiers', () => { ...@@ -50,10 +50,12 @@ describe('New vulnerability - Section Identifiers', () => {
await nextTick(); await nextTick();
expect(findFormGroup(0).attributes('aria-invalid')).toBe('true'); expect(findFormGroup(0).attributes('aria-invalid')).toBe('true');
expect(wrapper.findAllByRole('alert').at(0).text()).toBe('Enter the CVE or CWE code'); expect(findFormGroup(0).find('.invalid-feedback').text()).toBe('Enter the CVE or CWE code');
expect(findFormGroup(1).attributes('aria-invalid')).toBe('true'); expect(findFormGroup(1).attributes('aria-invalid')).toBe('true');
expect(wrapper.findAllByRole('alert').at(1).text()).toBe('Enter the CVE or CWE identifier URL'); expect(findFormGroup(1).find('.invalid-feedback').text()).toBe(
'Enter the CVE or CWE identifier URL',
);
}); });
it('emits change event when input changes', () => { it('emits change event when input changes', () => {
......
...@@ -80,7 +80,7 @@ describe('New vulnerability - Section Name', () => { ...@@ -80,7 +80,7 @@ describe('New vulnerability - Section Name', () => {
await nextTick(); await nextTick();
expect(wrapper.findByRole('alert').text()).toBe('Enter a name'); expect(wrapper.find('.invalid-feedback').text()).toBe('Enter a name');
expect(findFormGroup(0).attributes('aria-invalid')).toBe('true'); expect(findFormGroup(0).attributes('aria-invalid')).toBe('true');
}); });
}); });
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
def expect_sort_by(text, sort_direction) def expect_sort_by(text, sort_direction)
within('[data-testid="members-sort-dropdown"]') do within('[data-testid="members-sort-dropdown"]') do
expect(page).to have_css('button[aria-haspopup="true"]', text: text) expect(page).to have_css('button[aria-haspopup="menu"]', text: text)
expect(page).to have_button("Sorting Direction: #{sort_direction == :asc ? 'Ascending' : 'Descending'}") expect(page).to have_button("Sorting Direction: #{sort_direction == :asc ? 'Ascending' : 'Descending'}")
end end
end end
......
...@@ -148,7 +148,7 @@ def second_member ...@@ -148,7 +148,7 @@ def second_member
def expect_sort_by(text, sort_direction) def expect_sort_by(text, sort_direction)
within('[data-testid="members-sort-dropdown"]') do within('[data-testid="members-sort-dropdown"]') do
expect(page).to have_css('button[aria-haspopup="true"]', text: text) expect(page).to have_css('button[aria-haspopup="menu"]', text: text)
expect(page).to have_button("Sorting Direction: #{sort_direction == :asc ? 'Ascending' : 'Descending'}") expect(page).to have_button("Sorting Direction: #{sort_direction == :asc ? 'Ascending' : 'Descending'}")
end end
end end
......
...@@ -21,6 +21,7 @@ exports[`~/access_tokens/components/expires_at_field should render datepicker wi ...@@ -21,6 +21,7 @@ exports[`~/access_tokens/components/expires_at_field should render datepicker wi
mindate="Mon Jul 06 2020 00:00:00 GMT+0000 (Greenwich Mean Time)" mindate="Mon Jul 06 2020 00:00:00 GMT+0000 (Greenwich Mean Time)"
placeholder="YYYY-MM-DD" placeholder="YYYY-MM-DD"
showclearbutton="true" showclearbutton="true"
size="medium"
theme="" theme=""
/> />
</gl-form-group-stub> </gl-form-group-stub>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
exports[`NewCluster renders the cluster component correctly 1`] = ` exports[`NewCluster renders the cluster component correctly 1`] = `
"<div class=\\"gl-pt-4\\"> "<div class=\\"gl-pt-4\\">
<h4>Enter your Kubernetes cluster certificate details</h4> <h4>Enter your Kubernetes cluster certificate details</h4>
<p>Enter details about your cluster. <b-link-stub href=\\"/help/user/project/clusters/add_existing_cluster\\" event=\\"click\\" routertag=\\"a\\" class=\\"gl-link\\">How do I use a certificate to connect to my cluster?</b-link-stub> <p>Enter details about your cluster. <b-link-stub href=\\"/help/user/project/clusters/add_existing_cluster\\" class=\\"gl-link\\">How do I use a certificate to connect to my cluster?</b-link-stub>
</p> </p>
</div>" </div>"
`; `;
// Jest Snapshot v1, https://goo.gl/fbAQLP // Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`content_editor/components/toolbar_button displays tertiary, medium button with a provided label and icon 1`] = ` exports[`content_editor/components/toolbar_button displays tertiary, medium button with a provided label and icon 1`] = `
"<b-button-stub size=\\"md\\" variant=\\"default\\" type=\\"button\\" tag=\\"button\\" aria-label=\\"Bold\\" title=\\"Bold\\" class=\\"gl-button btn-default-tertiary btn-icon\\"> "<b-button-stub size=\\"md\\" tag=\\"button\\" type=\\"button\\" variant=\\"default\\" aria-label=\\"Bold\\" title=\\"Bold\\" class=\\"gl-button btn-default-tertiary btn-icon\\">
<!----> <!---->
<gl-icon-stub name=\\"bold\\" size=\\"16\\" class=\\"gl-button-icon\\"></gl-icon-stub> <gl-icon-stub name=\\"bold\\" size=\\"16\\" class=\\"gl-button-icon\\"></gl-icon-stub>
<!----> <!---->
......
...@@ -33,7 +33,7 @@ describe('GroupSelect', () => { ...@@ -33,7 +33,7 @@ describe('GroupSelect', () => {
const findSearchBoxByType = () => wrapper.findComponent(GlSearchBoxByType); const findSearchBoxByType = () => wrapper.findComponent(GlSearchBoxByType);
const findDropdown = () => wrapper.findComponent(GlDropdown); const findDropdown = () => wrapper.findComponent(GlDropdown);
const findDropdownToggle = () => findDropdown().find('button[aria-haspopup="true"]'); const findDropdownToggle = () => findDropdown().find('button[aria-haspopup="menu"]');
const findAvatarByLabel = (text) => const findAvatarByLabel = (text) =>
wrapper wrapper
.findAllComponents(GlAvatarLabeled) .findAllComponents(GlAvatarLabeled)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
exports[`JiraImportForm table body shows correct information in each cell 1`] = ` exports[`JiraImportForm table body shows correct information in each cell 1`] = `
<table <table
aria-busy="false" aria-busy=""
aria-colcount="3" aria-colcount="3"
class="table b-table gl-table b-table-fixed" class="table b-table gl-table b-table-fixed"
role="table" role="table"
...@@ -92,7 +92,7 @@ exports[`JiraImportForm table body shows correct information in each cell 1`] = ...@@ -92,7 +92,7 @@ exports[`JiraImportForm table body shows correct information in each cell 1`] =
<!----> <!---->
<button <button
aria-expanded="false" aria-expanded="false"
aria-haspopup="true" aria-haspopup="menu"
class="btn dropdown-toggle btn-default btn-md gl-button gl-dropdown-toggle" class="btn dropdown-toggle btn-default btn-md gl-button gl-dropdown-toggle"
type="button" type="button"
> >
...@@ -223,7 +223,7 @@ exports[`JiraImportForm table body shows correct information in each cell 1`] = ...@@ -223,7 +223,7 @@ exports[`JiraImportForm table body shows correct information in each cell 1`] =
<!----> <!---->
<button <button
aria-expanded="false" aria-expanded="false"
aria-haspopup="true" aria-haspopup="menu"
class="btn dropdown-toggle btn-default btn-md gl-button gl-dropdown-toggle" class="btn dropdown-toggle btn-default btn-md gl-button gl-dropdown-toggle"
type="button" type="button"
> >
......
...@@ -46,7 +46,7 @@ describe('SortDropdown', () => { ...@@ -46,7 +46,7 @@ describe('SortDropdown', () => {
const findSortingComponent = () => wrapper.findComponent(GlSorting); const findSortingComponent = () => wrapper.findComponent(GlSorting);
const findSortDirectionToggle = () => const findSortDirectionToggle = () =>
findSortingComponent().find('button[title^="Sort direction"]'); findSortingComponent().find('button[title^="Sort direction"]');
const findDropdownToggle = () => wrapper.find('button[aria-haspopup="true"]'); const findDropdownToggle = () => wrapper.find('button[aria-haspopup="menu"]');
const findDropdownItemByText = (text) => const findDropdownItemByText = (text) =>
wrapper wrapper
.findAllComponents(GlSortingItem) .findAllComponents(GlSortingItem)
......
...@@ -60,7 +60,7 @@ describe('RoleDropdown', () => { ...@@ -60,7 +60,7 @@ describe('RoleDropdown', () => {
.findAllComponents(GlDropdownItem) .findAllComponents(GlDropdownItem)
.wrappers.find((dropdownItemWrapper) => dropdownItemWrapper.props('isChecked')); .wrappers.find((dropdownItemWrapper) => dropdownItemWrapper.props('isChecked'));
const findDropdownToggle = () => wrapper.find('button[aria-haspopup="true"]'); const findDropdownToggle = () => wrapper.find('button[aria-haspopup="menu"]');
const findDropdown = () => wrapper.findComponent(GlDropdown); const findDropdown = () => wrapper.findComponent(GlDropdown);
afterEach(() => { afterEach(() => {
......
...@@ -48,9 +48,7 @@ exports[`packages_list_app renders 1`] = ` ...@@ -48,9 +48,7 @@ exports[`packages_list_app renders 1`] = `
Learn how to Learn how to
<b-link-stub <b-link-stub
class="gl-link" class="gl-link"
event="click"
href="helpUrl" href="helpUrl"
routertag="a"
target="_blank" target="_blank"
> >
publish and share your packages publish and share your packages
......
...@@ -20,7 +20,7 @@ exports[`PypiInstallation renders all the messages 1`] = ` ...@@ -20,7 +20,7 @@ exports[`PypiInstallation renders all the messages 1`] = `
<!----> <!---->
<button <button
aria-expanded="false" aria-expanded="false"
aria-haspopup="true" aria-haspopup="menu"
class="btn dropdown-toggle btn-default btn-md gl-button gl-dropdown-toggle" class="btn dropdown-toggle btn-default btn-md gl-button gl-dropdown-toggle"
id="__BVID__27__BV_toggle_" id="__BVID__27__BV_toggle_"
type="button" type="button"
...@@ -59,7 +59,6 @@ exports[`PypiInstallation renders all the messages 1`] = ` ...@@ -59,7 +59,6 @@ exports[`PypiInstallation renders all the messages 1`] = `
</div> </div>
<fieldset <fieldset
aria-describedby="installation-pip-command-group__BV_description_"
class="form-group gl-form-group" class="form-group gl-form-group"
id="installation-pip-command-group" id="installation-pip-command-group"
> >
...@@ -75,12 +74,7 @@ exports[`PypiInstallation renders all the messages 1`] = ` ...@@ -75,12 +74,7 @@ exports[`PypiInstallation renders all the messages 1`] = `
<!----> <!---->
</legend> </legend>
<div <div>
aria-labelledby="installation-pip-command-group__BV_label_"
class="bv-no-focus-ring"
role="group"
tabindex="-1"
>
<div <div
data-testid="pip-command" data-testid="pip-command"
id="installation-pip-command" id="installation-pip-command"
......
...@@ -94,9 +94,7 @@ exports[`PackagesListApp renders 1`] = ` ...@@ -94,9 +94,7 @@ exports[`PackagesListApp renders 1`] = `
Learn how to Learn how to
<b-link-stub <b-link-stub
class="gl-link" class="gl-link"
event="click"
href="/help/user/packages/package_registry/index" href="/help/user/packages/package_registry/index"
routertag="a"
target="_blank" target="_blank"
> >
publish and share your packages publish and share your packages
......
...@@ -84,7 +84,7 @@ exports[`MRWidgetAutoMergeEnabled when graphql is disabled template should have ...@@ -84,7 +84,7 @@ exports[`MRWidgetAutoMergeEnabled when graphql is disabled template should have
<!----> <!---->
<button <button
aria-expanded="false" aria-expanded="false"
aria-haspopup="true" aria-haspopup="menu"
class="btn dropdown-toggle btn-default btn-sm gl-p-2! gl-button gl-dropdown-toggle btn-default-tertiary dropdown-icon-only dropdown-toggle-no-caret" class="btn dropdown-toggle btn-default btn-sm gl-p-2! gl-button gl-dropdown-toggle btn-default-tertiary dropdown-icon-only dropdown-toggle-no-caret"
type="button" type="button"
> >
...@@ -261,7 +261,7 @@ exports[`MRWidgetAutoMergeEnabled when graphql is enabled template should have c ...@@ -261,7 +261,7 @@ exports[`MRWidgetAutoMergeEnabled when graphql is enabled template should have c
<!----> <!---->
<button <button
aria-expanded="false" aria-expanded="false"
aria-haspopup="true" aria-haspopup="menu"
class="btn dropdown-toggle btn-default btn-sm gl-p-2! gl-button gl-dropdown-toggle btn-default-tertiary dropdown-icon-only dropdown-toggle-no-caret" class="btn dropdown-toggle btn-default btn-sm gl-p-2! gl-button gl-dropdown-toggle btn-default-tertiary dropdown-icon-only dropdown-toggle-no-caret"
type="button" type="button"
> >
......
...@@ -234,7 +234,7 @@ exports[`vue_shared/components/awards_list default matches snapshot 1`] = ` ...@@ -234,7 +234,7 @@ exports[`vue_shared/components/awards_list default matches snapshot 1`] = `
<!----> <!---->
<button <button
aria-expanded="false" aria-expanded="false"
aria-haspopup="true" aria-haspopup="menu"
class="btn dropdown-toggle btn-default btn-md add-reaction-button btn-icon gl-relative! gl-button gl-dropdown-toggle btn-default-secondary" class="btn dropdown-toggle btn-default btn-md add-reaction-button btn-icon gl-relative! gl-button gl-dropdown-toggle btn-default-secondary"
id="__BVID__13__BV_toggle_" id="__BVID__13__BV_toggle_"
type="button" type="button"
......
...@@ -1113,13 +1113,13 @@ ...@@ -1113,13 +1113,13 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-3.7.0.tgz#1257b69fb9898ea5614f992aa6b6dc3619c3c38c" resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-3.7.0.tgz#1257b69fb9898ea5614f992aa6b6dc3619c3c38c"
integrity sha512-6vTqWZzY63ZUTUqk0dmMDcfU27qtkAu0WmlK4e3FMWmISvTxNhAk2j11c/YlLauf6okE4W2T2fnhvXp1mzcPgA== integrity sha512-6vTqWZzY63ZUTUqk0dmMDcfU27qtkAu0WmlK4e3FMWmISvTxNhAk2j11c/YlLauf6okE4W2T2fnhvXp1mzcPgA==
   
"@gitlab/ui@49.3.0": "@gitlab/ui@49.5.1":
version "49.3.0" version "49.5.1"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-49.3.0.tgz#63e6a375d66c6f6ae568f0d1a08fe0e9bd4e355b" resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-49.5.1.tgz#aae75d633059110395caa452967c8d439c6e204f"
integrity sha512-c8GSajEdW2Q1ME7lYuQgImR493WaELKJOq/T+1zVs3i82cc1YDWbGEJyKZh6srJ6xNSLuIbn6d7oSqfM/jeSAQ== integrity sha512-2/m9VZw42kY4Bdrsfs7QbjXFL9r3bXbpagQnKC/msR5YcOScB3TXs7Vr/Hnzv+6xoOHEhGMySrL0Wd4EqaBv+Q==
dependencies: dependencies:
"@popperjs/core" "^2.11.2" "@popperjs/core" "^2.11.2"
bootstrap-vue "2.20.1" bootstrap-vue "2.23.1"
dompurify "^2.4.0" dompurify "^2.4.0"
echarts "^5.3.2" echarts "^5.3.2"
iframe-resizer "^4.3.2" iframe-resizer "^4.3.2"
...@@ -3118,22 +3118,27 @@ boolbase@^1.0.0: ...@@ -3118,22 +3118,27 @@ boolbase@^1.0.0:
resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
   
bootstrap-vue@2.20.1: bootstrap-vue@2.23.1:
version "2.20.1" version "2.23.1"
resolved "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.20.1.tgz#1b6cd4368632c1a6dd4a5ed161242baa131c3cd5" resolved "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.23.1.tgz#8f866f7cda27eb0e7e13a0bea8d55d8fc7a82199"
integrity sha512-s+w83q0T2mo/RbFwTM8gExbLJMEOYpdTUqmyFaHv2Ir+TFprMvTWpeAzeNuawJ130W1gePZ3LW3cNp1t/tZbOw== integrity sha512-SEWkG4LzmMuWjQdSYmAQk1G/oOKm37dtNfjB5kxq0YafnL2W6qUAmeDTcIZVbPiQd2OQlIkWOMPBRGySk/zGsg==
dependencies: dependencies:
"@nuxt/opencollective" "^0.3.2" "@nuxt/opencollective" "^0.3.2"
bootstrap ">=4.5.3 <5.0.0" bootstrap "^4.6.1"
popper.js "^1.16.1" popper.js "^1.16.1"
portal-vue "^2.1.7" portal-vue "^2.1.7"
vue-functional-data-merge "^3.1.0" vue-functional-data-merge "^3.1.0"
   
bootstrap@4.5.3, "bootstrap@>=4.5.3 <5.0.0": bootstrap@4.5.3:
version "4.5.3" version "4.5.3"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.3.tgz#c6a72b355aaf323920be800246a6e4ef30997fe6" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.3.tgz#c6a72b355aaf323920be800246a6e4ef30997fe6"
integrity sha512-o9ppKQioXGqhw8Z7mah6KdTYpNQY//tipnkxppWhPbiSWdD+1raYsnhwEZjkTHYbGee4cVQ0Rx65EhOY/HNLcQ== integrity sha512-o9ppKQioXGqhw8Z7mah6KdTYpNQY//tipnkxppWhPbiSWdD+1raYsnhwEZjkTHYbGee4cVQ0Rx65EhOY/HNLcQ==
   
bootstrap@^4.6.1:
version "4.6.2"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.2.tgz#8e0cd61611728a5bf65a3a2b8d6ff6c77d5d7479"
integrity sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==
brace-expansion@^1.1.7: brace-expansion@^1.1.7:
version "1.1.11" version "1.1.11"
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment