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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
8efd2301
Commit
8efd2301
authored
Mar 22, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed prometheus_graph_spec.js and scss-linters
parent
5b0890ed
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
6 deletions
+10
-6
app/assets/stylesheets/pages/environments.scss
app/assets/stylesheets/pages/environments.scss
+4
-2
spec/javascripts/monitoring/prometheus_graph_spec.js
spec/javascripts/monitoring/prometheus_graph_spec.js
+6
-4
No files found.
app/assets/stylesheets/pages/environments.scss
View file @
8efd2301
...
@@ -159,19 +159,21 @@
...
@@ -159,19 +159,21 @@
text
{
text
{
fill
:
$stat-graph-axis-fill
;
fill
:
$stat-graph-axis-fill
;
}
}
.label-axis-text
,
.label-axis-text
,
.text-metric-usage
{
.text-metric-usage
{
fill
:
$black
;
fill
:
$black
;
font-weight
:
500
;
font-weight
:
500
;
}
}
.legend-axis-text
{
.legend-axis-text
{
fill
:
$black
;
fill
:
$black
;
}
}
}
}
.x-axis
path
,
.x-axis
path
,
.y-axis
path
,
.y-axis
path
,
.x-axis-line
,
.
label-
x-axis-line
,
.label-y-axis-line
{
.label-y-axis-line
{
fill
:
none
;
fill
:
none
;
stroke-width
:
1
;
stroke-width
:
1
;
...
...
spec/javascripts/monitoring/prometheus_graph_spec.js
View file @
8efd2301
...
@@ -37,9 +37,11 @@ describe('PrometheusGraph', () => {
...
@@ -37,9 +37,11 @@ describe('PrometheusGraph', () => {
it
(
'
transforms the data
'
,
()
=>
{
it
(
'
transforms the data
'
,
()
=>
{
this
.
prometheusGraph
.
init
(
prometheusMockData
.
metrics
);
this
.
prometheusGraph
.
init
(
prometheusMockData
.
metrics
);
expect
(
this
.
prometheusGraph
.
data
).
toBeDefined
();
Object
.
keys
(
this
.
prometheusGraph
.
graphSpecificProperties
,
(
key
)
=>
{
expect
(
this
.
prometheusGraph
.
data
.
cpu_values
.
length
).
toBe
(
121
);
const
graphProps
=
this
.
prometheusGraph
.
graphSpecificProperties
[
key
];
expect
(
this
.
prometheusGraph
.
data
.
memory_values
.
length
).
toBe
(
121
);
expect
(
graphProps
.
data
).
toBeDefined
();
expect
(
graphProps
.
data
.
length
).
toBe
(
121
);
});
});
});
it
(
'
creates two graphs
'
,
()
=>
{
it
(
'
creates two graphs
'
,
()
=>
{
...
@@ -68,7 +70,7 @@ describe('PrometheusGraph', () => {
...
@@ -68,7 +70,7 @@ describe('PrometheusGraph', () => {
expect
(
$prometheusGraphContents
.
find
(
'
.label-y-axis-line
'
)).
toBeDefined
();
expect
(
$prometheusGraphContents
.
find
(
'
.label-y-axis-line
'
)).
toBeDefined
();
expect
(
$prometheusGraphContents
.
find
(
'
.label-axis-text
'
)).
toBeDefined
();
expect
(
$prometheusGraphContents
.
find
(
'
.label-axis-text
'
)).
toBeDefined
();
expect
(
$prometheusGraphContents
.
find
(
'
.rect-axis-text
'
)).
toBeDefined
();
expect
(
$prometheusGraphContents
.
find
(
'
.rect-axis-text
'
)).
toBeDefined
();
expect
(
$axisLabelContainer
.
find
(
'
rect
'
).
length
).
toBe
(
2
);
expect
(
$axisLabelContainer
.
find
(
'
rect
'
).
length
).
toBe
(
3
);
expect
(
$axisLabelContainer
.
find
(
'
text
'
).
length
).
toBe
(
4
);
expect
(
$axisLabelContainer
.
find
(
'
text
'
).
length
).
toBe
(
4
);
});
});
});
});
...
...
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