chore: moved tests to ./test directory (#366)

* chore: allow coverage to be generated from non-tested files

10 files changed, 61 insertions, 29 deletions

diff --git a/jest.config.js b/jest.config.js
index 264014997..964e4d4e6 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -20,7 +20,7 @@ module.exports = {
   collectCoverage: true,
 
   // An array of glob patterns indicating a set of files for which coverage information should be collected
-  // collectCoverageFrom: undefined,
+  collectCoverageFrom: ['src/**/*.{js,jsx,ts,tsx}', '!src/internal-api'],
 
   // The directory where Jest should output its coverage files
   coverageDirectory: 'coverage',
@@ -117,9 +117,7 @@ module.exports = {
   // rootDir: undefined,
 
   // A list of paths to directories that Jest should use to search for files in
-  roots: [
-    'src'
-  ],
+  roots: ['src/', 'test/'],
 
   // Allows you to use a custom runner instead of Jest's default test runner
   // runner: "jest-runner",
diff --git a/src/helpers/array-helpers.ts b/src/helpers/array-helpers.ts
index 3f8806176..45ff932ba 100644
--- a/src/helpers/array-helpers.ts
+++ b/src/helpers/array-helpers.ts
@@ -1,4 +1,4 @@
-export const shuffleArray = (arr: any[]) =>
+export const shuffleArray = (arr: any[]): any[] =>
   arr
     .map(a => [Math.random(), a])
     .sort((a, b) => a[0] - b[0])
diff --git a/src/helpers/password-helpers.ts b/src/helpers/password-helpers.ts
index 053321bbf..d5f2d0c49 100644
--- a/src/helpers/password-helpers.ts
+++ b/src/helpers/password-helpers.ts
@@ -1,10 +1,10 @@
 import { createHash, BinaryLike } from 'crypto';
 
-export function hash(password: BinaryLike) {
+export function hash(password: BinaryLike): string {
   return createHash('sha256').update(password).digest('base64');
 }
 
-export function scorePassword(password: string) {
+export function scorePassword(password: string): number {
   let score = 0;
   if (!password) {
     return score;
diff --git a/@types/index.d.ts b/src/types.ts
index 015f1eb91..db8711cd3 100644
--- a/@types/index.d.ts
+++ b/src/types.ts
@@ -14,6 +14,7 @@ declare global {
     }
   }
 }
+
 /**
  * Workaround to make TS recognize this file as a module.
  * https://fettblog.eu/typescript-augmenting-global-lib-dom/
diff --git a/src/features/utils/FeatureStore.test.js b/test/features/utils/FeatureStore.test.js
index 1995431bd..d8d85bec1 100644
--- a/src/features/utils/FeatureStore.test.js
+++ b/test/features/utils/FeatureStore.test.js
@@ -1,9 +1,9 @@
 import PropTypes from 'prop-types';
 import { observable } from 'mobx';
-import { FeatureStore } from './FeatureStore';
-import { createActionsFromDefinitions } from '../../actions/lib/actions';
-import { createActionBindings } from './ActionBinding';
-import { createReactions } from '../../stores/lib/Reaction';
+import { FeatureStore } from '../../../src/features/utils/FeatureStore';
+import { createActionsFromDefinitions } from '../../../src/actions/lib/actions';
+import { createActionBindings } from '../../../src/features/utils/ActionBinding';
+import { createReactions } from '../../../src/stores/lib/Reaction';
 
 const actions = createActionsFromDefinitions(
   {
diff --git a/test/helpers/array-helpers.test.ts b/test/helpers/array-helpers.test.ts
new file mode 100644
index 000000000..e8060c2c4
--- /dev/null
+++ b/test/helpers/array-helpers.test.ts
@@ -0,0 +1,15 @@
+import { shuffleArray } from '../../src/helpers/array-helpers';
+
+describe('array_helpers', () => {
+  it('isValidExternalURL', () => {
+    const originalArray = ['a', 'b', 'c'];
+    const shuffledArray = shuffleArray(originalArray);
+
+    // Expect the arrays to not be exactly the same
+    expect(shuffledArray).not.toEqual(originalArray);
+
+    // Expect the arrays to be exactly the same
+    // when both are sorted alphabetically
+    expect(shuffledArray.sort()).toEqual(originalArray.sort());
+  });
+});
diff --git a/src/helpers/url-helpers.test.ts b/test/helpers/url-helpers.test.ts
index 5af3025e9..9ef06b905 100644
--- a/src/helpers/url-helpers.test.ts
+++ b/test/helpers/url-helpers.test.ts
@@ -1,4 +1,4 @@
-import * as url_helpers from './url-helpers'
+import * as url_helpers from '../../src/helpers/url-helpers';
 
 describe('url_helpers', () => {
   describe('isValidExternalURL', () => {
@@ -38,7 +38,9 @@ describe('url_helpers', () => {
       // Note: not testing the invalid string urls - since the URL ctor itself will raise an error
 
       it('returns false for invalid url', () => {
-        const result = url_helpers.isValidExternalURL(new URL('shttps://google'));
+        const result = url_helpers.isValidExternalURL(
+          new URL('shttps://google'),
+        );
         expect(result).toBe(false);
       });
 
@@ -48,7 +50,9 @@ describe('url_helpers', () => {
       });
 
       it('returns true for valid https url', () => {
-        const result = url_helpers.isValidExternalURL(new URL('https://google'));
+        const result = url_helpers.isValidExternalURL(
+          new URL('https://google'),
+        );
         expect(result).toBe(true);
       });
     });
@@ -71,21 +75,34 @@ describe('url_helpers', () => {
     });
 
     it('handles string starting with http://', () => {
-      expect(url_helpers.fixUrl('http://some/random/url')).toEqual('http://some/random/url');
-      expect(url_helpers.fixUrl('http://some//random//url')).toEqual('http://some/random/url');
-
-      const gmailEmbeddedUrl = 'https://www.google.com/url?q=https://github.com/ferdium/ferdium-app/issues/87&source=gmail';
+      expect(url_helpers.fixUrl('http://some/random/url')).toEqual(
+        'http://some/random/url',
+      );
+      expect(url_helpers.fixUrl('http://some//random//url')).toEqual(
+        'http://some/random/url',
+      );
+
+      const gmailEmbeddedUrl =
+        'https://www.google.com/url?q=https://github.com/ferdium/ferdium-app/issues/87&source=gmail';
       expect(url_helpers.fixUrl(gmailEmbeddedUrl)).toEqual(gmailEmbeddedUrl); // it should NOT remove the double-slash from the embedded url in the query string
     });
 
     it('handles string starting with https://', () => {
-      expect(url_helpers.fixUrl('https://some/random/url')).toEqual('https://some/random/url');
-      expect(url_helpers.fixUrl('https://some//random//url')).toEqual('https://some/random/url');
+      expect(url_helpers.fixUrl('https://some/random/url')).toEqual(
+        'https://some/random/url',
+      );
+      expect(url_helpers.fixUrl('https://some//random//url')).toEqual(
+        'https://some/random/url',
+      );
     });
 
     it('handles string starting with file://', () => {
-      expect(url_helpers.fixUrl('file://some/random/url')).toEqual('file://some/random/url');
-      expect(url_helpers.fixUrl('file://some//random//url')).toEqual('file://some/random/url');
+      expect(url_helpers.fixUrl('file://some/random/url')).toEqual(
+        'file://some/random/url',
+      );
+      expect(url_helpers.fixUrl('file://some//random//url')).toEqual(
+        'file://some/random/url',
+      );
     });
   });
 
@@ -111,7 +128,8 @@ describe('url_helpers', () => {
     });
 
     it('returns true for valid file url', () => {
-      const fileName = process.platform === 'win32' ? 'file:///c:\\' : 'file:///';
+      const fileName =
+        process.platform === 'win32' ? 'file:///c:\\' : 'file:///';
       const result = url_helpers.isValidFileUrl(fileName);
       expect(result).toBe(true);
     });
diff --git a/src/jsUtils.test.ts b/test/jsUtils.test.ts
index 34cd8f098..8ef69b46f 100644
--- a/src/jsUtils.test.ts
+++ b/test/jsUtils.test.ts
@@ -1,4 +1,4 @@
-import * as jsUtils from './jsUtils'
+import * as jsUtils from '../src/jsUtils';
 
 describe('jsUtils', () => {
   describe('ifUndefinedString', () => {
diff --git a/src/themes/index.test.ts b/test/themes/index.test.ts
index e9f0f391b..387a296a8 100644
--- a/src/themes/index.test.ts
+++ b/test/themes/index.test.ts
@@ -1,6 +1,6 @@
-import makeDefaultThemeConfig from './default';
-import makeDarkThemeConfig from './dark';
-import { theme, ThemeType } from '.';
+import makeDefaultThemeConfig from '../../src/themes/default';
+import makeDarkThemeConfig from '../../src/themes/dark';
+import { theme, ThemeType } from '../../src/themes';
 
 describe('Load theme', () => {
   it('loads default theme', () => {
diff --git a/tsconfig.json b/tsconfig.json
index c600df5cf..3e7ffc854 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -12,7 +12,6 @@
     "module": "CommonJS",
     "jsx": "react-jsx",
     "typeRoots": [
-      "@types",
       "node_modules/@types"
     ],
     "moduleResolution": "node",
@@ -46,6 +45,7 @@
   },
   "include": [
     "src",
-    "scripts"
+    "scripts",
+    "test",
   ],
 }