Commit 9c576cc7 authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'ci-favicon-back-in' into 'master'

Added back in the CI status favicon

See merge request !10534
parents 481f07e7 fede01fb
...@@ -90,6 +90,8 @@ window.Build = (function () { ...@@ -90,6 +90,8 @@ window.Build = (function () {
success: ((log) => { success: ((log) => {
const $buildContainer = $('.js-build-output'); const $buildContainer = $('.js-build-output');
gl.utils.setCiStatusFavicon(`${this.pageUrl}/status.json`);
if (log.state) { if (log.state) {
this.state = log.state; this.state = log.state;
} }
......
...@@ -98,9 +98,9 @@ describe('Build', () => { ...@@ -98,9 +98,9 @@ describe('Build', () => {
jasmine.clock().tick(4001); jasmine.clock().tick(4001);
expect($.ajax.calls.count()).toBe(2); expect($.ajax.calls.count()).toBe(3);
args = $.ajax.calls.argsFor(1)[0]; args = $.ajax.calls.argsFor(2)[0];
expect(args.url).toBe(`${BUILD_URL}/trace.json`); expect(args.url).toBe(`${BUILD_URL}/trace.json`);
expect(args.dataType).toBe('json'); expect(args.dataType).toBe('json');
expect(args.data.state).toBe('newstate'); expect(args.data.state).toBe('newstate');
...@@ -133,7 +133,7 @@ describe('Build', () => { ...@@ -133,7 +133,7 @@ describe('Build', () => {
expect($('#build-trace .js-build-output').text()).toMatch(/Update/); expect($('#build-trace .js-build-output').text()).toMatch(/Update/);
jasmine.clock().tick(4001); jasmine.clock().tick(4001);
args = $.ajax.calls.argsFor(1)[0]; args = $.ajax.calls.argsFor(2)[0];
args.success.call($, { args.success.call($, {
html: '<span>Different</span>', html: '<span>Different</span>',
status: 'running', status: 'running',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment