- {
+ setStartDate(newStartDate ?? null);
+ setEndDate(newEndDate ?? null);
+ }}
/>
{visits.length > 0 && (
diff --git a/test/common/ErrorHandler.test.tsx b/test/common/ErrorHandler.test.tsx
index 13e57f4e..e3c741a0 100644
--- a/test/common/ErrorHandler.test.tsx
+++ b/test/common/ErrorHandler.test.tsx
@@ -2,6 +2,7 @@ import { shallow, ShallowWrapper } from 'enzyme';
import { Button } from 'reactstrap';
import { Mock } from 'ts-mockery';
import createErrorHandler from '../../src/common/ErrorHandler';
+import { SimpleCard } from '../../src/utils/SimpleCard';
describe('
', () => {
const window = Mock.of
({
@@ -28,10 +29,10 @@ describe('', () => {
it('renders error page when error has occurred', () => {
wrapper.setState({ hasError: true });
- expect(wrapper.text()).toContain('Oops! This is awkward :S');
- expect(wrapper.text()).toContain(
+ expect(wrapper.find(SimpleCard).contains('Oops! This is awkward :S')).toEqual(true);
+ expect(wrapper.find(SimpleCard).contains(
'It seems that something went wrong. Try refreshing the page or just click this button.',
- );
+ )).toEqual(true);
expect(wrapper.find(Button)).toHaveLength(1);
});
});
diff --git a/test/common/NotFound.test.tsx b/test/common/NotFound.test.tsx
index ecd1a487..e20a7512 100644
--- a/test/common/NotFound.test.tsx
+++ b/test/common/NotFound.test.tsx
@@ -1,34 +1,34 @@
import { shallow, ShallowWrapper } from 'enzyme';
import { Link } from 'react-router-dom';
import NotFound from '../../src/common/NotFound';
+import { SimpleCard } from '../../src/utils/SimpleCard';
describe('', () => {
let wrapper: ShallowWrapper;
const createWrapper = (props = {}) => {
- wrapper = shallow();
- const content = wrapper.text();
+ wrapper = shallow().find(SimpleCard);
- return { wrapper, content };
+ return wrapper;
};
afterEach(() => wrapper?.unmount());
it('shows expected error title', () => {
- const { content } = createWrapper();
+ const wrapper = createWrapper();
- expect(content).toContain('Oops! We could not find requested route.');
+ expect(wrapper.contains('Oops! We could not find requested route.')).toEqual(true);
});
it('shows expected error message', () => {
- const { content } = createWrapper();
+ const wrapper = createWrapper();
- expect(content).toContain(
+ expect(wrapper.contains(
'Use your browser\'s back button to navigate to the page you have previously come from, or just press this button.',
- );
+ )).toEqual(true);
});
it('shows a link to the home', () => {
- const { wrapper } = createWrapper();
+ const wrapper = createWrapper();
const link = wrapper.find(Link);
expect(link.prop('to')).toEqual('/');
@@ -37,7 +37,7 @@ describe('', () => {
});
it('shows a link with provided props', () => {
- const { wrapper } = createWrapper({ to: '/foo/bar', children: 'Hello' });
+ const wrapper = createWrapper({ to: '/foo/bar', children: 'Hello' });
const link = wrapper.find(Link);
expect(link.prop('to')).toEqual('/foo/bar');
diff --git a/test/common/ShlinkVersionsContainer.test.tsx b/test/common/ShlinkVersionsContainer.test.tsx
new file mode 100644
index 00000000..063dcdf4
--- /dev/null
+++ b/test/common/ShlinkVersionsContainer.test.tsx
@@ -0,0 +1,27 @@
+import { shallow, ShallowWrapper } from 'enzyme';
+import { Mock } from 'ts-mockery';
+import ShlinkVersionsContainer from '../../src/common/ShlinkVersionsContainer';
+import { NonReachableServer, NotFoundServer, ReachableServer, SelectedServer } from '../../src/servers/data';
+
+describe('', () => {
+ let wrapper: ShallowWrapper;
+
+ const createWrapper = (selectedServer: SelectedServer) => {
+ wrapper = shallow();
+
+ return wrapper;
+ };
+
+ afterEach(() => wrapper?.unmount());
+
+ test.each([
+ [ null, 'col-12' ],
+ [ Mock.of({ serverNotFound: true }), 'col-12' ],
+ [ Mock.of({ serverNotReachable: true }), 'col-12' ],
+ [ Mock.of({ printableVersion: 'v1.0.0' }), 'col-lg-10 offset-lg-2 col-md-9 offset-md-3' ],
+ ])('renders proper col classes based on type of selected server', (selectedServer, expectedClasses) => {
+ const wrapper = createWrapper(selectedServer);
+
+ expect(wrapper.find('div').at(1).prop('className')).toEqual(`text-center ${expectedClasses}`);
+ });
+});
diff --git a/test/short-urls/SearchBar.test.tsx b/test/short-urls/SearchBar.test.tsx
index 842fcb8f..f16ba98d 100644
--- a/test/short-urls/SearchBar.test.tsx
+++ b/test/short-urls/SearchBar.test.tsx
@@ -3,7 +3,7 @@ import { Mock } from 'ts-mockery';
import searchBarCreator from '../../src/short-urls/SearchBar';
import SearchField from '../../src/utils/SearchField';
import Tag from '../../src/tags/helpers/Tag';
-import DateRangeRow from '../../src/utils/DateRangeRow';
+import { DateRangeSelector } from '../../src/utils/dates/DateRangeSelector';
import ColorGenerator from '../../src/utils/services/ColorGenerator';
describe('', () => {
@@ -20,10 +20,10 @@ describe('', () => {
expect(wrapper.find(SearchField)).toHaveLength(1);
});
- it('renders a DateRangeRow', () => {
+ it('renders a DateRangeSelector', () => {
wrapper = shallow();
- expect(wrapper.find(DateRangeRow)).toHaveLength(1);
+ expect(wrapper.find(DateRangeSelector)).toHaveLength(1);
});
it('renders no tags when the list of tags is empty', () => {
@@ -60,14 +60,14 @@ describe('', () => {
expect(listShortUrlsMock).toHaveBeenCalledTimes(1);
});
- it.each([ 'startDateChange', 'endDateChange' ])('updates short URLs list when date range changes', (event) => {
+ it('updates short URLs list when date range changes', () => {
wrapper = shallow(
,
);
- const dateRange = wrapper.find(DateRangeRow);
+ const dateRange = wrapper.find(DateRangeSelector);
expect(listShortUrlsMock).not.toHaveBeenCalled();
- dateRange.simulate(event);
+ dateRange.simulate('datesChange', {});
expect(listShortUrlsMock).toHaveBeenCalledTimes(1);
});
});
diff --git a/test/utils/DateRangeRow.test.tsx b/test/utils/dates/DateRangeRow.test.tsx
similarity index 90%
rename from test/utils/DateRangeRow.test.tsx
rename to test/utils/dates/DateRangeRow.test.tsx
index c8ef8e0f..74cbf2a2 100644
--- a/test/utils/DateRangeRow.test.tsx
+++ b/test/utils/dates/DateRangeRow.test.tsx
@@ -1,6 +1,6 @@
import { shallow, ShallowWrapper } from 'enzyme';
-import DateRangeRow from '../../src/utils/DateRangeRow';
-import DateInput from '../../src/utils/DateInput';
+import DateRangeRow from '../../../src/utils/dates/DateRangeRow';
+import DateInput from '../../../src/utils/DateInput';
describe('', () => {
let wrapper: ShallowWrapper;
diff --git a/test/utils/dates/DateRangeSelector.test.tsx b/test/utils/dates/DateRangeSelector.test.tsx
new file mode 100644
index 00000000..0df6fa18
--- /dev/null
+++ b/test/utils/dates/DateRangeSelector.test.tsx
@@ -0,0 +1,58 @@
+import { shallow, ShallowWrapper } from 'enzyme';
+import { DropdownItem } from 'reactstrap';
+import moment from 'moment';
+import { DateRangeSelector, DateRangeSelectorProps } from '../../../src/utils/dates/DateRangeSelector';
+import { DateInterval } from '../../../src/utils/dates/types';
+import { Mock } from 'ts-mockery';
+
+describe('', () => {
+ let wrapper: ShallowWrapper;
+ const onDatesChange = jest.fn();
+ const createWrapper = (props: Partial = {}) => {
+ wrapper = shallow((props)} onDatesChange={onDatesChange} />);
+
+ return wrapper;
+ };
+
+ afterEach(jest.clearAllMocks);
+ afterEach(() => wrapper?.unmount());
+
+ test('proper amount of items is rendered', () => {
+ const wrapper = createWrapper();
+ const items = wrapper.find(DropdownItem);
+
+ expect(items).toHaveLength(12);
+ expect(items.filter('[divider]')).toHaveLength(2);
+ expect(items.filter('[header]')).toHaveLength(1);
+ expect(items.filter('[text]')).toHaveLength(1);
+ expect(items.filter('[active]')).toHaveLength(8);
+ });
+
+ test.each([
+ [ undefined, 0 ],
+ [ 'today' as DateInterval, 1 ],
+ [ 'yesterday' as DateInterval, 2 ],
+ [ 'last7Days' as DateInterval, 3 ],
+ [ 'last30Days' as DateInterval, 4 ],
+ [ 'last90Days' as DateInterval, 5 ],
+ [ 'last180days' as DateInterval, 6 ],
+ [ 'last365Days' as DateInterval, 7 ],
+ [{ startDate: moment() }, 8 ],
+ ])('proper element is active based on provided date range', (initialDateRange, expectedActiveIndex) => {
+ const wrapper = createWrapper({ initialDateRange });
+ const items = wrapper.find(DropdownItem).filter('[active]');
+
+ expect.assertions(8);
+ items.forEach((item, index) => expect(item.prop('active')).toEqual(index === expectedActiveIndex));
+ });
+
+ test('selecting an element triggers onDatesChange callback', () => {
+ const wrapper = createWrapper();
+ const items = wrapper.find(DropdownItem).filter('[active]');
+
+ items.at(2).simulate('click');
+ items.at(4).simulate('click');
+ items.at(1).simulate('click');
+ expect(onDatesChange).toHaveBeenCalledTimes(3);
+ });
+});
diff --git a/test/utils/dates/types/index.test.ts b/test/utils/dates/types/index.test.ts
new file mode 100644
index 00000000..437fcc95
--- /dev/null
+++ b/test/utils/dates/types/index.test.ts
@@ -0,0 +1,88 @@
+import moment from 'moment';
+import {
+ DateInterval,
+ dateRangeIsEmpty,
+ intervalToDateRange,
+ rangeIsInterval,
+ rangeOrIntervalToString,
+} from '../../../../src/utils/dates/types';
+
+describe('date-types', () => {
+ describe('dateRangeIsEmpty', () => {
+ test.each([
+ [ undefined, true ],
+ [{}, true ],
+ [{ startDate: null }, true ],
+ [{ endDate: null }, true ],
+ [{ startDate: null, endDate: null }, true ],
+ [{ startDate: undefined }, true ],
+ [{ endDate: undefined }, true ],
+ [{ startDate: undefined, endDate: undefined }, true ],
+ [{ startDate: undefined, endDate: null }, true ],
+ [{ startDate: null, endDate: undefined }, true ],
+ [{ startDate: moment() }, false ],
+ [{ endDate: moment() }, false ],
+ [{ startDate: moment(), endDate: moment() }, false ],
+ ])('proper result is returned', (dateRange, expectedResult) => {
+ expect(dateRangeIsEmpty(dateRange)).toEqual(expectedResult);
+ });
+ });
+
+ describe('rangeIsInterval', () => {
+ test.each([
+ [ undefined, false ],
+ [{}, false ],
+ [ 'today' as DateInterval, true ],
+ [ 'yesterday' as DateInterval, true ],
+ ])('proper result is returned', (range, expectedResult) => {
+ expect(rangeIsInterval(range)).toEqual(expectedResult);
+ });
+ });
+
+ describe('rangeOrIntervalToString', () => {
+ test.each([
+ [ undefined, undefined ],
+ [ 'today' as DateInterval, 'Today' ],
+ [ 'yesterday' as DateInterval, 'Yesterday' ],
+ [ 'last7Days' as DateInterval, 'Last 7 days' ],
+ [ 'last30Days' as DateInterval, 'Last 30 days' ],
+ [ 'last90Days' as DateInterval, 'Last 90 days' ],
+ [ 'last180days' as DateInterval, 'Last 180 days' ],
+ [ 'last365Days' as DateInterval, 'Last 365 days' ],
+ [{}, undefined ],
+ [{ startDate: null }, undefined ],
+ [{ endDate: null }, undefined ],
+ [{ startDate: null, endDate: null }, undefined ],
+ [{ startDate: undefined }, undefined ],
+ [{ endDate: undefined }, undefined ],
+ [{ startDate: undefined, endDate: undefined }, undefined ],
+ [{ startDate: undefined, endDate: null }, undefined ],
+ [{ startDate: null, endDate: undefined }, undefined ],
+ [{ startDate: moment('2020-01-01') }, 'Since 2020-01-01' ],
+ [{ endDate: moment('2020-01-01') }, 'Until 2020-01-01' ],
+ [{ startDate: moment('2020-01-01'), endDate: moment('2021-02-02') }, '2020-01-01 - 2021-02-02' ],
+ ])('proper result is returned', (range, expectedValue) => {
+ expect(rangeOrIntervalToString(range)).toEqual(expectedValue);
+ });
+ });
+
+ describe('intervalToDateRange', () => {
+ const now = () => moment();
+
+ test.each([
+ [ undefined, undefined, undefined ],
+ [ 'today' as DateInterval, now(), now() ],
+ [ 'yesterday' as DateInterval, now().subtract(1, 'day'), now().subtract(1, 'day') ],
+ [ 'last7Days' as DateInterval, now().subtract(7, 'day'), now() ],
+ [ 'last30Days' as DateInterval, now().subtract(30, 'day'), now() ],
+ [ 'last90Days' as DateInterval, now().subtract(90, 'day'), now() ],
+ [ 'last180days' as DateInterval, now().subtract(180, 'day'), now() ],
+ [ 'last365Days' as DateInterval, now().subtract(365, 'day'), now() ],
+ ])('proper result is returned', (interval, expectedStartDate, expectedEndDate) => {
+ const { startDate, endDate } = intervalToDateRange(interval);
+
+ expect(expectedStartDate?.format('YYYY-MM-DD')).toEqual(startDate?.format('YYYY-MM-DD'));
+ expect(expectedEndDate?.format('YYYY-MM-DD')).toEqual(endDate?.format('YYYY-MM-DD'));
+ });
+ });
+});
diff --git a/test/visits/VisitsStats.test.tsx b/test/visits/VisitsStats.test.tsx
index 3c39bfa3..9c274a45 100644
--- a/test/visits/VisitsStats.test.tsx
+++ b/test/visits/VisitsStats.test.tsx
@@ -5,7 +5,6 @@ import VisitStats from '../../src/visits/VisitsStats';
import Message from '../../src/utils/Message';
import GraphCard from '../../src/visits/helpers/GraphCard';
import SortableBarGraph from '../../src/visits/helpers/SortableBarGraph';
-import DateRangeRow from '../../src/utils/DateRangeRow';
import { Visit, VisitsInfo } from '../../src/visits/types';
import LineChartCard from '../../src/visits/helpers/LineChartCard';
import VisitsTable from '../../src/visits/VisitsTable';
@@ -87,18 +86,6 @@ describe('', () => {
expect(table).toHaveLength(expectedTables);
});
- it('reloads visits when selected dates change', () => {
- const wrapper = createComponent({ loading: false, error: false, visits });
- const dateRange = wrapper.find(DateRangeRow);
-
- dateRange.simulate('startDateChange', '2016-01-01T00:00:00+01:00');
- dateRange.simulate('endDateChange', '2016-01-02T00:00:00+01:00');
- dateRange.simulate('endDateChange', '2016-01-03T00:00:00+01:00');
-
- expect(wrapper.find(DateRangeRow).prop('startDate')).toEqual('2016-01-01T00:00:00+01:00');
- expect(wrapper.find(DateRangeRow).prop('endDate')).toEqual('2016-01-03T00:00:00+01:00');
- });
-
it('holds the map button content generator on cities graph extraHeaderContent', () => {
const wrapper = createComponent({ loading: false, error: false, visits });
const locationNav = wrapper.find(NavLink).at(2);