Skip to content

G
gitlab-ce
Commit cd8d8f6d authored by Enrique Alcántara's avatar Enrique Alcántara
Browse files
Options

Merge branch 'revert-ffdc0273-gitlab-ui-integration-test' into 'master' 

Upgrades GitLab UI to v14.14.2

See merge request gitlab-org/gitlab!32553
parents ccd9218a 7939632c
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 117 deletions
ee/spec/frontend/analytics/cycle_analytics/components/tasks_by_type/__snapshots__/tasks_by_type_chart_spec.js.snap
View file @ cd8d8f6d
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`TasksByTypeChart no data available should render the no data available message 1`] = `"<gl-stacked-column-chart-stub data=\\"\\" option=\\"[object Object]\\" presentation=\\"stacked\\" groupby=\\"\\" xaxistype=\\"category\\" xaxistitle=\\"Date\\" yaxistitle=\\"Number of tasks\\" seriesnames=\\"\\" legendaveragetext=\\"Avg\\" legendmaxtext=\\"Max\\" y-axis-type=\\"value\\"></gl-stacked-column-chart-stub>"`;
exports[`TasksByTypeChart no data available should render the no data available message 1`] = `"<gl-stacked-column-chart-stub data=\\"\\" option=\\"[object Object]\\" presentation=\\"stacked\\" groupby=\\"\\" xaxistype=\\"category\\" xaxistitle=\\"Date\\" yaxistitle=\\"Number of tasks\\" seriesnames=\\"\\" legendaveragetext=\\"Avg\\" legendmaxtext=\\"Max\\" legendmintext=\\"Min\\" legendcurrenttext=\\"Current\\" legendlayout=\\"inline\\" y-axis-type=\\"value\\"></gl-stacked-column-chart-stub>"`;
exports[`TasksByTypeChart with data available should render the loading chart 1`] = `"<gl-stacked-column-chart-stub data=\\"0,1,2,5,2,3,2,4,1\\" option=\\"[object Object]\\" presentation=\\"stacked\\" groupby=\\"Group 1,Group 2,Group 3\\" xaxistype=\\"category\\" xaxistitle=\\"Date\\" yaxistitle=\\"Number of tasks\\" seriesnames=\\"Cool label,Normal label\\" legendaveragetext=\\"Avg\\" legendmaxtext=\\"Max\\" y-axis-type=\\"value\\"></gl-stacked-column-chart-stub>"`;
exports[`TasksByTypeChart with data available should render the loading chart 1`] = `"<gl-stacked-column-chart-stub data=\\"0,1,2,5,2,3,2,4,1\\" option=\\"[object Object]\\" presentation=\\"stacked\\" groupby=\\"Group 1,Group 2,Group 3\\" xaxistype=\\"category\\" xaxistitle=\\"Date\\" yaxistitle=\\"Number of tasks\\" seriesnames=\\"Cool label,Normal label\\" legendaveragetext=\\"Avg\\" legendmaxtext=\\"Max\\" legendmintext=\\"Min\\" legendcurrenttext=\\"Current\\" legendlayout=\\"inline\\" y-axis-type=\\"value\\"></gl-stacked-column-chart-stub>"`;
ee/spec/frontend/clusters/components/environments_spec.js
View file @ cd8d8f6d
......@@ -28,11 +28,13 @@ describe('Environments', () => {
it('renders an empty state if no deployments are found', () => {
const emptyState = wrapper.find(GlEmptyState);
const emptyStateText =
'No deployments found Ensure your environment is part of the deploy stage of your CI pipeline to track deployments to your cluster. Learn more about deploying to a cluster';
const emptyStateText = emptyState.text();
expect(emptyState.exists()).toBe(true);
expect(emptyState.text()).toEqual(emptyStateText);
expect(emptyStateText).toContain(
'No deployments found Ensure your environment is part of the deploy stage of your CI pipeline to track deployments to your cluster.',
);
expect(emptyStateText).toContain('Learn more about deploying to a cluster');
});
describe('environments table', () => {
......
ee/spec/frontend/packages/list/components/__snapshots__/packages_list_app_spec.js.snap
View file @ cd8d8f6d
......@@ -20,8 +20,8 @@ exports[`packages_list_app renders 1`] = `
>
<template>
<div>
<div
class="row empty-state"
<section
class="row empty-state text-center"
>
<div
class="col-12"
......@@ -31,7 +31,7 @@ exports[`packages_list_app renders 1`] = `
>
<img
alt="There are no packages yet"
class=""
class="gl-max-w-full"
src="helpSvg"
/>
</div>
......@@ -41,19 +41,15 @@ exports[`packages_list_app renders 1`] = `
class="col-12"
>
<div
class="text-content"
class="text-content gl-mx-auto gl-my-0 gl-p-5"
>
<h4
class="center"
style=""
<h1
class="h4"
>
There are no packages yet
</h4>
</h1>
<p
class="center"
style=""
>
<p>
<p>
Learn how to
<a
......@@ -66,16 +62,14 @@ exports[`packages_list_app renders 1`] = `
</p>
</p>
<div
class="text-center"
>
<div>
<!---->
<!---->
</div>
</div>
</div>
</div>
</section>
</div>
</template>
</b-tab-stub>
......@@ -87,8 +81,8 @@ exports[`packages_list_app renders 1`] = `
>
<template>
<div>
<div
class="row empty-state"
<section
class="row empty-state text-center"
>
<div
class="col-12"
......@@ -98,7 +92,7 @@ exports[`packages_list_app renders 1`] = `
>
<img
alt="There are no Conan packages yet"
class=""
class="gl-max-w-full"
src="helpSvg"
/>
</div>
......@@ -108,19 +102,15 @@ exports[`packages_list_app renders 1`] = `
class="col-12"
>
<div
class="text-content"
class="text-content gl-mx-auto gl-my-0 gl-p-5"
>
<h4
class="center"
style=""
<h1
class="h4"
>
There are no Conan packages yet
</h4>
</h1>
<p
class="center"
style=""
>
<p>
<p>
Learn how to
<a
......@@ -133,16 +123,14 @@ exports[`packages_list_app renders 1`] = `
</p>
</p>
<div
class="text-center"
>
<div>
<!---->
<!---->
</div>
</div>
</div>
</div>
</section>
</div>
</template>
</b-tab-stub>
......@@ -154,8 +142,8 @@ exports[`packages_list_app renders 1`] = `
>
<template>
<div>
<div
class="row empty-state"
<section
class="row empty-state text-center"
>
<div
class="col-12"
......@@ -165,7 +153,7 @@ exports[`packages_list_app renders 1`] = `
>
<img
alt="There are no Maven packages yet"
class=""
class="gl-max-w-full"
src="helpSvg"
/>
</div>
......@@ -175,19 +163,15 @@ exports[`packages_list_app renders 1`] = `
class="col-12"
>
<div
class="text-content"
class="text-content gl-mx-auto gl-my-0 gl-p-5"
>
<h4
class="center"
style=""
<h1
class="h4"
>
There are no Maven packages yet
</h4>
</h1>
<p
class="center"
style=""
>
<p>
<p>
Learn how to
<a
......@@ -200,16 +184,14 @@ exports[`packages_list_app renders 1`] = `
</p>
</p>
<div
class="text-center"
>
<div>
<!---->
<!---->
</div>
</div>
</div>
</div>
</section>
</div>
</template>
</b-tab-stub>
......@@ -221,8 +203,8 @@ exports[`packages_list_app renders 1`] = `
>
<template>
<div>
<div
class="row empty-state"
<section
class="row empty-state text-center"
>
<div
class="col-12"
......@@ -232,7 +214,7 @@ exports[`packages_list_app renders 1`] = `
>
<img
alt="There are no NPM packages yet"
class=""
class="gl-max-w-full"
src="helpSvg"
/>
</div>
......@@ -242,19 +224,15 @@ exports[`packages_list_app renders 1`] = `
class="col-12"
>
<div
class="text-content"
class="text-content gl-mx-auto gl-my-0 gl-p-5"
>
<h4
class="center"
style=""
<h1
class="h4"
>
There are no NPM packages yet
</h4>
</h1>
<p
class="center"
style=""
>
<p>
<p>
Learn how to
<a
......@@ -267,16 +245,14 @@ exports[`packages_list_app renders 1`] = `
</p>
</p>
<div
class="text-center"
>
<div>
<!---->
<!---->
</div>
</div>
</div>
</div>
</section>
</div>
</template>
</b-tab-stub>
......@@ -288,8 +264,8 @@ exports[`packages_list_app renders 1`] = `
>
<template>
<div>
<div
class="row empty-state"
<section
class="row empty-state text-center"
>
<div
class="col-12"
......@@ -299,7 +275,7 @@ exports[`packages_list_app renders 1`] = `
>
<img
alt="There are no NuGet packages yet"
class=""
class="gl-max-w-full"
src="helpSvg"
/>
</div>
......@@ -309,19 +285,15 @@ exports[`packages_list_app renders 1`] = `
class="col-12"
>
<div
class="text-content"
class="text-content gl-mx-auto gl-my-0 gl-p-5"
>
<h4
class="center"
style=""
<h1
class="h4"
>
There are no NuGet packages yet
</h4>
</h1>
<p
class="center"
style=""
>
<p>
<p>
Learn how to
<a
......@@ -334,16 +306,14 @@ exports[`packages_list_app renders 1`] = `
</p>
</p>
<div
class="text-center"
>
<div>
<!---->
<!---->
</div>
</div>
</div>
</div>
</section>
</div>
</template>
</b-tab-stub>
......@@ -355,8 +325,8 @@ exports[`packages_list_app renders 1`] = `
>
<template>
<div>
<div
class="row empty-state"
<section
class="row empty-state text-center"
>
<div
class="col-12"
......@@ -366,7 +336,7 @@ exports[`packages_list_app renders 1`] = `
>
<img
alt="There are no PyPi packages yet"
class=""
class="gl-max-w-full"
src="helpSvg"
/>
</div>
......@@ -376,19 +346,15 @@ exports[`packages_list_app renders 1`] = `
class="col-12"
>
<div
class="text-content"
class="text-content gl-mx-auto gl-my-0 gl-p-5"
>
<h4
class="center"
style=""
<h1
class="h4"
>
There are no PyPi packages yet
</h4>
</h1>
<p
class="center"
style=""
>
<p>
<p>
Learn how to
<a
......@@ -401,16 +367,14 @@ exports[`packages_list_app renders 1`] = `
</p>
</p>
<div
class="text-center"
>
<div>
<!---->
<!---->
</div>
</div>
</div>
</div>
</section>
</div>
</template>
</b-tab-stub>
......
ee/spec/frontend/packages/list/components/packages_list_app_spec.js
View file @ cd8d8f6d
......@@ -79,7 +79,7 @@ describe('packages_list_app', () => {
});
it('includes the right content on the default tab', () => {
const heading = findEmptyState().find('h4');
const heading = findEmptyState().find('h1');
expect(heading.text()).toBe('There are no packages yet');
});
......
spec/frontend/contributors/component/__snapshots__/contributors_spec.js.snap
View file @ cd8d8f6d
......@@ -20,7 +20,10 @@ exports[`Contributors charts should render charts when loading completed and the
height="264"
includelegendavgmax="true"
legendaveragetext="Avg"
legendcurrenttext="Current"
legendlayout="inline"
legendmaxtext="Max"
legendmintext="Min"
option="[object Object]"
thresholds=""
width="0"
......@@ -48,7 +51,10 @@ exports[`Contributors charts should render charts when loading completed and the
height="216"
includelegendavgmax="true"
legendaveragetext="Avg"
legendcurrenttext="Current"
legendlayout="inline"
legendmaxtext="Max"
legendmintext="Min"
option="[object Object]"
thresholds=""
width="0"
......
spec/frontend/projects/pipelines/charts/components/__snapshots__/pipelines_area_chart_spec.js.snap
View file @ cd8d8f6d
......@@ -14,7 +14,10 @@ exports[`PipelinesAreaChart matches the snapshot 1`] = `
data="[object Object],[object Object]"
height="300"
legendaveragetext="Avg"
legendcurrenttext="Current"
legendlayout="inline"
legendmaxtext="Max"
legendmintext="Min"
option="[object Object]"
thresholds=""
width="0"
......
yarn.lock
View file @ cd8d8f6d
......@@ -787,10 +787,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.127.0.tgz#1f7ffdffe44d6a82b372535f93d78f3a895d1960"
integrity sha512-Uv52DqkG2KwCB0VRlXUEHFZxJ/7Ql0t1YTdzICpXmDjltuUBrysFcdmWPVO6PgXQxk2ahryNsUjSOziMYTeSiw==
"@gitlab/ui@14.10.0":
version "14.10.0"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-14.10.0.tgz#39c04d62c914fcefe96c7ec32fdf31b1f98f1119"
integrity sha512-k9w6z3/QBeUas++cH5BaozjxY4fVu+AggjGoh9QMKN5hpiGTiTPx5aQJIlOv8UX/kpUmgc4pHSWAbw30YVGGFw==
"@gitlab/ui@^14.14.2":
version "14.14.2"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-14.14.2.tgz#7cc81d90d5b5394345d6781ff02e974e24b97387"
integrity sha512-Fq7fGjhofnN64xckTuuuX4EE23ZXcndwCfFBFrCTCbDfrDSa0l0xkmkrvYCSrNNTp6CyL5Ec/LWgGcnGCPWaFw==
dependencies:
"@babel/standalone" "^7.0.0"
"@gitlab/vue-toasted" "^1.3.0"
......@@ -9099,16 +9099,7 @@ postcss-value-parser@^4.0.0:
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.0.tgz#99a983d365f7b2ad8d0f9b8c3094926eab4b936d"
integrity sha512-ESPktioptiSUchCKgggAkzdmkgzKfmp0EU8jXH+5kbIUB+unr0Y4CY9SRMvibuvYUBjNh1ACLbxqYNpdTQOteQ==
postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.27, postcss@^7.0.7:
version "7.0.27"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9"
integrity sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==
dependencies:
chalk "^2.4.2"
source-map "^0.6.1"
supports-color "^6.1.0"
postcss@^7.0.5, postcss@^7.0.6:
postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.27, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7:
version "7.0.30"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.30.tgz#cc9378beffe46a02cbc4506a0477d05fcea9a8e2"
integrity sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ==
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7