Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
42d4b013
Commit
42d4b013
authored
Jul 04, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added test for the chart legend
parent
9ec791ee
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletion
+7
-1
changelogs/unreleased/34655-label-field-for-setting-a-chart-s-legend-text-is-not-working.yml
...ield-for-setting-a-chart-s-legend-text-is-not-working.yml
+4
-0
spec/javascripts/monitoring/mock_data.js
spec/javascripts/monitoring/mock_data.js
+1
-0
spec/javascripts/monitoring/monitoring_column_spec.js
spec/javascripts/monitoring/monitoring_column_spec.js
+2
-1
No files found.
changelogs/unreleased/34655-label-field-for-setting-a-chart-s-legend-text-is-not-working.yml
0 → 100644
View file @
42d4b013
---
title
:
Fixed the chart legend not being set correctly
merge_request
:
12628
author
:
spec/javascripts/monitoring/mock_data.js
View file @
42d4b013
...
@@ -2481,6 +2481,7 @@ export const singleRowMetrics = [
...
@@ -2481,6 +2481,7 @@ export const singleRowMetrics = [
'
queries
'
:
[
'
queries
'
:
[
{
{
'
query_range
'
:
'
avg(rate(container_cpu_usage_seconds_total{%{environment_filter}}[2m])) * 100
'
,
'
query_range
'
:
'
avg(rate(container_cpu_usage_seconds_total{%{environment_filter}}[2m])) * 100
'
,
'
label
'
:
'
Container CPU
'
,
'
result
'
:
[
'
result
'
:
[
{
{
'
metric
'
:
{
'
metric
'
:
{
...
...
spec/javascripts/monitoring/monitoring_column_spec.js
View file @
42d4b013
...
@@ -95,7 +95,7 @@ describe('MonitoringColumn', () => {
...
@@ -95,7 +95,7 @@ describe('MonitoringColumn', () => {
});
});
});
});
it
(
'
has a title for the y-axis that comes from the backend
'
,
()
=>
{
it
(
'
has a title for the y-axis
and the chart legend
that comes from the backend
'
,
()
=>
{
const
component
=
createComponent
({
const
component
=
createComponent
({
columnData
:
singleRowMetrics
[
0
],
columnData
:
singleRowMetrics
[
0
],
classType
:
'
col-md-6
'
,
classType
:
'
col-md-6
'
,
...
@@ -104,5 +104,6 @@ describe('MonitoringColumn', () => {
...
@@ -104,5 +104,6 @@ describe('MonitoringColumn', () => {
});
});
expect
(
component
.
yAxisLabel
).
toEqual
(
component
.
columnData
.
y_label
);
expect
(
component
.
yAxisLabel
).
toEqual
(
component
.
columnData
.
y_label
);
expect
(
component
.
legendTitle
).
toEqual
(
component
.
columnData
.
queries
[
0
].
label
);
});
});
});
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment