mirrors/shlink-web-client
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink-web-client.git synced 2024-10-23 21:16:11 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixed unit tests

Browse source
This commit is contained in:
Alejandro Celaya 2020-04-04 10:36:34 +02:00
parent e6034dfb14
commit 2bd70fb9e6
7 changed files with 38 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/utils/helpers/numbers.js Normal file
View file

@ -0,0 +1,4 @@
const TEN_ROUNDING_NUMBER = 10;
const { ceil } = Math;
export const roundTen = (number) => ceil(number / TEN_ROUNDING_NUMBER) * TEN_ROUNDING_NUMBER;

4
src/utils/utils.js
View file

@ -4,9 +4,7 @@ import marker from 'leaflet/dist/images/marker-icon.png';
import markerShadow from 'leaflet/dist/images/marker-shadow.png';
import { isEmpty, isNil, range } from 'ramda';
const TEN_ROUNDING_NUMBER = 10;
const DEFAULT_TIMEOUT_DELAY = 2000;
const { ceil } = Math;
export const stateFlagTimeout = (setTimeout) => (
setState,
@ -43,6 +41,4 @@ export const fixLeafletIcons = () => {
export const rangeOf = (size, mappingFn, startAt = 1) => range(startAt, size + 1).map(mappingFn);
export const roundTen = (number) => ceil(number / TEN_ROUNDING_NUMBER) * TEN_ROUNDING_NUMBER;
export const hasValue = (value) => !isNil(value) && !isEmpty(value);

3
src/visits/SortableBarGraph.js
View file

@ -3,7 +3,8 @@ import PropTypes from 'prop-types';
import { fromPairs, head, keys, pipe, prop, reverse, sortBy, splitEvery, toLower, toPairs, type } from 'ramda';
import SortingDropdown from '../utils/SortingDropdown';
import PaginationDropdown from '../utils/PaginationDropdown';
import { rangeOf, roundTen } from '../utils/utils';
import { rangeOf } from '../utils/utils';
import { roundTen } from '../utils/helpers/numbers';
import SimplePaginator from '../common/SimplePaginator';
import GraphCard from './GraphCard';

16
src/visits/VisitsTable.js
View file

@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
import PropTypes from 'prop-types';
import Moment from 'react-moment';
import classNames from 'classnames';
import { map } from 'ramda';
import { map, min } from 'ramda';
import {
faCaretDown as caretDownIcon,
faCaretUp as caretUpIcon,
@ -90,24 +90,24 @@ const VisitsTable = ({ visits, onVisitSelected }) => {
<FontAwesomeIcon icon={checkIcon} />
</th>
<th className="short-urls-list__header-cell--with-action" onClick={orderByColumn('date')}>
{renderOrderIcon('date')}
Date
{renderOrderIcon('date')}
</th>
<th className="short-urls-list__header-cell--with-action" onClick={orderByColumn('location')}>
{renderOrderIcon('location')}
Location
{renderOrderIcon('location')}
</th>
<th className="short-urls-list__header-cell--with-action" onClick={orderByColumn('browser')}>
{renderOrderIcon('browser')}
Browser
{renderOrderIcon('browser')}
</th>
<th className="short-urls-list__header-cell--with-action" onClick={orderByColumn('os')}>
{renderOrderIcon('os')}
OS
{renderOrderIcon('os')}
</th>
<th className="short-urls-list__header-cell--with-action" onClick={orderByColumn('referer')}>
{renderOrderIcon('referer')}
Referrer
{renderOrderIcon('referer')}
</th>
</tr>
<tr>
@ -159,7 +159,9 @@ const VisitsTable = ({ visits, onVisitSelected }) => {
</div>
<div className="col-6 d-flex align-items-center flex-row-reverse">
<div>
Visits <b>{currentPage.start + 1}</b> to <b>{currentPage.end}</b> of <b>{currentPage.total}</b>
Visits <b>{currentPage.start + 1}</b> to{' '}
<b>{min(currentPage.end, currentPage.total)}</b> of{' '}
<b>{currentPage.total}</b>
</div>
</div>
</div>

20
test/utils/helpers/numbers.test.js Normal file
View file

@ -0,0 +1,20 @@
import { roundTen } from '../../../src/utils/helpers/numbers';
describe('numbers', () => {
describe('roundTen', () => {
it('rounds provided number to the next multiple of ten', () => {
const expectationsPairs = [
[ 10, 10 ],
[ 12, 20 ],
[ 158, 160 ],
[ 5, 10 ],
[ -42, -40 ],
];
expect.assertions(expectationsPairs.length);
expectationsPairs.forEach(([ number, expected ]) => {
expect(roundTen(number)).toEqual(expected);
});
});
});
});

18
test/utils/utils.test.js
View file

@ -7,7 +7,6 @@ import {
determineOrderDir,
fixLeafletIcons,
rangeOf,
roundTen,
} from '../../src/utils/utils';
describe('utils', () => {
@ -86,21 +85,4 @@ describe('utils', () => {
]);
});
});
describe('roundTen', () => {
it('rounds provided number to the next multiple of ten', () => {
const expectationsPairs = [
[ 10, 10 ],
[ 12, 20 ],
[ 158, 160 ],
[ 5, 10 ],
[ -42, -40 ],
];
expect.assertions(expectationsPairs.length);
expectationsPairs.forEach(([ number, expected ]) => {
expect(roundTen(number)).toEqual(expected);
});
});
});
});

6
test/visits/ShortUrlVisits.test.js
View file

@ -43,7 +43,7 @@ describe('<ShortUrlVisits />', () => {
});
it('renders a preloader when visits are loading', () => {
const wrapper = createComponent({ loading: true });
const wrapper = createComponent({ loading: true, visits: [] });
const loadingMessage = wrapper.find(Message);
expect(loadingMessage).toHaveLength(1);
@ -51,7 +51,7 @@ describe('<ShortUrlVisits />', () => {
});
it('renders a warning when loading large amounts of visits', () => {
const wrapper = createComponent({ loading: true, loadingLarge: true });
const wrapper = createComponent({ loading: true, loadingLarge: true, visits: [] });
const loadingMessage = wrapper.find(Message);
expect(loadingMessage).toHaveLength(1);
@ -59,7 +59,7 @@ describe('<ShortUrlVisits />', () => {
});
it('renders an error message when visits could not be loaded', () => {
const wrapper = createComponent({ loading: false, error: true });
const wrapper = createComponent({ loading: false, error: true, visits: [] });
const errorMessage = wrapper.find(Card);
expect(errorMessage).toHaveLength(1);