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
c0c1e3d3
Commit
c0c1e3d3
authored
Dec 25, 2019
by
Illya Klymov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ensure search against actual render tree
parent
8f23a3bb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
8 deletions
+11
-8
spec/frontend/monitoring/components/charts/time_series_spec.js
...frontend/monitoring/components/charts/time_series_spec.js
+10
-7
spec/frontend/registry/list/components/table_registry_spec.js
.../frontend/registry/list/components/table_registry_spec.js
+1
-1
No files found.
spec/frontend/monitoring/components/charts/time_series_spec.js
View file @
c0c1e3d3
...
@@ -340,11 +340,10 @@ describe('Time series component', () => {
...
@@ -340,11 +340,10 @@ describe('Time series component', () => {
glChartComponents
.
forEach
(
dynamicComponent
=>
{
glChartComponents
.
forEach
(
dynamicComponent
=>
{
describe
(
`GitLab UI:
${
dynamicComponent
.
chartType
}
`
,
()
=>
{
describe
(
`GitLab UI:
${
dynamicComponent
.
chartType
}
`
,
()
=>
{
let
timeSeriesAreaChart
;
let
timeSeriesAreaChart
;
let
glChart
;
const
findChart
=
()
=>
timeSeriesAreaChart
.
find
(
dynamicComponent
.
component
)
;
beforeEach
(
done
=>
{
beforeEach
(
done
=>
{
timeSeriesAreaChart
=
makeTimeSeriesChart
(
mockGraphData
,
dynamicComponent
.
chartType
);
timeSeriesAreaChart
=
makeTimeSeriesChart
(
mockGraphData
,
dynamicComponent
.
chartType
);
glChart
=
timeSeriesAreaChart
.
find
(
dynamicComponent
.
component
);
timeSeriesAreaChart
.
vm
.
$nextTick
(
done
);
timeSeriesAreaChart
.
vm
.
$nextTick
(
done
);
});
});
...
@@ -353,12 +352,12 @@ describe('Time series component', () => {
...
@@ -353,12 +352,12 @@ describe('Time series component', () => {
});
});
it
(
'
is a Vue instance
'
,
()
=>
{
it
(
'
is a Vue instance
'
,
()
=>
{
expect
(
glChart
.
exists
()).
toBe
(
true
);
expect
(
findChart
()
.
exists
()).
toBe
(
true
);
expect
(
glChart
.
isVueInstance
()).
toBe
(
true
);
expect
(
findChart
()
.
isVueInstance
()).
toBe
(
true
);
});
});
it
(
'
receives data properties needed for proper chart render
'
,
()
=>
{
it
(
'
receives data properties needed for proper chart render
'
,
()
=>
{
const
props
=
glChart
.
props
();
const
props
=
findChart
()
.
props
();
expect
(
props
.
data
).
toBe
(
timeSeriesAreaChart
.
vm
.
chartData
);
expect
(
props
.
data
).
toBe
(
timeSeriesAreaChart
.
vm
.
chartData
);
expect
(
props
.
option
).
toBe
(
timeSeriesAreaChart
.
vm
.
chartOptions
);
expect
(
props
.
option
).
toBe
(
timeSeriesAreaChart
.
vm
.
chartOptions
);
...
@@ -371,7 +370,9 @@ describe('Time series component', () => {
...
@@ -371,7 +370,9 @@ describe('Time series component', () => {
timeSeriesAreaChart
.
vm
.
tooltip
.
title
=
mockTitle
;
timeSeriesAreaChart
.
vm
.
tooltip
.
title
=
mockTitle
;
timeSeriesAreaChart
.
vm
.
$nextTick
(()
=>
{
timeSeriesAreaChart
.
vm
.
$nextTick
(()
=>
{
expect
(
shallowWrapperContainsSlotText
(
glChart
,
'
tooltipTitle
'
,
mockTitle
)).
toBe
(
true
);
expect
(
shallowWrapperContainsSlotText
(
findChart
(),
'
tooltipTitle
'
,
mockTitle
)).
toBe
(
true
,
);
done
();
done
();
});
});
});
});
...
@@ -386,7 +387,9 @@ describe('Time series component', () => {
...
@@ -386,7 +387,9 @@ describe('Time series component', () => {
});
});
it
(
'
uses deployment title
'
,
()
=>
{
it
(
'
uses deployment title
'
,
()
=>
{
expect
(
shallowWrapperContainsSlotText
(
glChart
,
'
tooltipTitle
'
,
'
Deployed
'
)).
toBe
(
true
);
expect
(
shallowWrapperContainsSlotText
(
findChart
(),
'
tooltipTitle
'
,
'
Deployed
'
)).
toBe
(
true
,
);
});
});
it
(
'
renders clickable commit sha in tooltip content
'
,
done
=>
{
it
(
'
renders clickable commit sha in tooltip content
'
,
done
=>
{
...
...
spec/frontend/registry/list/components/table_registry_spec.js
View file @
c0c1e3d3
...
@@ -97,10 +97,10 @@ describe('table registry', () => {
...
@@ -97,10 +97,10 @@ describe('table registry', () => {
it
(
'
selecting all checkbox should select all rows and enable delete button
'
,
done
=>
{
it
(
'
selecting all checkbox should select all rows and enable delete button
'
,
done
=>
{
const
selectAll
=
findSelectAllCheckbox
();
const
selectAll
=
findSelectAllCheckbox
();
const
checkboxes
=
findSelectCheckboxes
();
selectAll
.
trigger
(
'
click
'
);
selectAll
.
trigger
(
'
click
'
);
Vue
.
nextTick
(()
=>
{
Vue
.
nextTick
(()
=>
{
const
checkboxes
=
findSelectCheckboxes
();
const
checked
=
checkboxes
.
filter
(
w
=>
w
.
element
.
checked
);
const
checked
=
checkboxes
.
filter
(
w
=>
w
.
element
.
checked
);
expect
(
checked
.
length
).
toBe
(
checkboxes
.
length
);
expect
(
checked
.
length
).
toBe
(
checkboxes
.
length
);
done
();
done
();
...
...
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