Updated to airbnb coding styles

test/servers/CreateServer.test.tsx

@@ -18,8 +18,8 @@ describe('<CreateServer />', () => {
     (useNavigate as any).mockReturnValue(navigate);
 
     const useStateFlagTimeout = jest.fn()
-      .mockReturnValueOnce([ serversImported, () => '' ])
-      .mockReturnValueOnce([ importFailed, () => '' ])
+      .mockReturnValueOnce([serversImported, () => ''])
+      .mockReturnValueOnce([importFailed, () => ''])
       .mockReturnValue([]);
     const CreateServer = createServerConstruct(ImportServersBtn, useStateFlagTimeout);
 

test/servers/DeleteServerModal.test.tsx

@@ -21,7 +21,7 @@ describe('<DeleteServerModal />', () => {
       <DeleteServerModal
         server={Mock.of<ServerWithId>({ name: serverName })}
         toggle={toggleMock}
-        isOpen={true}
+        isOpen
         deleteServer={deleteServerMock}
       />,
     );

test/servers/ManageServers.test.tsx

@@ -12,7 +12,7 @@ describe('<ManageServers />', () => {
   const serversExporter = Mock.of<ServersExporter>({ exportServers });
   const ImportServersBtn = () => null;
   const ManageServersRow = () => null;
-  const useStateFlagTimeout = jest.fn().mockReturnValue([ false, jest.fn() ]);
+  const useStateFlagTimeout = jest.fn().mockReturnValue([false, jest.fn()]);
   const ManageServers = createManageServers(serversExporter, ImportServersBtn, useStateFlagTimeout, ManageServersRow);
   let wrapper: ShallowWrapper;
   const createServerMock = (value: string, autoConnect = false) => Mock.of<ServerWithId>(
@@ -52,8 +52,8 @@ describe('<ManageServers />', () => {
   });
 
   it.each([
-    [ createServerMock('foo'), 3 ],
-    [ createServerMock('foo', true), 4 ],
+    [createServerMock('foo'), 3],
+    [createServerMock('foo', true), 4],
   ])('shows different amount of columns if there are at least one auto-connect server', (server, expectedCols) => {
     const wrapper = createWrapper({ server });
     const row = wrapper.find(ManageServersRow);
@@ -63,8 +63,8 @@ describe('<ManageServers />', () => {
   });
 
   it.each([
-    [{}, 1 ],
-    [{ foo: createServerMock('foo') }, 2 ],
+    [{}, 1],
+    [{ foo: createServerMock('foo') }, 2],
   ])('shows export button if the list of servers is not empty', (servers, expectedButtons) => {
     const wrapper = createWrapper(servers);
     const exportBtn = wrapper.find(Button);
@@ -82,7 +82,7 @@ describe('<ManageServers />', () => {
   });
 
   it('shows an error message if an error occurs while importing servers', () => {
-    useStateFlagTimeout.mockReturnValue([ true, jest.fn() ]);
+    useStateFlagTimeout.mockReturnValue([true, jest.fn()]);
 
     const wrapper = createWrapper({ foo: createServerMock('foo') });
     const result = wrapper.find(Result);

test/servers/ManageServersRow.test.tsx

@@ -24,8 +24,8 @@ describe('<ManageServersRow />', () => {
   afterEach(() => wrapper?.unmount());
 
   it.each([
-    [ true, 4 ],
-    [ false, 3 ],
+    [true, 4],
+    [false, 3],
   ])('renders expected amount of columns', (hasAutoConnect, expectedCols) => {
     const wrapper = createWrapper(hasAutoConnect);
     const td = wrapper.find('td');
@@ -43,8 +43,8 @@ describe('<ManageServersRow />', () => {
   });
 
   it.each([
-    [ true, 1 ],
-    [ false, 0 ],
+    [true, 1],
+    [false, 0],
   ])('renders auto-connect icon only if server is autoConnect', (autoConnect, expectedIcons) => {
     const wrapper = createWrapper(true, autoConnect);
     const icon = wrapper.find(FontAwesomeIcon);

test/servers/ManageServersRowDropdown.test.tsx

@@ -73,8 +73,8 @@ describe('<ManageServersRowDropdown />', () => {
   });
 
   it.each([
-    [ true, 'Do not auto-connect' ],
-    [ false, 'Auto-connect' ],
+    [true, 'Do not auto-connect'],
+    [false, 'Auto-connect'],
   ])('shows different auto-connect toggle text depending on current server status', (autoConnect, expectedText) => {
     const wrapper = createWrapper(autoConnect);
     const item = wrapper.find(DropdownItem).at(2);

test/servers/Overview.test.tsx

@@ -32,7 +32,7 @@ describe('<Overview />', () => {
           listTags={listTags}
           loadVisitsOverview={loadVisitsOverview}
           shortUrlsList={Mock.of<ShortUrlsListState>({ loading, shortUrls })}
-          tagsList={Mock.of<TagsList>({ loading, tags: [ 'foo', 'bar', 'baz' ] })}
+          tagsList={Mock.of<TagsList>({ loading, tags: ['foo', 'bar', 'baz'] })}
           visitsOverview={Mock.of<VisitsOverview>({ loading, visitsCount: 3456, orphanVisitsCount: 28 })}
           selectedServer={Mock.of<ReachableServer>({ id: serverId })}
           createNewVisits={jest.fn()}

test/servers/ServersListGroup.test.tsx

@@ -40,7 +40,7 @@ describe('<ServersListGroup />', () => {
   });
 
   it.each([
-    [ servers ],
+    [servers],
     [[]],
   ])('shows servers list', (servers) => {
     const wrapped = createComponent({ servers });
@@ -50,9 +50,9 @@ describe('<ServersListGroup />', () => {
   });
 
   it.each([
-    [ true, 'servers-list__list-group servers-list__list-group--embedded' ],
-    [ false, 'servers-list__list-group' ],
-    [ undefined, 'servers-list__list-group' ],
+    [true, 'servers-list__list-group servers-list__list-group--embedded'],
+    [false, 'servers-list__list-group'],
+    [undefined, 'servers-list__list-group'],
   ])('renders proper classes for embedded', (embedded, expectedClasses) => {
     const wrapped = createComponent({ servers, embedded });
     const listGroup = wrapped.find(ListGroup);

test/servers/helpers/DuplicatedServersModal.test.tsx

@@ -20,11 +20,11 @@ describe('<DuplicatedServersModal />', () => {
   afterEach(() => wrapper?.unmount());
 
   it.each([
-    [[], 0 ],
-    [[ Mock.all<ServerData>() ], 2 ],
-    [[ Mock.all<ServerData>(), Mock.all<ServerData>() ], 2 ],
-    [[ Mock.all<ServerData>(), Mock.all<ServerData>(), Mock.all<ServerData>() ], 3 ],
-    [[ Mock.all<ServerData>(), Mock.all<ServerData>(), Mock.all<ServerData>(), Mock.all<ServerData>() ], 4 ],
+    [[], 0],
+    [[Mock.all<ServerData>()], 2],
+    [[Mock.all<ServerData>(), Mock.all<ServerData>()], 2],
+    [[Mock.all<ServerData>(), Mock.all<ServerData>(), Mock.all<ServerData>()], 3],
+    [[Mock.all<ServerData>(), Mock.all<ServerData>(), Mock.all<ServerData>(), Mock.all<ServerData>()], 4],
   ])('renders expected amount of items', (duplicatedServers, expectedItems) => {
     const wrapper = createWrapper(duplicatedServers);
     const li = wrapper.find('li');
@@ -34,7 +34,7 @@ describe('<DuplicatedServersModal />', () => {
 
   it.each([
     [
-      [ Mock.all<ServerData>() ],
+      [Mock.all<ServerData>()],
       {
         header: 'Duplicated server',
         firstParagraph: 'There is already a server with:',
@@ -43,7 +43,7 @@ describe('<DuplicatedServersModal />', () => {
       },
     ],
     [
-      [ Mock.all<ServerData>(), Mock.all<ServerData>() ],
+      [Mock.all<ServerData>(), Mock.all<ServerData>()],
       {
         header: 'Duplicated servers',
         firstParagraph: 'The next servers already exist:',
@@ -66,7 +66,7 @@ describe('<DuplicatedServersModal />', () => {
 
   it.each([
     [[]],
-    [[ Mock.of<ServerData>({ url: 'url', apiKey: 'apiKey' }) ]],
+    [[Mock.of<ServerData>({ url: 'url', apiKey: 'apiKey' })]],
   ])('displays provided server data', (duplicatedServers) => {
     const wrapper = createWrapper(duplicatedServers);
     const li = wrapper.find('li');

test/servers/helpers/ForServerVersion.test.tsx

@@ -26,9 +26,9 @@ describe('<ForServerVersion />', () => {
   });
 
   it.each([
-    [ '2.0.0' as SemVerPattern, undefined, '1.8.3' as SemVer ],
-    [ undefined, '1.8.0' as SemVerPattern, '1.8.3' as SemVer ],
-    [ '1.7.0' as SemVerPattern, '1.8.0' as SemVerPattern, '1.8.3' as SemVer ],
+    ['2.0.0' as SemVerPattern, undefined, '1.8.3' as SemVer],
+    [undefined, '1.8.0' as SemVerPattern, '1.8.3' as SemVer],
+    ['1.7.0' as SemVerPattern, '1.8.0' as SemVerPattern, '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);
 
@@ -36,11 +36,11 @@ describe('<ForServerVersion />', () => {
   });
 
   it.each([
-    [ '2.0.0' as SemVerPattern, undefined, '2.8.3' as SemVer ],
-    [ '2.0.0' as SemVerPattern, undefined, '2.0.0' as SemVer ],
-    [ undefined, '1.8.0' as SemVerPattern, '1.8.0' as SemVer ],
-    [ undefined, '1.8.0' as SemVerPattern, '1.7.1' as SemVer ],
-    [ '1.7.0' as SemVerPattern, '1.8.0' as SemVerPattern, '1.7.3' as SemVer ],
+    ['2.0.0' as SemVerPattern, undefined, '2.8.3' as SemVer],
+    ['2.0.0' as SemVerPattern, undefined, '2.0.0' as SemVer],
+    [undefined, '1.8.0' as SemVerPattern, '1.8.0' as SemVer],
+    [undefined, '1.8.0' as SemVerPattern, '1.7.1' as SemVer],
+    ['1.7.0' as SemVerPattern, '1.8.0' as SemVerPattern, '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);
 

test/servers/helpers/HighlightCard.test.tsx

@@ -16,8 +16,8 @@ describe('<HighlightCard />', () => {
   afterEach(() => wrapper?.unmount());
 
   it.each([
-    [ undefined ],
-    [ false ],
+    [undefined],
+    [false],
   ])('renders expected components', (link) => {
     const wrapper = createWrapper({ title: 'foo', link: link as undefined | false });
 
@@ -30,9 +30,9 @@ describe('<HighlightCard />', () => {
   });
 
   it.each([
-    [ 'foo' ],
-    [ 'bar' ],
-    [ 'baz' ],
+    ['foo'],
+    ['bar'],
+    ['baz'],
   ])('renders provided title', (title) => {
     const wrapper = createWrapper({ title });
     const cardTitle = wrapper.find(CardTitle);
@@ -41,9 +41,9 @@ describe('<HighlightCard />', () => {
   });
 
   it.each([
-    [ 'foo' ],
-    [ 'bar' ],
-    [ 'baz' ],
+    ['foo'],
+    ['bar'],
+    ['baz'],
   ])('renders provided children', (children) => {
     const wrapper = createWrapper({ title: 'foo', children });
     const cardText = wrapper.find(CardText);
@@ -52,9 +52,9 @@ describe('<HighlightCard />', () => {
   });
 
   it.each([
-    [ 'foo' ],
-    [ 'bar' ],
-    [ 'baz' ],
+    ['foo'],
+    ['bar'],
+    ['baz'],
   ])('adds extra props when a link is provided', (link) => {
     const wrapper = createWrapper({ title: 'foo', link });
 

test/servers/helpers/ImportServersBtn.test.tsx

@@ -41,9 +41,9 @@ describe('<ImportServersBtn />', () => {
   });
 
   it.each([
-    [ undefined, '' ],
-    [ 'foo', 'foo' ],
-    [ 'bar', 'bar' ],
+    [undefined, ''],
+    ['foo', 'foo'],
+    ['bar', 'bar'],
   ])('allows a class name to be provided', (providedClassName, expectedClassName) => {
     const wrapper = createWrapper({ className: providedClassName });
 
@@ -51,9 +51,9 @@ describe('<ImportServersBtn />', () => {
   });
 
   it.each([
-    [ undefined, true ],
-    [ 'foo', false ],
-    [ 'bar', false ],
+    [undefined, true],
+    ['foo', false],
+    ['bar', false],
   ])('has expected text', (children, expectToHaveDefaultText) => {
     const wrapper = createWrapper({ children });
 
@@ -78,14 +78,14 @@ describe('<ImportServersBtn />', () => {
     const wrapper = createWrapper();
     const file = wrapper.find('.import-servers-btn__csv-select');
 
-    await file.simulate('change', { target: { files: [ '' ] } }); // eslint-disable-line @typescript-eslint/await-thenable
+    await file.simulate('change', { target: { files: [''] } }); // eslint-disable-line @typescript-eslint/await-thenable
 
     expect(importServersFromFile).toHaveBeenCalledTimes(1);
   });
 
   it.each([
-    [ 'discard' ],
-    [ 'save' ],
+    ['discard'],
+    ['save'],
   ])('invokes callback in DuplicatedServersModal events', (event) => {
     const wrapper = createWrapper();
 

test/servers/helpers/ServerError.test.tsx

@@ -38,7 +38,7 @@ describe('<ServerError />', () => {
     const wrapperText = wrapper.html();
     const textPairs = Object.entries(textsToFind);
 
-    textPairs.forEach(([ text, shouldBeFound ]) => {
+    textPairs.forEach(([text, shouldBeFound]) => {
       if (shouldBeFound) {
         expect(wrapperText).toContain(text);
       } else {

test/servers/reducers/remoteServers.test.ts

@@ -80,7 +80,7 @@ describe('remoteServersReducer', () => {
           },
         },
       ],
-      [ '<html></html>', {}],
+      ['<html></html>', {}],
       [{}, {}],
     ])('tries to fetch servers from remote', async (mockedValue, expectedNewServers) => {
       get.mockResolvedValue(mockedValue);

test/servers/reducers/selectedServer.test.ts

@@ -45,9 +45,9 @@ describe('selectedServerReducer', () => {
     afterEach(jest.clearAllMocks);
 
     it.each([
-      [ version, version, `v${version}` ],
-      [ 'latest', MAX_FALLBACK_VERSION, 'latest' ],
-      [ '%invalid_semver%', MIN_FALLBACK_VERSION, '%invalid_semver%' ],
+      [version, version, `v${version}`],
+      ['latest', MAX_FALLBACK_VERSION, 'latest'],
+      ['%invalid_semver%', MIN_FALLBACK_VERSION, '%invalid_semver%'],
     ])('dispatches proper actions', async (serverVersion, expectedVersion, expectedPrintableVersion) => {
       const id = uuid();
       const getState = createGetStateMock(id);

test/servers/reducers/servers.test.ts

@@ -58,8 +58,8 @@ describe('serverReducer', () => {
       }));
 
     it.each([
-      [ true ],
-      [ false ],
+      [true],
+      [false],
     ])('returns state as it is when trying to set auto-connect on invalid server', (autoConnect) =>
       expect(reducer(list, {
         type: SET_AUTO_CONNECT,
@@ -149,8 +149,8 @@ describe('serverReducer', () => {
 
     describe('setAutoConnect', () => {
       it.each([
-        [ true ],
-        [ false ],
+        [true],
+        [false],
       ])('returns expected action', (autoConnect) => {
         const serverToEdit = Mock.of<RegularServer>({ id: 'abc123' });
         const result = setAutoConnect(serverToEdit, autoConnect);

test/servers/services/ServersImporter.test.ts

@@ -4,7 +4,7 @@ import { ServersImporter } from '../../../src/servers/services/ServersImporter';
 import { RegularServer } from '../../../src/servers/data';
 
 describe('ServersImporter', () => {
-  const servers: RegularServer[] = [ Mock.all<RegularServer>(), Mock.all<RegularServer>() ];
+  const servers: RegularServer[] = [Mock.all<RegularServer>(), Mock.all<RegularServer>()];
   const toObject = jest.fn().mockReturnValue(servers);
   const csvjsonMock = Mock.of<CsvJson>({ toObject });
   const readAsText = jest.fn();
@@ -37,7 +37,7 @@ describe('ServersImporter', () => {
 
     it.each([
       [{}],
-      [ undefined ],
+      [undefined],
       [[{ foo: 'bar' }]],
       [
         [