Commit 37e9e74d authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

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

Update GitLab UI/SVG

See merge request gitlab-org/gitlab!73463
parents b9d41d9e 8979fcf4
...@@ -234,30 +234,36 @@ describe('Vulnerability list component', () => { ...@@ -234,30 +234,36 @@ describe('Vulnerability list component', () => {
const { id, project, location } = newVulnerabilities[0]; const { id, project, location } = newVulnerabilities[0];
const cell = findLocationCell(id); const cell = findLocationCell(id);
expect(cell.text()).toContain(project.nameWithNamespace); expect(cell.text()).toContain(project.nameWithNamespace);
expect(findLocationTextWrapper(cell).props()).toEqual({ expect(findLocationTextWrapper(cell).props()).toEqual(
expect.objectContaining({
text: location.image, text: location.image,
position: 'middle', position: 'middle',
}); }),
);
}); });
it('should display the vulnerability locations for code', () => { it('should display the vulnerability locations for code', () => {
const { id, project, location } = newVulnerabilities[1]; const { id, project, location } = newVulnerabilities[1];
const cell = findLocationCell(id); const cell = findLocationCell(id);
expect(cell.text()).toContain(project.nameWithNamespace); expect(cell.text()).toContain(project.nameWithNamespace);
expect(findLocationTextWrapper(cell).props()).toEqual({ expect(findLocationTextWrapper(cell).props()).toEqual(
expect.objectContaining({
text: locationText(location), text: locationText(location),
position: 'middle', position: 'middle',
}); }),
);
}); });
it('should display the vulnerability locations for code with no line data', () => { it('should display the vulnerability locations for code with no line data', () => {
const { id, project, location } = newVulnerabilities[2]; const { id, project, location } = newVulnerabilities[2];
const cell = findLocationCell(id); const cell = findLocationCell(id);
expect(cell.text()).toContain(project.nameWithNamespace); expect(cell.text()).toContain(project.nameWithNamespace);
expect(findLocationTextWrapper(cell).props()).toEqual({ expect(findLocationTextWrapper(cell).props()).toEqual(
expect.objectContaining({
text: location.file, text: location.file,
position: 'middle', position: 'middle',
}); }),
);
}); });
it('should not display the vulnerability locations for vulnerabilities without a location', () => { it('should not display the vulnerability locations for vulnerabilities without a location', () => {
...@@ -271,10 +277,12 @@ describe('Vulnerability list component', () => { ...@@ -271,10 +277,12 @@ describe('Vulnerability list component', () => {
const { id, project, location } = newVulnerabilities[5]; const { id, project, location } = newVulnerabilities[5];
const cell = findLocationCell(id); const cell = findLocationCell(id);
expect(cell.text()).toContain(project.nameWithNamespace); expect(cell.text()).toContain(project.nameWithNamespace);
expect(findLocationTextWrapper(cell).props()).toEqual({ expect(findLocationTextWrapper(cell).props()).toEqual(
expect.objectContaining({
text: location.path, text: location.path,
position: 'middle', position: 'middle',
}); }),
);
}); });
}); });
...@@ -295,10 +303,12 @@ describe('Vulnerability list component', () => { ...@@ -295,10 +303,12 @@ describe('Vulnerability list component', () => {
const { id, project, location } = newVulnerabilities[0]; const { id, project, location } = newVulnerabilities[0];
const cell = findLocationCell(id); const cell = findLocationCell(id);
expect(cell.text()).not.toContain(project.nameWithNamespace); expect(cell.text()).not.toContain(project.nameWithNamespace);
expect(findLocationTextWrapper(cell).props()).toEqual({ expect(findLocationTextWrapper(cell).props()).toEqual(
expect.objectContaining({
text: location.image, text: location.image,
position: 'middle', position: 'middle',
}); }),
);
}); });
it('should display the detected time', () => { it('should display the detected time', () => {
...@@ -312,10 +322,12 @@ describe('Vulnerability list component', () => { ...@@ -312,10 +322,12 @@ describe('Vulnerability list component', () => {
const { id, project, location } = newVulnerabilities[1]; const { id, project, location } = newVulnerabilities[1];
const cell = findLocationCell(id); const cell = findLocationCell(id);
expect(cell.text()).not.toContain(project.nameWithNamespace); expect(cell.text()).not.toContain(project.nameWithNamespace);
expect(findLocationTextWrapper(cell).props()).toEqual({ expect(findLocationTextWrapper(cell).props()).toEqual(
expect.objectContaining({
text: locationText(location), text: locationText(location),
position: 'middle', position: 'middle',
}); }),
);
}); });
it('should make the file path linkable', () => { it('should make the file path linkable', () => {
...@@ -334,10 +346,12 @@ describe('Vulnerability list component', () => { ...@@ -334,10 +346,12 @@ describe('Vulnerability list component', () => {
const { id, project, location } = newVulnerabilities[2]; const { id, project, location } = newVulnerabilities[2];
const cell = findLocationCell(id); const cell = findLocationCell(id);
expect(cell.text()).not.toContain(project.nameWithNamespace); expect(cell.text()).not.toContain(project.nameWithNamespace);
expect(findLocationTextWrapper(cell).props()).toEqual({ expect(findLocationTextWrapper(cell).props()).toEqual(
expect.objectContaining({
text: location.file, text: location.file,
position: 'middle', position: 'middle',
}); }),
);
}); });
}); });
......
...@@ -219,30 +219,36 @@ describe('Vulnerability list component', () => { ...@@ -219,30 +219,36 @@ describe('Vulnerability list component', () => {
const { id, project, location } = newVulnerabilities[0]; const { id, project, location } = newVulnerabilities[0];
const cell = findLocationCell(id); const cell = findLocationCell(id);
expect(cell.text()).toContain(project.nameWithNamespace); expect(cell.text()).toContain(project.nameWithNamespace);
expect(findLocationTextWrapper(cell).props()).toEqual({ expect(findLocationTextWrapper(cell).props()).toEqual(
expect.objectContaining({
text: location.image, text: location.image,
position: 'middle', position: 'middle',
}); }),
);
}); });
it('should display the vulnerability locations for code', () => { it('should display the vulnerability locations for code', () => {
const { id, project, location } = newVulnerabilities[1]; const { id, project, location } = newVulnerabilities[1];
const cell = findLocationCell(id); const cell = findLocationCell(id);
expect(cell.text()).toContain(project.nameWithNamespace); expect(cell.text()).toContain(project.nameWithNamespace);
expect(findLocationTextWrapper(cell).props()).toEqual({ expect(findLocationTextWrapper(cell).props()).toEqual(
expect.objectContaining({
text: locationText(location), text: locationText(location),
position: 'middle', position: 'middle',
}); }),
);
}); });
it('should display the vulnerability locations for code with no line data', () => { it('should display the vulnerability locations for code with no line data', () => {
const { id, project, location } = newVulnerabilities[2]; const { id, project, location } = newVulnerabilities[2];
const cell = findLocationCell(id); const cell = findLocationCell(id);
expect(cell.text()).toContain(project.nameWithNamespace); expect(cell.text()).toContain(project.nameWithNamespace);
expect(findLocationTextWrapper(cell).props()).toEqual({ expect(findLocationTextWrapper(cell).props()).toEqual(
expect.objectContaining({
text: location.file, text: location.file,
position: 'middle', position: 'middle',
}); }),
);
}); });
it('should not display the vulnerability locations for vulnerabilities without a location', () => { it('should not display the vulnerability locations for vulnerabilities without a location', () => {
...@@ -256,10 +262,12 @@ describe('Vulnerability list component', () => { ...@@ -256,10 +262,12 @@ describe('Vulnerability list component', () => {
const { id, project, location } = newVulnerabilities[5]; const { id, project, location } = newVulnerabilities[5];
const cell = findLocationCell(id); const cell = findLocationCell(id);
expect(cell.text()).toContain(project.nameWithNamespace); expect(cell.text()).toContain(project.nameWithNamespace);
expect(findLocationTextWrapper(cell).props()).toEqual({ expect(findLocationTextWrapper(cell).props()).toEqual(
expect.objectContaining({
text: location.path, text: location.path,
position: 'middle', position: 'middle',
}); }),
);
}); });
}); });
...@@ -280,10 +288,12 @@ describe('Vulnerability list component', () => { ...@@ -280,10 +288,12 @@ describe('Vulnerability list component', () => {
const { id, project, location } = newVulnerabilities[0]; const { id, project, location } = newVulnerabilities[0];
const cell = findLocationCell(id); const cell = findLocationCell(id);
expect(cell.text()).not.toContain(project.nameWithNamespace); expect(cell.text()).not.toContain(project.nameWithNamespace);
expect(findLocationTextWrapper(cell).props()).toEqual({ expect(findLocationTextWrapper(cell).props()).toEqual(
expect.objectContaining({
text: location.image, text: location.image,
position: 'middle', position: 'middle',
}); }),
);
}); });
it('should display the detected time', () => { it('should display the detected time', () => {
...@@ -297,10 +307,12 @@ describe('Vulnerability list component', () => { ...@@ -297,10 +307,12 @@ describe('Vulnerability list component', () => {
const { id, project, location } = newVulnerabilities[1]; const { id, project, location } = newVulnerabilities[1];
const cell = findLocationCell(id); const cell = findLocationCell(id);
expect(cell.text()).not.toContain(project.nameWithNamespace); expect(cell.text()).not.toContain(project.nameWithNamespace);
expect(findLocationTextWrapper(cell).props()).toEqual({ expect(findLocationTextWrapper(cell).props()).toEqual(
expect.objectContaining({
text: locationText(location), text: locationText(location),
position: 'middle', position: 'middle',
}); }),
);
}); });
it('should make the file path linkable', () => { it('should make the file path linkable', () => {
...@@ -319,10 +331,12 @@ describe('Vulnerability list component', () => { ...@@ -319,10 +331,12 @@ describe('Vulnerability list component', () => {
const { id, project, location } = newVulnerabilities[2]; const { id, project, location } = newVulnerabilities[2];
const cell = findLocationCell(id); const cell = findLocationCell(id);
expect(cell.text()).not.toContain(project.nameWithNamespace); expect(cell.text()).not.toContain(project.nameWithNamespace);
expect(findLocationTextWrapper(cell).props()).toEqual({ expect(findLocationTextWrapper(cell).props()).toEqual(
expect.objectContaining({
text: location.file, text: location.file,
position: 'middle', position: 'middle',
}); }),
);
}); });
}); });
......
...@@ -27,6 +27,7 @@ exports[`VersionRow renders 1`] = ` ...@@ -27,6 +27,7 @@ exports[`VersionRow renders 1`] = `
> >
<span <span
class="gl-truncate" class="gl-truncate"
data-testid="truncate-end-container"
title="@gitlab-org/package-15" title="@gitlab-org/package-15"
> >
<span <span
......
...@@ -904,20 +904,20 @@ ...@@ -904,20 +904,20 @@
stylelint-declaration-strict-value "1.7.7" stylelint-declaration-strict-value "1.7.7"
stylelint-scss "3.18.0" stylelint-scss "3.18.0"
"@gitlab/svgs@1.219.0": "@gitlab/svgs@1.220.0":
version "1.219.0" version "1.220.0"
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.219.0.tgz#82735876b98bd3a46f42b4a424b45086ed48e7ac" resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.220.0.tgz#188bdefe86cdbf8be1faa7a92dbac31c728066c7"
integrity sha512-UOy0+6A6PTbjNHLFBc70ATYztsiQfWHPORgPGnzugYJz2F7ewMr4p6R8d9avFqMNtVB5mIHSnbrsr0pp0XVMGA== integrity sha512-9QRXQG6IrQoviU86g2Y4l19yE81UyEg/iMoGetMfUdQ64NW6unLN7uNbUaO1ws1J0p7uG0dKwR6ohD7tEUPLFA==
"@gitlab/tributejs@1.0.0": "@gitlab/tributejs@1.0.0":
version "1.0.0" version "1.0.0"
resolved "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz#672befa222aeffc83e7d799b0500a7a4418e59b8" resolved "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz#672befa222aeffc83e7d799b0500a7a4418e59b8"
integrity sha512-nmKw1+hB6MHvlmPz63yPwVs1qQkycHwsKgxpEbzmky16Y6mL4EJMk3w1b8QlOAF/AIAzjCERPhe/R4MJiohbZw== integrity sha512-nmKw1+hB6MHvlmPz63yPwVs1qQkycHwsKgxpEbzmky16Y6mL4EJMk3w1b8QlOAF/AIAzjCERPhe/R4MJiohbZw==
"@gitlab/ui@32.31.0": "@gitlab/ui@32.33.0":
version "32.31.0" version "32.33.0"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-32.31.0.tgz#e379f79f0797c98d67e121739add8dec8281a5d4" resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-32.33.0.tgz#387c0c0fc515a44b8d115a1da1903e84233fbaaf"
integrity sha512-a/03Jgh3TJx0W1lJjsYZiAKbRQHGvomrGhzDvBpxKve2FXrYdo4G6gbwlIKJGiooB5YmZ5OIWhgnhQ8FSy15Aw== integrity sha512-wmyfRMEQ4ZQLCR4FS7fkCY1FCNX6amPyZYYzCZTV52NMtKlgaxczB7YkY1ufdtg5ctmI2NcQNkRGbdW3Et0Riw==
dependencies: dependencies:
"@babel/standalone" "^7.0.0" "@babel/standalone" "^7.0.0"
bootstrap-vue "2.20.1" bootstrap-vue "2.20.1"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment