test: fix wrong coverage report

benmccann · Nov 9, 2020 · 8111462 · 8111462
1 parent f48be9b
commit 8111462
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -108,7 +108,7 @@ module.exports = config => {
       dir: "./coverage"
     };
     karmaConfig.webpack.module.rules.unshift({
-      test: /\.js$/,
+      test: /\.ts$/,
       exclude: /(node_modules|test)/,
       loader: "istanbul-instrumenter-loader"
     });

diff --git a/src/PanoImageRenderer/PanoImageRenderer.ts b/src/PanoImageRenderer/PanoImageRenderer.ts
@@ -303,11 +303,11 @@ class PanoImageRenderer extends Component<{
   }
 
   public hasRenderingContext() {
-    if (!(this.context && !this.context.isContextLost())) {
-      return false;
-    } else if (
-      this.context &&
-      !this.context.getProgramParameter(this.shaderProgram!, this.context.LINK_STATUS)) {
+    const ctx = this.context;
+    if (
+      !ctx
+      || ctx.isContextLost()
+      || !ctx.getProgramParameter(this.shaderProgram!, ctx.LINK_STATUS)) {
       return false;
     }
     return true;

diff --git a/test/unit/PanoImageRenderer/SphereRenderer.spec.js b/test/unit/PanoImageRenderer/SphereRenderer.spec.js
@@ -41,12 +41,9 @@ describe("SphereRenderer", () => {
 		const deviceRatio = window.devicePixelRatio;
 		const suffix = `_${deviceRatio}x.png`;
 
-		beforeEach(() => {
-      target = sandbox();
-
-			target.style.width = "2000px";
-			target.style.height = "2000px";
-		});
+    before(() => {
+      cleanup();
+    });
 
 		afterEach(() => {
 			cleanup();
@@ -56,6 +53,9 @@ describe("SphereRenderer", () => {
 			/**
 			 * Given / When
 			 */
+      target = sandbox();
+			target.style.width = "2000px";
+			target.style.height = "2000px";
 			const viewer = createPanoViewerForRenderingTest(target, {
 				image: "./images/PanoViewer/Stereoscopic/stereoscopic1.png",
         projectionType: PanoViewer.PROJECTION_TYPE.STEREOSCOPIC_EQUI,
@@ -77,6 +77,9 @@ describe("SphereRenderer", () => {
 			/**
 			 * Given / When
 			 */
+      target = sandbox();
+			target.style.width = "3000px";
+			target.style.height = "3000px";
 			const viewer = createPanoViewerForRenderingTest(target, {
 				image: "./images/PanoViewer/Stereoscopic/stereoscopic2.png",
 				projectionType: PanoViewer.PROJECTION_TYPE.STEREOSCOPIC_EQUI,