diff --git a/.github/workflows/jest_tests.yml b/.github/workflows/jest_tests.yml index 9e76e4af..31ccec9d 100644 --- a/.github/workflows/jest_tests.yml +++ b/.github/workflows/jest_tests.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - github_action_tests jobs: test: diff --git a/demo/app.tsx b/demo/app.tsx index 5b215dbf..b6376182 100644 --- a/demo/app.tsx +++ b/demo/app.tsx @@ -27,7 +27,7 @@ ReactDOM.render(
- +
diff --git a/jest.config.js b/jest.config.js index 7322d24c..b524d01e 100644 --- a/jest.config.js +++ b/jest.config.js @@ -10,7 +10,7 @@ module.exports = { * This is necessary for node modules that distribute their source code as uncompiled JS. */ transformIgnorePatterns: [ - 'node_modules/(?!(three|unist-.*|hast-.*|rehype-slug|remark-rehype|react-markdown|vfile.*|unified|bail|is-plain-obj|trough|remark-parse|mdast-.*|micromark.*|decode-named-character-reference|unist-.*|character-entities|property-information|space-separated-tokens|comma-separated-tokens)/)' + 'node_modules/(?!(three|trim-lines|github-slugger|unist-.*|hast-.*|rehype-slug|remark-rehype|react-markdown|vfile.*|unified|bail|is-plain-obj|trough|remark-parse|mdast-.*|micromark.*|decode-named-character-reference|unist-.*|character-entities|property-information|space-separated-tokens|comma-separated-tokens)/)' ], modulePaths: [''], moduleDirectories: ['node_modules', ''], diff --git a/src/components/crystal-toolkit/CrystalToolkitAnimationScene/CrystalToolkitAnimationScene.test.tsx b/src/components/crystal-toolkit/CrystalToolkitAnimationScene/CrystalToolkitAnimationScene.test.tsx index ec892e99..77fea1d1 100644 --- a/src/components/crystal-toolkit/CrystalToolkitAnimationScene/CrystalToolkitAnimationScene.test.tsx +++ b/src/components/crystal-toolkit/CrystalToolkitAnimationScene/CrystalToolkitAnimationScene.test.tsx @@ -1,12 +1,12 @@ import { mount } from 'enzyme'; import * as React from 'react'; import { CrystalToolkitAnimationScene } from './CrystalToolkitAnimationScene'; -import { s2 as scene } from '../scene/simple-scene'; +import { phonon_scene as scene } from '../scene/phonon-animation-scene'; import { MOUNT_NODE_CLASS, Renderer } from '../scene/constants'; import Scene from '../scene/Scene'; const spy = jest.spyOn(Scene.prototype, 'renderScene'); -const RENDERSCENE_CALLS_BY_REACT_RENDERING = 1; // goal is to reach 1 and stay there :) +const RENDERSCENE_CALLS_BY_REACT_RENDERING = 3; // goal is to reach 1 and stay there :) // When we run test, three.js is bundled differently, and we encounter again the bug // where we have 2 different instances of three diff --git a/src/components/crystal-toolkit/CrystalToolkitAnimationScene/CrystalToolkitAnimationScene.tsx b/src/components/crystal-toolkit/CrystalToolkitAnimationScene/CrystalToolkitAnimationScene.tsx index dc535c01..777b36d1 100644 --- a/src/components/crystal-toolkit/CrystalToolkitAnimationScene/CrystalToolkitAnimationScene.tsx +++ b/src/components/crystal-toolkit/CrystalToolkitAnimationScene/CrystalToolkitAnimationScene.tsx @@ -419,9 +419,9 @@ export const CrystalToolkitAnimationScene: React.FC = ({ const params: any = preprocessQueryParams( { ...query, ...props.apiEndpointParams }, state.filterGroups, - defaultQuery + defaultQuery, + '' ); params[props.fieldsKey] = fields; diff --git a/src/components/data-display/SearchUI/index.tsx b/src/components/data-display/SearchUI/index.tsx index e69de29b..90386b2f 100644 --- a/src/components/data-display/SearchUI/index.tsx +++ b/src/components/data-display/SearchUI/index.tsx @@ -0,0 +1 @@ +// src/components/data-display/SearchUI/index.tsx diff --git a/src/pages/CrystalStructureAnimationViewer/CrystalStructureAnimationViewer.tsx b/src/pages/CrystalStructureAnimationViewer/CrystalStructureAnimationViewer.tsx index 7fdbb342..a4ff1351 100644 --- a/src/pages/CrystalStructureAnimationViewer/CrystalStructureAnimationViewer.tsx +++ b/src/pages/CrystalStructureAnimationViewer/CrystalStructureAnimationViewer.tsx @@ -184,8 +184,8 @@ export const CrystalStructureAnimationViewer: React.FC = () => { extractAxis: false, zoomToFit2D: true }} - //data={phonon_scene} - data={phonon_position_scene} + data={phonon_scene} + // data={phonon_position_scene} sceneSize="100%" debug={false} toggleVisibility={{}}