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
790bc25d
Commit
790bc25d
authored
Oct 05, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix linter errors and karma specs
parent
228ecf36
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
5 deletions
+6
-5
app/assets/javascripts/monitoring/components/graph.vue
app/assets/javascripts/monitoring/components/graph.vue
+1
-1
app/assets/stylesheets/pages/environments.scss
app/assets/stylesheets/pages/environments.scss
+1
-0
spec/javascripts/monitoring/graph_path_spec.js
spec/javascripts/monitoring/graph_path_spec.js
+1
-1
spec/javascripts/monitoring/graph_spec.js
spec/javascripts/monitoring/graph_spec.js
+3
-3
No files found.
app/assets/javascripts/monitoring/components/graph.vue
View file @
790bc25d
...
@@ -145,7 +145,7 @@
...
@@ -145,7 +145,7 @@
this
.
graphData
.
queries
[
0
],
this
.
graphData
.
queries
[
0
],
this
.
graphWidth
,
this
.
graphWidth
,
this
.
graphHeight
,
this
.
graphHeight
,
this
.
graphHeightOffset
this
.
graphHeightOffset
,
);
);
if
(
this
.
timeSeries
.
length
>
3
)
{
if
(
this
.
timeSeries
.
length
>
3
)
{
...
...
app/assets/stylesheets/pages/environments.scss
View file @
790bc25d
...
@@ -292,6 +292,7 @@
...
@@ -292,6 +292,7 @@
>
line
{
>
line
{
stroke
:
$gray-darker
;
stroke
:
$gray-darker
;
}
}
>
text
{
>
text
{
font-size
:
12px
;
font-size
:
12px
;
}
}
...
...
spec/javascripts/monitoring/graph_path_spec.js
View file @
790bc25d
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
GraphPath
from
'
~/monitoring/components/graph
_
path.vue
'
;
import
GraphPath
from
'
~/monitoring/components/graph
/
path.vue
'
;
import
createTimeSeries
from
'
~/monitoring/utils/multiple_time_series
'
;
import
createTimeSeries
from
'
~/monitoring/utils/multiple_time_series
'
;
import
{
singleRowMetricsMultipleSeries
,
convertDatesMultipleSeries
}
from
'
./mock_data
'
;
import
{
singleRowMetricsMultipleSeries
,
convertDatesMultipleSeries
}
from
'
./mock_data
'
;
...
...
spec/javascripts/monitoring/graph_spec.js
View file @
790bc25d
...
@@ -44,7 +44,7 @@ describe('Graph', () => {
...
@@ -44,7 +44,7 @@ describe('Graph', () => {
.
not
.
toEqual
(
-
1
);
.
not
.
toEqual
(
-
1
);
});
});
it
(
'
out
t
erViewBox gets a width and height property based on the DOM size of the element
'
,
()
=>
{
it
(
'
outerViewBox gets a width and height property based on the DOM size of the element
'
,
()
=>
{
const
component
=
createComponent
({
const
component
=
createComponent
({
graphData
:
convertedMetrics
[
1
],
graphData
:
convertedMetrics
[
1
],
classType
:
'
col-md-6
'
,
classType
:
'
col-md-6
'
,
...
@@ -52,8 +52,8 @@ describe('Graph', () => {
...
@@ -52,8 +52,8 @@ describe('Graph', () => {
deploymentData
,
deploymentData
,
});
});
const
viewBoxArray
=
component
.
out
t
erViewBox
.
split
(
'
'
);
const
viewBoxArray
=
component
.
outerViewBox
.
split
(
'
'
);
expect
(
typeof
component
.
out
t
erViewBox
).
toEqual
(
'
string
'
);
expect
(
typeof
component
.
outerViewBox
).
toEqual
(
'
string
'
);
expect
(
viewBoxArray
[
2
]).
toEqual
(
component
.
graphWidth
.
toString
());
expect
(
viewBoxArray
[
2
]).
toEqual
(
component
.
graphWidth
.
toString
());
expect
(
viewBoxArray
[
3
]).
toEqual
(
component
.
graphHeight
.
toString
());
expect
(
viewBoxArray
[
3
]).
toEqual
(
component
.
graphHeight
.
toString
());
});
});
...
...
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