Added stricter types for SemVer versions

This commit is contained in:
Alejandro Celaya
2021-03-06 09:38:48 +01:00
parent b4c2fb5b8f
commit 70ce099913
7 changed files with 53 additions and 39 deletions

View File

@@ -2,11 +2,12 @@ import { mount, ReactWrapper } from 'enzyme';
import { Mock } from 'ts-mockery';
import ForServerVersion from '../../../src/servers/helpers/ForServerVersion';
import { ReachableServer, SelectedServer } from '../../../src/servers/data';
import { SemVer, SemVerPattern } from '../../../src/utils/helpers/version';
describe('<ForServerVersion />', () => {
let wrapped: ReactWrapper;
const renderComponent = (selectedServer: SelectedServer, minVersion?: string, maxVersion?: string) => {
const renderComponent = (selectedServer: SelectedServer, minVersion?: SemVerPattern, maxVersion?: SemVerPattern) => {
wrapped = mount(
<ForServerVersion minVersion={minVersion} maxVersion={maxVersion} selectedServer={selectedServer}>
<span>Hello</span>
@@ -19,15 +20,15 @@ describe('<ForServerVersion />', () => {
afterEach(() => wrapped?.unmount());
it('does not render children when current server is empty', () => {
const wrapped = renderComponent(null, '1');
const wrapped = renderComponent(null, '1.*.*');
expect(wrapped.html()).toBeNull();
});
it.each([
[ '2.0.0', undefined, '1.8.3' ],
[ undefined, '1.8.0', '1.8.3' ],
[ '1.7.0', '1.8.0', '1.8.3' ],
[ '2.0.0' as SemVer, undefined, '1.8.3' as SemVer ],
[ undefined, '1.8.0' as SemVer, '1.8.3' as SemVer ],
[ '1.7.0' as SemVer, '1.8.0' as SemVer, '1.8.3' as SemVer ],
])('does not render children when current version does not match requirements', (min, max, version) => {
const wrapped = renderComponent(Mock.of<ReachableServer>({ version, printableVersion: version }), min, max);
@@ -35,11 +36,11 @@ describe('<ForServerVersion />', () => {
});
it.each([
[ '2.0.0', undefined, '2.8.3' ],
[ '2.0.0', undefined, '2.0.0' ],
[ undefined, '1.8.0', '1.8.0' ],
[ undefined, '1.8.0', '1.7.1' ],
[ '1.7.0', '1.8.0', '1.7.3' ],
[ '2.0.0' as SemVer, undefined, '2.8.3' as SemVer ],
[ '2.0.0' as SemVer, undefined, '2.0.0' as SemVer ],
[ undefined, '1.8.0' as SemVer, '1.8.0' as SemVer ],
[ undefined, '1.8.0' as SemVer, '1.7.1' as SemVer ],
[ '1.7.0' as SemVer, '1.8.0' as SemVer, '1.7.3' as SemVer ],
])('renders children when current version matches requirements', (min, max, version) => {
const wrapped = renderComponent(Mock.of<ReachableServer>({ version, printableVersion: version }), min, max);