fixed failing specs
This commit is contained in:
parent
58eb3c55c9
commit
f165bda4ae
|
@ -102,28 +102,28 @@ export default class LabelsSelect {
|
|||
}
|
||||
$value.removeAttr('style').html(template);
|
||||
$sidebarCollapsedValue.text(labelCount);
|
||||
|
||||
|
||||
if (data.labels.length) {
|
||||
labelTitles = data.labels.map(function(label) {
|
||||
return label.title;
|
||||
});
|
||||
|
||||
|
||||
if (labelTitles.length > 5) {
|
||||
labelTitles = labelTitles.slice(0, 5);
|
||||
labelTitles.push('and ' + (data.labels.length - 5) + ' more');
|
||||
}
|
||||
|
||||
|
||||
labelTooltipTitle = labelTitles.join(', ');
|
||||
}
|
||||
else {
|
||||
labelTooltipTitle = '';
|
||||
$sidebarLabelTooltip.tooltip('destroy');
|
||||
}
|
||||
|
||||
|
||||
$sidebarLabelTooltip
|
||||
.attr('title', labelTooltipTitle)
|
||||
.tooltip('fixTitle');
|
||||
|
||||
|
||||
$('.has-tooltip', $value).tooltip({
|
||||
container: 'body'
|
||||
});
|
||||
|
@ -168,7 +168,7 @@ export default class LabelsSelect {
|
|||
data = extraData.concat(data);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
callback(data);
|
||||
if (showMenuAbove) {
|
||||
$dropdown.data('glDropdown').positionMenuAbove();
|
||||
|
|
|
@ -246,7 +246,7 @@ export default class MergeRequestTabs {
|
|||
return;
|
||||
}
|
||||
|
||||
this.toggleLoading(true)
|
||||
this.toggleLoading(true);
|
||||
|
||||
axios.get(`${source}.json`)
|
||||
.then(({ data }) => {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/* eslint-disable space-before-function-paren, one-var, one-var-declaration-per-line, no-use-before-define, comma-dangle, max-len */
|
||||
import MockAdaptor from 'axios-mock-adapter';
|
||||
import MockAdapter from 'axios-mock-adapter';
|
||||
import axios from '~/lib/utils/axios_utils';
|
||||
import Issue from '~/issue';
|
||||
import '~/lib/utils/text_utility';
|
||||
|
@ -138,7 +138,7 @@ describe('Issue', function() {
|
|||
this.issueStateDeferred = new jQuery.Deferred();
|
||||
this.canCreateBranchDeferred = new jQuery.Deferred();
|
||||
|
||||
mock = new MockAdaptor(axios);
|
||||
mock = new MockAdapter(axios);
|
||||
|
||||
spyOn(jQuery, 'ajax').and.callFake(ajaxSpy.bind(this));
|
||||
});
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import MockAdaptor from 'axios-mock-adapter';
|
||||
import MockAdapter from 'axios-mock-adapter';
|
||||
import axios from '~/lib/utils/axios_utils';
|
||||
import { numberToHumanSize } from '~/lib/utils/number_utils';
|
||||
import * as urlUtils from '~/lib/utils/url_utility';
|
||||
|
@ -22,11 +22,9 @@ describe('Job', () => {
|
|||
|
||||
spyOn(urlUtils, 'visitUrl');
|
||||
|
||||
mock = new MockAdaptor(axios);
|
||||
mock = new MockAdapter(axios);
|
||||
|
||||
mock.onGet(new RegExp(`${JOB_URL}/trace.json?(.*)`)).reply(() => {
|
||||
return [200, response];
|
||||
});
|
||||
mock.onGet(new RegExp(`${JOB_URL}/trace.json?(.*)`)).reply(() => [200, response]);
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
/* eslint-disable no-new */
|
||||
import MockAdapter from 'axios-mock-adapter';
|
||||
import axios from '~/lib/utils/axios_utils';
|
||||
import IssuableContext from '~/issuable_context';
|
||||
import LabelsSelect from '~/labels_select';
|
||||
|
||||
|
@ -10,33 +12,42 @@ import '~/users_select';
|
|||
|
||||
(() => {
|
||||
let saveLabelCount = 0;
|
||||
let mock;
|
||||
|
||||
describe('Issue dropdown sidebar', () => {
|
||||
preloadFixtures('static/issue_sidebar_label.html.raw');
|
||||
|
||||
beforeEach(() => {
|
||||
loadFixtures('static/issue_sidebar_label.html.raw');
|
||||
|
||||
mock = new MockAdapter(axios);
|
||||
|
||||
new IssuableContext('{"id":1,"name":"Administrator","username":"root"}');
|
||||
new LabelsSelect();
|
||||
|
||||
spyOn(jQuery, 'ajax').and.callFake((req) => {
|
||||
const d = $.Deferred();
|
||||
let LABELS_DATA = [];
|
||||
mock.onGet('/root/test/labels.json').reply(() => {
|
||||
const labels = Array(10).fill().map((_, i) => ({
|
||||
id: i,
|
||||
title: `test ${i}`,
|
||||
color: '#5CB85C',
|
||||
}));
|
||||
|
||||
if (req.url === '/root/test/labels.json') {
|
||||
for (let i = 0; i < 10; i += 1) {
|
||||
LABELS_DATA.push({ id: i, title: `test ${i}`, color: '#5CB85C' });
|
||||
}
|
||||
} else if (req.url === '/root/test/issues/2.json') {
|
||||
const tmp = [];
|
||||
for (let i = 0; i < saveLabelCount; i += 1) {
|
||||
tmp.push({ id: i, title: `test ${i}`, color: '#5CB85C' });
|
||||
}
|
||||
LABELS_DATA = { labels: tmp };
|
||||
}
|
||||
|
||||
d.resolve(LABELS_DATA);
|
||||
return d.promise();
|
||||
return [200, labels];
|
||||
});
|
||||
|
||||
mock.onPut('/root/test/issues/2.json').reply(() => {
|
||||
const labels = Array(saveLabelCount).fill().map((_, i) => ({
|
||||
id: i,
|
||||
title: `test ${i}`,
|
||||
color: '#5CB85C',
|
||||
}));
|
||||
|
||||
return [200, { labels }];
|
||||
});
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
mock.restore();
|
||||
});
|
||||
|
||||
it('changes collapsed tooltip when changing labels when less than 5', (done) => {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/* eslint-disable no-var, comma-dangle, object-shorthand */
|
||||
import MockAdaptor from 'axios-mock-adapter';
|
||||
import MockAdapter from 'axios-mock-adapter';
|
||||
import axios from '~/lib/utils/axios_utils';
|
||||
import * as urlUtils from '~/lib/utils/url_utility';
|
||||
import MergeRequestTabs from '~/merge_request_tabs';
|
||||
|
@ -218,7 +218,7 @@ import 'vendor/jquery.scrollTo';
|
|||
let mock;
|
||||
|
||||
beforeEach(function () {
|
||||
mock = new MockAdaptor(axios);
|
||||
mock = new MockAdapter(axios);
|
||||
mock.onGet(/(.*)\/diffs\.json/).reply(200, {
|
||||
data: { html: '' },
|
||||
});
|
||||
|
@ -344,7 +344,7 @@ import 'vendor/jquery.scrollTo';
|
|||
.attr('href')
|
||||
.replace('#', '');
|
||||
|
||||
mock = new MockAdaptor(axios);
|
||||
mock = new MockAdapter(axios);
|
||||
mock.onGet(/(.*)\/diffs\.json/).reply(200, diffsResponse);
|
||||
});
|
||||
|
||||
|
@ -410,7 +410,7 @@ import 'vendor/jquery.scrollTo';
|
|||
.attr('href')
|
||||
.replace('#', '');
|
||||
|
||||
mock = new MockAdaptor(axios);
|
||||
mock = new MockAdapter(axios);
|
||||
mock.onGet(/(.*)\/diffs\.json/).reply(200, diffsResponse);
|
||||
});
|
||||
|
||||
|
|
Loading…
Reference in New Issue