diff options
| author | Regis <boudinot.regis@yahoo.com> | 2016-12-13 13:03:49 -0700 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2016-12-13 13:03:49 -0700 |
| commit | 77daed05ca877e9882096787b3d57244baaa5d91 (patch) | |
| tree | 48e972448234b338dba2fce10eaee19f8e6027ec /spec/javascripts/merge_request_widget_spec.js | |
| parent | d46af1d9b263916063200f5fd2cafa18df11c37b (diff) | |
| parent | 632450a4bd95c7f67f9968e57b317dc4b4704f5f (diff) | |
| download | gitlab-ce-77daed05ca877e9882096787b3d57244baaa5d91.tar.gz | |
merge master
Diffstat (limited to 'spec/javascripts/merge_request_widget_spec.js')
| -rw-r--r-- | spec/javascripts/merge_request_widget_spec.js | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/spec/javascripts/merge_request_widget_spec.js b/spec/javascripts/merge_request_widget_spec.js index 62890f1ca96..6f91529db00 100644 --- a/spec/javascripts/merge_request_widget_spec.js +++ b/spec/javascripts/merge_request_widget_spec.js @@ -106,6 +106,18 @@ }); }); + describe('mergeInProgress', function() { + it('should display error with h4 tag', function() { + spyOn(this.class.$widgetBody, 'html').and.callFake(function(html) { + expect(html).toBe('<h4>Sorry, something went wrong.</h4>'); + }); + spyOn($, 'ajax').and.callFake(function(e) { + e.success({ merge_error: 'Sorry, something went wrong.' }); + }); + this.class.mergeInProgress(null); + }); + }); + return describe('getCIStatus', function() { beforeEach(function() { this.ciStatusData = { |