Code improvements

mate-academy · Jan 23, 2024 · 45518a9 · 45518a9
1 parent f628450
commit 45518a9
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 70 deletions.
diff --git a/jest-mochawesome-reporter/package-lock.json b/jest-mochawesome-reporter/package-lock.json
diff --git a/jest-mochawesome-reporter/src/jest-mochawesome.ts b/jest-mochawesome-reporter/src/jest-mochawesome.ts
@@ -10,72 +10,13 @@ import {
   TestResult,
 } from '@jest/reporters';
 import { AssertionResult } from '@jest/test-result';
-
-interface JestMochawesomeReporterOptions {
-  outputDir?: string;
-  outputName?: string;
-  createDirIfMissing?: boolean;
-}
-
-interface ErrorLog {
-  message: string;
-  estack: string;
-}
-
-interface Test {
-  title: string;
-  fullTitle: string;
-  timedOut: boolean;
-  duration: number;
-  pass: boolean;
-  fail: boolean;
-  pending: boolean;
-  code: string;
-  uuid: string;
-  parentUUID: string;
-  skipped: boolean;
-  isHook: boolean;
-  err: ErrorLog | Record<string, never>;
-}
-
-interface Suite {
-  title: string;
-  suites: Suite[];
-  tests: Test[];
-  pending: string[];
-  root: boolean;
-  uuid: string;
-  _timeout: number;
-  fullFile: string;
-  file: string;
-  beforeHooks: any[];
-  afterHooks: any[];
-  passes: string[];
-  failures: string[];
-  skipped: string[];
-  duration: number;
-}
-
-interface Report {
-  stats: {
-    suites: number;
-    tests: number;
-    testsRegistered: number;
-    passes: number;
-    pending: number;
-    failures: number;
-    start: Date;
-    end: Date;
-    duration: number;
-    passPercent: number;
-    pendingPercent: number;
-    other: number;
-    hasOther: boolean;
-    skipped: number;
-    hasSkipped: boolean;
-  };
-  results: Suite[];
-}
+import { 
+  ErrorLog, 
+  JestMochawesomeReporterOptions, 
+  Suite, 
+  Test,
+  Report,
+} from './typedefs';
 
 export default class JestMochawesomeReporter extends BaseReporter {
   private readonly globalConfig: Config.GlobalConfig;

diff --git a/jest-mochawesome-reporter/src/typedefs.ts b/jest-mochawesome-reporter/src/typedefs.ts
@@ -0,0 +1,65 @@
+export interface JestMochawesomeReporterOptions {
+  outputDir?: string;
+  outputName?: string;
+  createDirIfMissing?: boolean;
+}
+
+export interface ErrorLog {
+  message: string;
+  estack: string;
+}
+
+export interface Test {
+  title: string;
+  fullTitle: string;
+  timedOut: boolean;
+  duration: number;
+  pass: boolean;
+  fail: boolean;
+  pending: boolean;
+  code: string;
+  uuid: string;
+  parentUUID: string;
+  skipped: boolean;
+  isHook: boolean;
+  err: ErrorLog | Record<string, never>;
+}
+
+export interface Suite {
+  title: string;
+  suites: Suite[];
+  tests: Test[];
+  pending: string[];
+  root: boolean;
+  uuid: string;
+  _timeout: number;
+  fullFile: string;
+  file: string;
+  beforeHooks: any[];
+  afterHooks: any[];
+  passes: string[];
+  failures: string[];
+  skipped: string[];
+  duration: number;
+}
+
+export interface Report {
+  stats: {
+    suites: number;
+    tests: number;
+    testsRegistered: number;
+    passes: number;
+    pending: number;
+    failures: number;
+    start: Date;
+    end: Date;
+    duration: number;
+    passPercent: number;
+    pendingPercent: number;
+    other: number;
+    hasOther: boolean;
+    skipped: number;
+    hasSkipped: boolean;
+  };
+  results: Suite[];
+}