diff options
author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-10-11 20:48:43 +0300 |
---|---|---|
committer | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-10-14 12:07:01 +0300 |
commit | 4b40027b50a2be4bad76b0a4a6a5e92c0de14255 (patch) | |
tree | 06047fb0e6edf44de196f9a8dfb2bc93dc496f42 /spec | |
parent | 88b03bb542a8480d61c260a9dc3769ab791995e5 (diff) |
Fixed conflict and corrected teaspoon test
Diffstat (limited to 'spec')
-rw-r--r-- | spec/javascripts/merge_request_widget_spec.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/javascripts/merge_request_widget_spec.js b/spec/javascripts/merge_request_widget_spec.js index 7b20572742c..c9175e2b704 100644 --- a/spec/javascripts/merge_request_widget_spec.js +++ b/spec/javascripts/merge_request_widget_spec.js @@ -26,13 +26,13 @@ describe('getCIEnvironmentsStatus', function() { beforeEach(function() { - this.ciEnvironmentsStatusData = { + this.ciEnvironmentsStatusData = [{ created_at: '2016-09-12T13:38:30.636Z', environment_id: 1, environment_name: 'env1', external_url: 'https://test-url.com', external_url_formatted: 'test-url.com' - }; + }]; spyOn(jQuery, 'getJSON').and.callFake((req, cb) => { cb(this.ciEnvironmentsStatusData); @@ -46,6 +46,7 @@ }); it('should not call renderEnvironments when the environments property is not set', function() { + this.ciEnvironmentsStatusData = null; const spy = spyOn(this.class, 'renderEnvironments').and.stub(); this.class.getCIEnvironmentsStatus(); expect(spy).not.toHaveBeenCalled(); |