From fe3ee3010f0a3d418931445360c217c3bb92e116 Mon Sep 17 00:00:00 2001 From: dannyrb Date: Tue, 16 Jul 2019 14:06:02 -0400 Subject: [PATCH] Try alternative jest-canvas-mock location and version file syntax --- .netlify/build-deploy-preview.sh | 2 +- platform/viewer/jest.config.js | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.netlify/build-deploy-preview.sh b/.netlify/build-deploy-preview.sh index 971fd41f2..1d29baf3b 100644 --- a/.netlify/build-deploy-preview.sh +++ b/.netlify/build-deploy-preview.sh @@ -77,7 +77,7 @@ yarn install --no-ignore-optional --pure-lockfile cd ./platform/viewer/ # Create a Versions File -node -p -e "'export default require(\'./package.json\').version;'" > src/version.js +node -p -e '"export default "' + require(\"./../package.json\").version + '";"' > src/version.js # Copy over wado-image-loader codecs and worker file cp ./../../node_modules/cornerstone-wado-image-loader/dist/*.min.js* public -v # Build using react-scripts diff --git a/platform/viewer/jest.config.js b/platform/viewer/jest.config.js index d2505ec8d..526625e34 100644 --- a/platform/viewer/jest.config.js +++ b/platform/viewer/jest.config.js @@ -1,21 +1,21 @@ module.exports = { verbose: true, - testMatch: ['/src/**/*.test.js'], + testMatch: ["/src/**/*.test.js"], // collectCoverage: false, collectCoverageFrom: [ - '/src/**/*.{js,jsx}', - '!/src/**/*.test.js', - '!**/node_modules/**', - '!**/__tests__/**', + "/src/**/*.{js,jsx}", + "!/src/**/*.test.js", + "!**/node_modules/**", + "!**/__tests__/**" ], - reporters: ['default', 'jest-junit'], + reporters: ["default", "jest-junit"], // moduleNameMapper: { - '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': - '/src/__mocks__/fileMock.js', - '\\.(css|less)$': 'identity-obj-proxy', + "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": + "/src/__mocks__/fileMock.js", + "\\.(css|less)$": "identity-obj-proxy" }, - setupFiles: ['/node_modules/jest-canvas-mock/lib/index.js'], - setupTestFrameworkScriptFile: '/src/__tests__/globalSetup.js', -} + setupFiles: ["../../node_modules/jest-canvas-mock/lib/index.js"], + setupTestFrameworkScriptFile: "/src/__tests__/globalSetup.js" +};