Added mocks for theme files

#1543
deephaven · Oct 20, 2023 · ba94735 · ba94735
1 parent 7cb691f
commit ba94735
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 20 deletions.
diff --git a/__mocks__/css/mock-theme-dark-components.js b/__mocks__/css/mock-theme-dark-components.js
@@ -0,0 +1 @@
+module.exports = 'mock-theme-dark-components';
diff --git a/__mocks__/css/mock-theme-dark-palette.js b/__mocks__/css/mock-theme-dark-palette.js
@@ -0,0 +1 @@
+module.exports = 'mock-theme-dark-palette';
diff --git a/__mocks__/css/mock-theme-dark-semantic-editor.js b/__mocks__/css/mock-theme-dark-semantic-editor.js
@@ -0,0 +1 @@
+module.exports = 'mock-theme-dark-semantic-editor';
diff --git a/__mocks__/css/mock-theme-dark-semantic-grid.js b/__mocks__/css/mock-theme-dark-semantic-grid.js
@@ -0,0 +1 @@
+module.exports = 'mock-theme-dark-semantic-grid';
diff --git a/__mocks__/css/mock-theme-dark-semantic.js b/__mocks__/css/mock-theme-dark-semantic.js
@@ -0,0 +1 @@
+module.exports = 'mock-theme-dark-semantic';
diff --git a/__mocks__/css/mock-theme-light-palette.js b/__mocks__/css/mock-theme-light-palette.js
@@ -0,0 +1 @@
+module.exports = 'mock-theme-light-palette';
diff --git a/jest.config.base.cjs b/jest.config.base.cjs
@@ -9,7 +9,7 @@ module.exports = {
     'node_modules/(?!(monaco-editor|d3-interpolate|d3-color)/)',
   ],
   moduleNameMapper: {
-    'theme-(.*?)\\.css$': path.join(
+    'theme-([^/]+?)\\.css(\\?inline)?$': path.join(
       __dirname,
       './__mocks__/css/mock-theme-$1.js'
     ),

diff --git a/packages/components/src/theme/ThemeUtils.test.ts b/packages/components/src/theme/ThemeUtils.test.ts
@@ -191,13 +191,18 @@ describe('getDefaultBaseThemes', () => {
       {
         name: 'Default Dark',
         themeKey: 'default-dark',
-        styleContent:
-          'test-file-stub\ntest-file-stub\ntest-file-stub\ntest-file-stub\ntest-file-stub',
+        styleContent: [
+          'mock-theme-dark-palette',
+          'mock-theme-dark-semantic',
+          'mock-theme-dark-semantic-editor',
+          'mock-theme-dark-semantic-grid',
+          'mock-theme-dark-components',
+        ].join('\n'),
       },
       {
         name: 'Default Light',
         themeKey: 'default-light',
-        styleContent: 'test-file-stub',
+        styleContent: 'mock-theme-light-palette',
       },
     ]);
   });

diff --git a/packages/components/src/theme/__snapshots__/ThemeProvider.test.tsx.snap b/packages/components/src/theme/__snapshots__/ThemeProvider.test.tsx.snap
@@ -12,7 +12,7 @@ exports[`ThemeProvider setSelectedThemeKey: [ [Object] ] should change selected
       <style
         data-theme-key="default-light"
       >
-        test-file-stub
+        mock-theme-light-palette
       </style>
       <div>
         Child
@@ -34,11 +34,11 @@ exports[`ThemeProvider setSelectedThemeKey: [ [Object] ] should change selected
       <style
         data-theme-key="default-dark"
       >
-        test-file-stub
-test-file-stub
-test-file-stub
-test-file-stub
-test-file-stub
+        mock-theme-dark-palette
+mock-theme-dark-semantic
+mock-theme-dark-semantic-editor
+mock-theme-dark-semantic-grid
+mock-theme-dark-components
       </style>
       <style
         data-theme-key="themeA"
@@ -75,11 +75,11 @@ exports[`ThemeProvider should load themes based on preload data or default: [ [O
       <style
         data-theme-key="default-dark"
       >
-        test-file-stub
-test-file-stub
-test-file-stub
-test-file-stub
-test-file-stub
+        mock-theme-dark-palette
+mock-theme-dark-semantic
+mock-theme-dark-semantic-editor
+mock-theme-dark-semantic-grid
+mock-theme-dark-components
       </style>
       <style
         data-theme-key="themeA"
@@ -104,11 +104,11 @@ exports[`ThemeProvider should load themes based on preload data or default: [ [O
       <style
         data-theme-key="default-dark"
       >
-        test-file-stub
-test-file-stub
-test-file-stub
-test-file-stub
-test-file-stub
+        mock-theme-dark-palette
+mock-theme-dark-semantic
+mock-theme-dark-semantic-editor
+mock-theme-dark-semantic-grid
+mock-theme-dark-components
       </style>
       <div>
         Child

diff --git a/packages/components/src/theme/theme-spectrum/theme-spectrum-overrides.module.css b/packages/components/src/theme/theme-spectrum/theme-spectrum-overrides.module.css
@@ -1,3 +1,5 @@
 [class^='spectrum'] {
+  /* --font-family-sans-serif is defined in Bootstrap's _root.scss. We want
+  Spectrum to use the same default font-family */
   font-family: var(--font-family-sans-serif) !important;
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		module.exports = 'mock-theme-dark-semantic-editor';