diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-05-08 22:07:40 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-05-12 15:05:07 +0200 |
| commit | 70b630d230e424e448dda580712aa99c32e73e9e (patch) | |
| tree | 8fcb992de97ed7c856aa3c27b727bf2dcb25af8b /spec | |
| parent | e181dfc24090b05b5869da4396b0a91ca5931ae5 (diff) | |
| download | gitlab-ce-70b630d230e424e448dda580712aa99c32e73e9e.tar.gz | |
Merge branch 'fix-build-notification-on-merge-page-change' into 'master'
Fix build notification on merge request page change even if the build status didn't change
## What does this MR do?
This MR contains a bugfix for #17357 which was introduced by !3998. The notification are now only shown on status changes, and not when switching between different merge requests.
## Are there points in the code the reviewer needs to double check?
Check implementation
## Why was this MR needed?
Because auf a bug introduced in !3998.
## What are the relevant issue numbers?
#17357
Closes #17357
See merge request !4086
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/javascripts/merge_request_widget_spec.js.coffee | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/javascripts/merge_request_widget_spec.js.coffee b/spec/javascripts/merge_request_widget_spec.js.coffee index c0bd8a29e43..92b7eeb1116 100644 --- a/spec/javascripts/merge_request_widget_spec.js.coffee +++ b/spec/javascripts/merge_request_widget_spec.js.coffee @@ -47,3 +47,9 @@ describe 'MergeRequestWidget', -> spy = spyOn(@class, 'showCICoverage').and.stub() @class.getCIStatus(false) expect(spy).not.toHaveBeenCalled() + + it 'should not display a notification on the first check after the widget has been created', -> + spy = spyOn(window, 'notify') + @class = new MergeRequestWidget(@opts) + @class.getCIStatus(true) + expect(spy).not.toHaveBeenCalled() |