about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNick Schonning <nschonni@gmail.com>2023-04-17 04:12:04 -0400
committerGitHub <noreply@github.com>2023-04-17 17:12:04 +0900
commitca447d3007b091c4b45d8509f9a9064942a93f2d (patch)
tree374fb6c1554b4068050fd1d7f6c10368a705bd0e
parent9f8d34620b6fa502da683f3775805bf2a5474f92 (diff)
Update Jest testing to include Typescript (#24555)
-rw-r--r--.github/workflows/test-js.yml4
-rw-r--r--jest.config.js2
2 files changed, 5 insertions, 1 deletions
diff --git a/.github/workflows/test-js.yml b/.github/workflows/test-js.yml
index 6a1cacb3f..1c4958550 100644
--- a/.github/workflows/test-js.yml
+++ b/.github/workflows/test-js.yml
@@ -9,6 +9,8 @@ on:
       - '.nvmrc'
       - '**/*.js'
       - '**/*.jsx'
+      - '**/*.ts'
+      - '**/*.tsx'
       - '**/*.snap'
       - '.github/workflows/test-js.yml'
 
@@ -19,6 +21,8 @@ on:
       - '.nvmrc'
       - '**/*.js'
       - '**/*.jsx'
+      - '**/*.ts'
+      - '**/*.tsx'
       - '**/*.snap'
       - '.github/workflows/test-js.yml'
 
diff --git a/jest.config.js b/jest.config.js
index 69222ea35..f447cf285 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -12,7 +12,7 @@ const config = {
   setupFiles: ['raf/polyfill'],
   setupFilesAfterEnv: ['<rootDir>/app/javascript/mastodon/test_setup.js'],
   collectCoverageFrom: [
-    'app/javascript/mastodon/**/*.js',
+    'app/javascript/mastodon/**/*.{js,jsx,ts,tsx}',
     '!app/javascript/mastodon/features/emoji/emoji_compressed.js',
     '!app/javascript/mastodon/locales/locale-data/*.js',
     '!app/javascript/mastodon/service_worker/entry.js',