Pagination only changes the page parameter.
Fix broken test
This commit is contained in:
parent
4830a8b58c
commit
548a0b6a13
3 changed files with 15 additions and 28 deletions
|
@ -45,18 +45,15 @@ const CommitPipelinesStoreWithTimeAgo = require('../commit/pipelines/pipelines_s
|
|||
|
||||
methods: {
|
||||
/**
|
||||
* Changes the URL according to the pagination component.
|
||||
* Will change the page number and update the URL.
|
||||
*
|
||||
* If no scope is provided, 'all' is assumed.
|
||||
*
|
||||
* Pagination component sends "null" when no scope is provided.
|
||||
*
|
||||
* @param {Number} pagenum
|
||||
* @param {String} apiScope = 'all'
|
||||
* @param {Number} pageNumber desired page to go to.
|
||||
*/
|
||||
change(pagenum, apiScope) {
|
||||
if (!apiScope) apiScope = 'all';
|
||||
gl.utils.visitUrl(`?scope=${apiScope}&page=${pagenum}`);
|
||||
change(pageNumber) {
|
||||
const param = gl.utils.setParamInURL('page', pageNumber);
|
||||
|
||||
gl.utils.visitUrl(param);
|
||||
return param;
|
||||
},
|
||||
},
|
||||
template: `
|
||||
|
|
|
@ -23,8 +23,8 @@ window.Vue = require('vue');
|
|||
|
||||
Here is an example `change` method:
|
||||
|
||||
change(pagenum, apiScope) {
|
||||
gl.utils.visitUrl(`?scope=${apiScope}&p=${pagenum}`);
|
||||
change(pagenum) {
|
||||
gl.utils.visitUrl(`?page=${pagenum}`);
|
||||
},
|
||||
*/
|
||||
|
||||
|
@ -57,8 +57,6 @@ window.Vue = require('vue');
|
|||
},
|
||||
methods: {
|
||||
changePage(e) {
|
||||
const apiScope = gl.utils.getParameterByName('scope');
|
||||
|
||||
const text = e.target.innerText;
|
||||
const { totalPages, nextPage, previousPage } = this.pageInfo;
|
||||
|
||||
|
@ -66,19 +64,19 @@ window.Vue = require('vue');
|
|||
case SPREAD:
|
||||
break;
|
||||
case LAST:
|
||||
this.change(totalPages, apiScope);
|
||||
this.change(totalPages);
|
||||
break;
|
||||
case NEXT:
|
||||
this.change(nextPage, apiScope);
|
||||
this.change(nextPage);
|
||||
break;
|
||||
case PREV:
|
||||
this.change(previousPage, apiScope);
|
||||
this.change(previousPage);
|
||||
break;
|
||||
case FIRST:
|
||||
this.change(1, apiScope);
|
||||
this.change(1);
|
||||
break;
|
||||
default:
|
||||
this.change(+text, apiScope);
|
||||
this.change(+text);
|
||||
break;
|
||||
}
|
||||
},
|
||||
|
|
|
@ -6,12 +6,10 @@ describe('Pagination component', () => {
|
|||
|
||||
const changeChanges = {
|
||||
one: '',
|
||||
two: '',
|
||||
};
|
||||
|
||||
const change = (one, two) => {
|
||||
const change = (one) => {
|
||||
changeChanges.one = one;
|
||||
changeChanges.two = two;
|
||||
};
|
||||
|
||||
it('should render and start at page 1', () => {
|
||||
|
@ -34,7 +32,6 @@ describe('Pagination component', () => {
|
|||
component.changePage({ target: { innerText: '1' } });
|
||||
|
||||
expect(changeChanges.one).toEqual(1);
|
||||
expect(changeChanges.two).toEqual(null);
|
||||
});
|
||||
|
||||
it('should go to the previous page', () => {
|
||||
|
@ -55,7 +52,6 @@ describe('Pagination component', () => {
|
|||
component.changePage({ target: { innerText: 'Prev' } });
|
||||
|
||||
expect(changeChanges.one).toEqual(1);
|
||||
expect(changeChanges.two).toEqual(null);
|
||||
});
|
||||
|
||||
it('should go to the next page', () => {
|
||||
|
@ -76,7 +72,6 @@ describe('Pagination component', () => {
|
|||
component.changePage({ target: { innerText: 'Next' } });
|
||||
|
||||
expect(changeChanges.one).toEqual(5);
|
||||
expect(changeChanges.two).toEqual(null);
|
||||
});
|
||||
|
||||
it('should go to the last page', () => {
|
||||
|
@ -97,7 +92,6 @@ describe('Pagination component', () => {
|
|||
component.changePage({ target: { innerText: 'Last >>' } });
|
||||
|
||||
expect(changeChanges.one).toEqual(10);
|
||||
expect(changeChanges.two).toEqual(null);
|
||||
});
|
||||
|
||||
it('should go to the first page', () => {
|
||||
|
@ -118,7 +112,6 @@ describe('Pagination component', () => {
|
|||
component.changePage({ target: { innerText: '<< First' } });
|
||||
|
||||
expect(changeChanges.one).toEqual(1);
|
||||
expect(changeChanges.two).toEqual(null);
|
||||
});
|
||||
|
||||
it('should do nothing', () => {
|
||||
|
@ -139,7 +132,6 @@ describe('Pagination component', () => {
|
|||
component.changePage({ target: { innerText: '...' } });
|
||||
|
||||
expect(changeChanges.one).toEqual(1);
|
||||
expect(changeChanges.two).toEqual(null);
|
||||
});
|
||||
});
|
||||
|
||||
|
|
Loading…
Reference in a new issue