root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fixed infinite loop crashing tests

This commit is contained in:
Phil Hughes 2018-02-01 12:26:55 +00:00
parent 4cea24f89c
commit fe2e8dba22
No known key found for this signature in database
GPG Key ID: 32245528C52E0F9F
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
spec/javascripts/pager_spec.js
View File

@ -47,12 +47,12 @@ describe('pager', () => {
}); });
describe('getOld', () => { describe('getOld', () => {
const urlRegex = /\/some_list(.*)$/; const urlRegex = /(.*)some_list(.*)$/;
let mock; let mock;
function mockSuccess() { function mockSuccess() {
mock.onGet(urlRegex).reply(200, { mock.onGet(urlRegex).reply(200, {
count: 20, count: 0,
html: '', html: '',
}); });
} }
@ -65,9 +65,9 @@ describe('pager', () => {
setFixtures('<div class="content_list" data-href="/some_list"></div><div class="loading"></div>'); setFixtures('<div class="content_list" data-href="/some_list"></div><div class="loading"></div>');
spyOn(axios, 'get').and.callThrough(); spyOn(axios, 'get').and.callThrough();
Pager.init();
mock = new MockAdapter(axios); mock = new MockAdapter(axios);
Pager.init();
}); });
afterEach(() => { afterEach(() => {
@ -119,10 +119,15 @@ describe('pager', () => {
Pager.getOld(); Pager.getOld();
setTimeout(() => { setTimeout(() => {
const [url, params] = $.ajax.calls.argsFor(0); const [url, params] = axios.get.calls.argsFor(0);
console.log(url, params);
// expect(data).toBe('limit=20&offset=100'); expect(params).toEqual({
// expect(url).toBe('/some_list'); params: {
limit: 20,
offset: 100,
},
});
expect(url).toBe('/some_list');
done(); done();
}); });