summaryrefslogtreecommitdiff
path: root/spec/javascripts
diff options
context:
space:
mode:
authorBenedikt Huss <benedikt.huss@gmail.com>2016-05-04 20:45:12 +0200
committerBenedikt Huss <benedikt.huss@gmail.com>2016-05-05 00:18:36 +0200
commit0e9c2e721b08e244e63f1d26ac3771a8d858cd76 (patch)
tree140ce2a16bb3c391e5e97eec984e9feeaf0f75bc /spec/javascripts
parent655b2640ae9cbe2737369401969e99caeddf192d (diff)
downloadgitlab-ce-0e9c2e721b08e244e63f1d26ac3771a8d858cd76.tar.gz
Feedback from stanhu
Diffstat (limited to 'spec/javascripts')
-rw-r--r--spec/javascripts/merge_request_widget_spec.js.coffee20
1 files changed, 17 insertions, 3 deletions
diff --git a/spec/javascripts/merge_request_widget_spec.js.coffee b/spec/javascripts/merge_request_widget_spec.js.coffee
index e1fb610654e..c0bd8a29e43 100644
--- a/spec/javascripts/merge_request_widget_spec.js.coffee
+++ b/spec/javascripts/merge_request_widget_spec.js.coffee
@@ -4,7 +4,21 @@ describe 'MergeRequestWidget', ->
beforeEach ->
window.notifyPermissions = () ->
- @opts = {ci_status_url:"http://sampledomain.local/ci/getstatus",ci_status:""}
+ 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}
@@ -25,11 +39,11 @@ describe 'MergeRequestWidget', ->
it 'should call showCICoverage when the coverage rate is set', ->
spy = spyOn(@class, 'showCICoverage').and.stub()
- @class.getCIStatus(true)
+ @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(true)
+ @class.getCIStatus(false)
expect(spy).not.toHaveBeenCalled()