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
Léo-Paul Géneau
gitlab-ce
Commits
cac2ed25
Commit
cac2ed25
authored
Apr 11, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle cancelled request
[ci skip] Adds specs Adds specs
parent
0bc8440d
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
427 additions
and
13 deletions
+427
-13
app/assets/javascripts/pipelines/constants.js
app/assets/javascripts/pipelines/constants.js
+2
-0
app/assets/javascripts/pipelines/mixins/pipelines.js
app/assets/javascripts/pipelines/mixins/pipelines.js
+19
-12
spec/javascripts/pipelines/mock_data.js
spec/javascripts/pipelines/mock_data.js
+326
-0
spec/javascripts/pipelines/pipelines_spec.js
spec/javascripts/pipelines/pipelines_spec.js
+76
-0
spec/javascripts/pipelines/stage_spec.js
spec/javascripts/pipelines/stage_spec.js
+4
-1
No files found.
app/assets/javascripts/pipelines/constants.js
0 → 100644
View file @
cac2ed25
// eslint-disable-next-line import/prefer-default-export
export
const
CANCEL_REQUEST
=
'
CANCEL_REQUEST
'
;
app/assets/javascripts/pipelines/mixins/pipelines.js
View file @
cac2ed25
...
...
@@ -7,6 +7,7 @@ import SvgBlankState from '../components/blank_state.vue';
import
LoadingIcon
from
'
../../vue_shared/components/loading_icon.vue
'
;
import
PipelinesTableComponent
from
'
../components/pipelines_table.vue
'
;
import
eventHub
from
'
../event_hub
'
;
import
{
CANCEL_REQUEST
}
from
'
../constants
'
;
export
default
{
components
:
{
...
...
@@ -65,15 +66,13 @@ export default {
updateTable
()
{
// Cancel ongoing request
if
(
this
.
isMakingRequest
)
{
this
.
service
.
cancelationSource
.
cancel
();
this
.
service
.
cancelationSource
.
cancel
(
CANCEL_REQUEST
);
}
// Stop polling
this
.
poll
.
stop
();
// make new request
this
.
getPipelines
();
// restart polling
this
.
poll
.
restart
();
// Update the table
return
this
.
getPipelines
()
.
then
(()
=>
this
.
poll
.
restart
());
},
fetchPipelines
()
{
if
(
!
this
.
isMakingRequest
)
{
...
...
@@ -83,21 +82,29 @@ export default {
}
},
getPipelines
()
{
this
.
service
.
getPipelines
(
this
.
requestData
)
return
this
.
service
.
getPipelines
(
this
.
requestData
)
.
then
(
response
=>
this
.
successCallback
(
response
))
.
catch
((
)
=>
this
.
errorCallback
(
));
.
catch
((
error
)
=>
this
.
errorCallback
(
error
));
},
setCommonData
(
pipelines
)
{
this
.
store
.
storePipelines
(
pipelines
);
this
.
isLoading
=
false
;
this
.
updateGraphDropdown
=
true
;
this
.
hasMadeRequest
=
true
;
// In case the previous polling request returned an error, we need to reset it
if
(
this
.
hasError
)
{
this
.
hasError
=
false
;
}
},
errorCallback
()
{
this
.
has
Error
=
true
;
errorCallback
(
error
)
{
this
.
has
MadeRequest
=
true
;
this
.
isLoading
=
false
;
if
(
error
&&
error
.
message
&&
error
.
message
!==
CANCEL_REQUEST
)
{
this
.
hasError
=
true
;
this
.
updateGraphDropdown
=
false
;
this
.
hasMadeRequest
=
true
;
}
},
setIsMakingRequest
(
isMakingRequest
)
{
this
.
isMakingRequest
=
isMakingRequest
;
...
...
spec/javascripts/pipelines/mock_data.js
0 → 100644
View file @
cac2ed25
This diff is collapsed.
Click to expand it.
spec/javascripts/pipelines/pipelines_spec.js
View file @
cac2ed25
...
...
@@ -4,6 +4,7 @@ import axios from '~/lib/utils/axios_utils';
import
pipelinesComp
from
'
~/pipelines/components/pipelines.vue
'
;
import
Store
from
'
~/pipelines/stores/pipelines_store
'
;
import
mountComponent
from
'
spec/helpers/vue_mount_component_helper
'
;
import
{
pipelineWithStages
,
stageReply
}
from
'
./mock_data
'
;
describe
(
'
Pipelines
'
,
()
=>
{
const
jsonFixtureName
=
'
pipelines/pipelines.json
'
;
...
...
@@ -668,4 +669,79 @@ describe('Pipelines', () => {
});
});
});
describe
(
'
updates results when a staged is clicked
'
,
()
=>
{
beforeEach
(()
=>
{
const
copyPipeline
=
Object
.
assign
({},
pipelineWithStages
);
copyPipeline
.
id
+=
1
;
mock
.
onGet
(
'
twitter/flight/pipelines.json
'
).
reply
(
200
,
{
pipelines
:
[
pipelineWithStages
],
count
:
{
all
:
1
,
finished
:
1
,
pending
:
0
,
running
:
0
,
},
},
{
'
POLL-INTERVAL
'
:
100
,
})
.
onGet
(
pipelineWithStages
.
details
.
stages
[
0
].
dropdown_path
)
.
reply
(
200
,
stageReply
);
vm
=
mountComponent
(
PipelinesComponent
,
{
store
:
new
Store
(),
hasGitlabCi
:
true
,
canCreatePipeline
:
true
,
...
paths
,
});
});
describe
(
'
when a request is being made
'
,
()
=>
{
it
(
'
stops polling, cancels the request, fetches pipelines & restarts polling
'
,
(
done
)
=>
{
spyOn
(
vm
.
poll
,
'
stop
'
);
spyOn
(
vm
.
poll
,
'
restart
'
);
spyOn
(
vm
,
'
getPipelines
'
).
and
.
returnValue
(
Promise
.
resolve
());
spyOn
(
vm
.
service
.
cancelationSource
,
'
cancel
'
).
and
.
callThrough
();
setTimeout
(()
=>
{
vm
.
isMakingRequest
=
true
;
return
vm
.
$nextTick
()
.
then
(()
=>
{
vm
.
$el
.
querySelector
(
'
.js-builds-dropdown-button
'
).
click
();
})
.
then
(()
=>
{
expect
(
vm
.
service
.
cancelationSource
.
cancel
).
toHaveBeenCalled
();
expect
(
vm
.
poll
.
stop
).
toHaveBeenCalled
();
setTimeout
(()
=>
{
expect
(
vm
.
getPipelines
).
toHaveBeenCalled
();
expect
(
vm
.
poll
.
restart
).
toHaveBeenCalled
();
done
();
},
0
);
});
},
0
);
});
});
describe
(
'
when no request is being made
'
,
()
=>
{
it
(
'
stops polling, fetches pipelines & restarts polling
'
,
(
done
)
=>
{
spyOn
(
vm
.
poll
,
'
stop
'
);
spyOn
(
vm
.
poll
,
'
restart
'
);
spyOn
(
vm
,
'
getPipelines
'
).
and
.
returnValue
(
Promise
.
resolve
());
setTimeout
(()
=>
{
vm
.
$el
.
querySelector
(
'
.js-builds-dropdown-button
'
).
click
();
expect
(
vm
.
poll
.
stop
).
toHaveBeenCalled
();
setTimeout
(()
=>
{
expect
(
vm
.
getPipelines
).
toHaveBeenCalled
();
expect
(
vm
.
poll
.
restart
).
toHaveBeenCalled
();
done
();
},
0
);
},
0
);
});
});
});
});
spec/javascripts/pipelines/stage_spec.js
View file @
cac2ed25
...
...
@@ -2,6 +2,7 @@ import Vue from 'vue';
import
MockAdapter
from
'
axios-mock-adapter
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
stage
from
'
~/pipelines/components/stage.vue
'
;
import
eventHub
from
'
~/pipelines/event_hub
'
;
import
mountComponent
from
'
spec/helpers/vue_mount_component_helper
'
;
describe
(
'
Pipelines stage component
'
,
()
=>
{
...
...
@@ -43,13 +44,15 @@ describe('Pipelines stage component', () => {
mock
.
onGet
(
'
path.json
'
).
reply
(
200
,
{
html
:
'
foo
'
});
});
it
(
'
should render the received data
'
,
done
=>
{
it
(
'
should render the received data and emit `clickedDropdown` event
'
,
done
=>
{
spyOn
(
eventHub
,
'
$emit
'
);
component
.
$el
.
querySelector
(
'
button
'
).
click
();
setTimeout
(()
=>
{
expect
(
component
.
$el
.
querySelector
(
'
.js-builds-dropdown-container ul
'
).
textContent
.
trim
(),
).
toEqual
(
'
foo
'
);
expect
(
eventHub
.
$emit
).
toHaveBeenCalledWith
(
'
clickedDropdown
'
);
done
();
},
0
);
});
...
...
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