Skip to content
Snippets Groups Projects
Commit 237e7b82 authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files

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

Added back in the CI status favicon

See merge request !10534

Former-commit-id: 9c576cc7
parents 0237b8eb d9688f48
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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;
}
Loading
Loading
Loading
Loading
@@ -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');
Loading
Loading
@@ -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
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment