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
Boxiang Sun
gitlab-ce
Commits
b5b30446
Commit
b5b30446
authored
Feb 01, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Converted mini_pipeline_graph_dropdown.js to axios
parent
76b9f1a4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
58 additions
and
41 deletions
+58
-41
app/assets/javascripts/mini_pipeline_graph_dropdown.js
app/assets/javascripts/mini_pipeline_graph_dropdown.js
+11
-15
spec/javascripts/mini_pipeline_graph_dropdown_spec.js
spec/javascripts/mini_pipeline_graph_dropdown_spec.js
+47
-26
No files found.
app/assets/javascripts/mini_pipeline_graph_dropdown.js
View file @
b5b30446
/* eslint-disable no-new */
import
Flash
from
'
./flash
'
;
import
flash
from
'
./flash
'
;
import
axios
from
'
./lib/utils/axios_utils
'
;
/**
* In each pipelines table we have a mini pipeline graph for each pipeline.
...
...
@@ -78,27 +79,22 @@ export default class MiniPipelineGraph {
const
button
=
e
.
relatedTarget
;
const
endpoint
=
button
.
dataset
.
stageEndpoint
;
return
$
.
ajax
({
dataType
:
'
json
'
,
type
:
'
GET
'
,
url
:
endpoint
,
beforeSend
:
()
=>
{
this
.
renderBuildsList
(
button
,
''
);
this
.
toggleLoading
(
button
);
},
success
:
(
data
)
=>
{
this
.
renderBuildsList
(
button
,
''
);
this
.
toggleLoading
(
button
);
axios
.
get
(
endpoint
)
.
then
(({
data
})
=>
{
this
.
toggleLoading
(
button
);
this
.
renderBuildsList
(
button
,
data
.
html
);
this
.
stopDropdownClickPropagation
();
}
,
error
:
()
=>
{
}
)
.
catch
(
()
=>
{
this
.
toggleLoading
(
button
);
if
(
$
(
button
).
parent
().
hasClass
(
'
open
'
))
{
$
(
button
).
dropdown
(
'
toggle
'
);
}
new
Flash
(
'
An error occurred while fetching the builds.
'
,
'
alert
'
);
},
});
flash
(
'
An error occurred while fetching the builds.
'
,
'
alert
'
);
});
}
/**
...
...
spec/javascripts/mini_pipeline_graph_dropdown_spec.js
View file @
b5b30446
/* eslint-disable no-new */
import
MockAdapter
from
'
axios-mock-adapter
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
MiniPipelineGraph
from
'
~/mini_pipeline_graph_dropdown
'
;
import
'
~/flash
'
;
import
timeoutPromise
from
'
./helpers/set_timeout_promise_helper
'
;
describe
(
'
Mini Pipeline Graph Dropdown
'
,
()
=>
{
preloadFixtures
(
'
static/mini_dropdown_graph.html.raw
'
);
...
...
@@ -27,6 +29,16 @@ describe('Mini Pipeline Graph Dropdown', () => {
});
describe
(
'
When dropdown is clicked
'
,
()
=>
{
let
mock
;
beforeEach
(()
=>
{
mock
=
new
MockAdapter
(
axios
);
});
afterEach
(()
=>
{
mock
.
restore
();
});
it
(
'
should call getBuildsList
'
,
()
=>
{
const
getBuildsListSpy
=
spyOn
(
MiniPipelineGraph
.
prototype
,
...
...
@@ -41,46 +53,55 @@ describe('Mini Pipeline Graph Dropdown', () => {
});
it
(
'
should make a request to the endpoint provided in the html
'
,
()
=>
{
const
ajaxSpy
=
spyOn
(
$
,
'
ajax
'
).
and
.
callFake
(
function
()
{});
const
ajaxSpy
=
spyOn
(
axios
,
'
get
'
).
and
.
callThrough
();
mock
.
onGet
(
'
foobar
'
).
reply
(
200
,
{
html
:
''
,
});
new
MiniPipelineGraph
({
container
:
'
.js-builds-dropdown-tests
'
}).
bindEvents
();
document
.
querySelector
(
'
.js-builds-dropdown-button
'
).
click
();
expect
(
ajaxSpy
.
calls
.
allArgs
()[
0
][
0
]
.
url
).
toEqual
(
'
foobar
'
);
expect
(
ajaxSpy
.
calls
.
allArgs
()[
0
][
0
]).
toEqual
(
'
foobar
'
);
});
it
(
'
should not close when user uses cmd/ctrl + click
'
,
()
=>
{
spyOn
(
$
,
'
ajax
'
).
and
.
callFake
(
function
(
params
)
{
params
.
success
({
html
:
`<li>
<a class="mini-pipeline-graph-dropdown-item" href="#">
<span class="ci-status-icon ci-status-icon-failed"></span>
<span class="ci-build-text">build</span>
</a>
<a class="ci-action-icon-wrapper js-ci-action-icon" href="#"></a>
</li>`
,
});
it
(
'
should not close when user uses cmd/ctrl + click
'
,
(
done
)
=>
{
mock
.
onGet
(
'
foobar
'
).
reply
(
200
,
{
html
:
`<li>
<a class="mini-pipeline-graph-dropdown-item" href="#">
<span class="ci-status-icon ci-status-icon-failed"></span>
<span class="ci-build-text">build</span>
</a>
<a class="ci-action-icon-wrapper js-ci-action-icon" href="#"></a>
</li>`
,
});
new
MiniPipelineGraph
({
container
:
'
.js-builds-dropdown-tests
'
}).
bindEvents
();
document
.
querySelector
(
'
.js-builds-dropdown-button
'
).
click
();
document
.
querySelector
(
'
a.mini-pipeline-graph-dropdown-item
'
).
click
();
expect
(
$
(
'
.js-builds-dropdown-list
'
).
is
(
'
:visible
'
)).
toEqual
(
true
);
timeoutPromise
()
.
then
(()
=>
{
document
.
querySelector
(
'
a.mini-pipeline-graph-dropdown-item
'
).
click
();
})
.
then
(
timeoutPromise
)
.
then
(()
=>
{
expect
(
$
(
'
.js-builds-dropdown-list
'
).
is
(
'
:visible
'
)).
toEqual
(
true
);
})
.
then
(
done
)
.
catch
(
done
.
fail
);
});
});
it
(
'
should close the dropdown when request returns an error
'
,
(
done
)
=>
{
spyOn
(
$
,
'
ajax
'
).
and
.
callFake
(
options
=>
options
.
error
()
);
it
(
'
should close the dropdown when request returns an error
'
,
(
done
)
=>
{
mock
.
onGet
(
'
foobar
'
).
networkError
(
);
new
MiniPipelineGraph
({
container
:
'
.js-builds-dropdown-tests
'
}).
bindEvents
();
new
MiniPipelineGraph
({
container
:
'
.js-builds-dropdown-tests
'
}).
bindEvents
();
document
.
querySelector
(
'
.js-builds-dropdown-button
'
).
click
();
document
.
querySelector
(
'
.js-builds-dropdown-button
'
).
click
();
setTimeout
(()
=>
{
expect
(
$
(
'
.js-builds-dropdown-tests .dropdown
'
).
hasClass
(
'
open
'
)).
toEqual
(
false
);
done
();
},
0
);
setTimeout
(()
=>
{
expect
(
$
(
'
.js-builds-dropdown-tests .dropdown
'
).
hasClass
(
'
open
'
)).
toEqual
(
false
);
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