kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fixed conflict and corrected teaspoon test

Browse source
This commit is contained in:
Luke Bennett 2016-10-11 18:48:43 +01:00 committed by Z.J. van de Weg
parent 88b03bb542
commit 4b40027b50
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
spec/javascripts/merge_request_widget_spec.js
View file

@ -26,13 +26,13 @@
describe('getCIEnvironmentsStatus', function() { describe('getCIEnvironmentsStatus', function() {
beforeEach(function() { beforeEach(function() {
this.ciEnvironmentsStatusData = { this.ciEnvironmentsStatusData = [{
created_at: '2016-09-12T13:38:30.636Z', created_at: '2016-09-12T13:38:30.636Z',
environment_id: 1, environment_id: 1,
environment_name: 'env1', environment_name: 'env1',
external_url: 'https://test-url.com', external_url: 'https://test-url.com',
external_url_formatted: 'test-url.com' external_url_formatted: 'test-url.com'
}; }];
spyOn(jQuery, 'getJSON').and.callFake((req, cb) => { spyOn(jQuery, 'getJSON').and.callFake((req, cb) => {
cb(this.ciEnvironmentsStatusData); cb(this.ciEnvironmentsStatusData);
@ -46,6 +46,7 @@
}); });
it('should not call renderEnvironments when the environments property is not set', function() { it('should not call renderEnvironments when the environments property is not set', function() {
this.ciEnvironmentsStatusData = null;
const spy = spyOn(this.class, 'renderEnvironments').and.stub(); const spy = spyOn(this.class, 'renderEnvironments').and.stub();
this.class.getCIEnvironmentsStatus(); this.class.getCIEnvironmentsStatus();
expect(spy).not.toHaveBeenCalled(); expect(spy).not.toHaveBeenCalled();