Merge branch 'main' into farabi/bot-1856/fix-tutorial-tab-and-tours

deriv-com · Jul 23, 2024 · 85ea075 · 85ea075
2 parents 59985d5 + 7c75d5b
commit 85ea075
Show file tree

Hide file tree

Showing 70 changed files with 2,302 additions and 219 deletions.
diff --git a/index.html b/index.html
@@ -44,6 +44,5 @@
     <body class="body">
         <div id="modal_root" class="modal-root"></div>
         <div id="root"></div>
-        <script type="module" src="/src/main.tsx"></script>
     </body>
 </html>
diff --git a/jest.config.ts b/jest.config.ts
@@ -132,10 +132,10 @@ const config: Config = {
     // runner: "jest-runner",
 
     // The paths to modules that run some code to configure or set up the testing environment before each test
-    setupFiles: ['<rootDir>/jest.setup.ts'],
+    // setupFiles: ['<rootDir>/jest.setup.ts'],
 
     // A list of paths to modules that run some code to configure or set up the testing framework before each test
-    // setupFilesAfterEnv: [],
+    setupFilesAfterEnv: ['<rootDir>/jest.setup.ts'],
 
     // The number of seconds after which a test is considered as slow and reported as such in the results.
     // slowTestThreshold: 5,
@@ -153,10 +153,7 @@ const config: Config = {
     // testLocationInResults: false,
 
     // The glob patterns Jest uses to detect test files
-    // testMatch: [
-    //   "**/__tests__/**/*.[jt]s?(x)",
-    //   "**/?(*.)+(spec|test).[tj]s?(x)"
-    // ],
+    testMatch: ['**/__tests__/**/*.[jt]s?(x)', '**/?(*.)+(spec|test).[tj]s?(x)'],
 
     // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
     // testPathIgnorePatterns: [
@@ -174,8 +171,8 @@ const config: Config = {
 
     // A map from regular expressions to paths to transformers
     transform: {
-        '^.+\\.(ts|tsx)?$': 'babel-jest',
         '^.+\\.(js|jsx)$': 'babel-jest',
+        '^.+\\.tsx?$': 'babel-jest',
         '^.+\\.xml$': 'jest-transform-stub',
     },
 

diff --git a/jest.setup.ts b/jest.setup.ts
@@ -1,3 +1,6 @@
+import '@testing-library/jest-dom/jest-globals';
+import '@testing-library/jest-dom';
+
 let originalLocalStorage: Storage;
 const localStorageMock: Storage = {
     clear() {