mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-24 20:16:08 +10:00
Stan HuandYorick Peterse
ee11b9778c
Merge request widget displays TeamCity build state and code coverage correctly again ## What does this MR do? This MR contains a fix for a regression introduced in `8.7`. In former version, the TeamCity build status was always displayed correctly. In `8.7` the build state is still checked, but the UI is not updated correctly any longer. ## Are there points in the code the reviewer needs to double check? The changes are quite simple, so please simply double check them. ## Why was this MR needed? This MR is needed to make the TeamCity build status working again. ## What are the relevant issue numbers? #17080 See merge request !3998
50 lines
1.7 KiB
CoffeeScript
50 lines
1.7 KiB
CoffeeScript
#= require merge_request_widget
|
|
|
|
describe 'MergeRequestWidget', ->
|
|
|
|
beforeEach ->
|
|
window.notifyPermissions = () ->
|
|
window.notify = () ->
|
|
@opts = {
|
|
ci_status_url:"http://sampledomain.local/ci/getstatus",
|
|
ci_status:"",
|
|
ci_message: {
|
|
normal: "Build {{status}} for \"{{title}}\"",
|
|
preparing: "{{status}} build for \"{{title}}\""
|
|
},
|
|
ci_title: {
|
|
preparing: "{{status}} build",
|
|
normal: "Build {{status}}"
|
|
},
|
|
gitlab_icon:"gitlab_logo.png",
|
|
builds_path:"http://sampledomain.local/sampleBuildsPath"
|
|
}
|
|
@class = new MergeRequestWidget(@opts)
|
|
@ciStatusData = {"title":"Sample MR title","sha":"12a34bc5","status":"success","coverage":98}
|
|
|
|
describe 'getCIStatus', ->
|
|
beforeEach ->
|
|
spyOn(jQuery, 'getJSON').and.callFake (req, cb) =>
|
|
cb(@ciStatusData)
|
|
|
|
it 'should call showCIStatus even if a notification should not be displayed', ->
|
|
spy = spyOn(@class, 'showCIStatus').and.stub()
|
|
@class.getCIStatus(false)
|
|
expect(spy).toHaveBeenCalledWith(@ciStatusData.status)
|
|
|
|
it 'should call showCIStatus when a notification should be displayed', ->
|
|
spy = spyOn(@class, 'showCIStatus').and.stub()
|
|
@class.getCIStatus(true)
|
|
expect(spy).toHaveBeenCalledWith(@ciStatusData.status)
|
|
|
|
it 'should call showCICoverage when the coverage rate is set', ->
|
|
spy = spyOn(@class, 'showCICoverage').and.stub()
|
|
@class.getCIStatus(false)
|
|
expect(spy).toHaveBeenCalledWith(@ciStatusData.coverage)
|
|
|
|
it 'should not call showCICoverage when the coverage rate is not set', ->
|
|
@ciStatusData.coverage = null
|
|
spy = spyOn(@class, 'showCICoverage').and.stub()
|
|
@class.getCIStatus(false)
|
|
expect(spy).not.toHaveBeenCalled()
|