Merge branch 'ci-favicon-back-in' into 'master'
Added back in the CI status favicon See merge request !10534
This commit is contained in:
commit
9c576cc7e9
2 changed files with 5 additions and 3 deletions
|
@ -90,6 +90,8 @@ window.Build = (function () {
|
|||
success: ((log) => {
|
||||
const $buildContainer = $('.js-build-output');
|
||||
|
||||
gl.utils.setCiStatusFavicon(`${this.pageUrl}/status.json`);
|
||||
|
||||
if (log.state) {
|
||||
this.state = log.state;
|
||||
}
|
||||
|
|
|
@ -98,9 +98,9 @@ describe('Build', () => {
|
|||
|
||||
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.dataType).toBe('json');
|
||||
expect(args.data.state).toBe('newstate');
|
||||
|
@ -133,7 +133,7 @@ describe('Build', () => {
|
|||
expect($('#build-trace .js-build-output').text()).toMatch(/Update/);
|
||||
|
||||
jasmine.clock().tick(4001);
|
||||
args = $.ajax.calls.argsFor(1)[0];
|
||||
args = $.ajax.calls.argsFor(2)[0];
|
||||
args.success.call($, {
|
||||
html: '<span>Different</span>',
|
||||
status: 'running',
|
||||
|
|
Loading…
Reference in a new issue