skip: test fix

naver · Jan 14, 2018 · c90a05a · c90a05a
1 parent f5c8277
commit c90a05a
Show file tree

Hide file tree

Showing 20 changed files with 47 additions and 51 deletions.
diff --git a/dist/PanoViewer/view360.panoviewer.js b/dist/PanoViewer/view360.panoviewer.js
diff --git a/dist/PanoViewer/view360.panoviewer.js.map b/dist/PanoViewer/view360.panoviewer.js.map
diff --git a/dist/PanoViewer/view360.panoviewer.min.js b/dist/PanoViewer/view360.panoviewer.min.js
diff --git a/dist/PanoViewer/view360.panoviewer.min.js.map b/dist/PanoViewer/view360.panoviewer.min.js.map
diff --git a/dist/PanoViewer/view360.panoviewer.pkgd.js b/dist/PanoViewer/view360.panoviewer.pkgd.js
diff --git a/dist/PanoViewer/view360.panoviewer.pkgd.js.map b/dist/PanoViewer/view360.panoviewer.pkgd.js.map
diff --git a/dist/PanoViewer/view360.panoviewer.pkgd.min.js b/dist/PanoViewer/view360.panoviewer.pkgd.min.js
diff --git a/dist/PanoViewer/view360.panoviewer.pkgd.min.js.map b/dist/PanoViewer/view360.panoviewer.pkgd.min.js.map
diff --git a/dist/SpinViewer/view360.spinviewer.js.map b/dist/SpinViewer/view360.spinviewer.js.map
diff --git a/dist/SpinViewer/view360.spinviewer.pkgd.js.map b/dist/SpinViewer/view360.spinviewer.pkgd.js.map
diff --git a/dist/view360.js b/dist/view360.js
diff --git a/dist/view360.js.map b/dist/view360.js.map
diff --git a/dist/view360.min.js b/dist/view360.min.js
diff --git a/dist/view360.min.js.map b/dist/view360.min.js.map
diff --git a/dist/view360.pkgd.js b/dist/view360.pkgd.js
diff --git a/dist/view360.pkgd.js.map b/dist/view360.pkgd.js.map
diff --git a/dist/view360.pkgd.min.js b/dist/view360.pkgd.min.js
diff --git a/dist/view360.pkgd.min.js.map b/dist/view360.pkgd.min.js.map
diff --git a/src/PanoImageRenderer/ImageLoader.js b/src/PanoImageRenderer/ImageLoader.js
@@ -22,9 +22,7 @@ export default class ImageLoader {
 				/* Check isMaybeLoaded() first because there may have posibilities that image already loaded before get is called. for example calling get on external image onload callback.*/
 				res(this._image);
 			} else if (this._loadStatus === STATUS.LOADING) {
-				this._once("load", () => {
-					res(this._image);
-				});
+				this._once("load", () => res(this._image));
 				this._once("error", () => rej("ImageLoader: failed to load images."));
 			} else {
 				rej("ImageLoader: failed to load images");
@@ -52,9 +50,7 @@ export default class ImageLoader {
 			return;
 		}
 
-		this._once("load", () => {
-			this._loadStatus = STATUS.LOADED;
-		});
+		this._once("load", () => (this._loadStatus = STATUS.LOADED));
 		this._once("error", () => (this._loadStatus = STATUS.ERROR));
 	}
 

diff --git a/test/unit/PanoViewer/PanoViewer.spec.js b/test/unit/PanoViewer/PanoViewer.spec.js
@@ -161,31 +161,31 @@ describe("PanoViewer", function() {
 		});
 
 		// Currently not available
-		// IT.skip("should replace image of other projection type", function(done) {
-		// 	// Given
-		// 	panoViewer = new PanoViewer(target, {
-		// 		image: "./images/test_equi.png"
-		// 	});
+		IT.skip("should replace image of other projection type", function(done) {
+			// Given
+			panoViewer = new PanoViewer(target, {
+				image: "./images/test_equi.png"
+			});
 
-		// 	// first `onContentLoad` event is for image specified in constructor.
-		// 	panoViewer.once(PanoViewer.EVENTS.CONTENT_LOADED, evt1 => {
-		// 		console.log("contentLoaded #1", evt1.content.src, evt1.projectionType);
-		// 		const prevContentSrc = evt1.content.src;
-		// 		const prevProjectionType = evt1.projectionType;
-
-		// 		panoViewer.once(PanoViewer.EVENTS.CONTENT_LOADED, evt2 => {
-		// 			console.log("contentLoaded #2", evt2.content.src, evt2.projectionType);
-		// 			// Then
-		// 			expect(evt2.content.src).to.not.equal(prevContentSrc);
-		// 			expect(evt2.projectionType).to.not.equal(prevProjectionType);
-		// 			done();
-		// 		});
+			// first `onContentLoad` event is for image specified in constructor.
+			panoViewer.once(PanoViewer.EVENTS.CONTENT_LOADED, evt1 => {
+				console.log("contentLoaded #1", evt1.content.src, evt1.projectionType);
+				const prevContentSrc = evt1.content.src;
+				const prevProjectionType = evt1.projectionType;
+
+				panoViewer.once(PanoViewer.EVENTS.CONTENT_LOADED, evt2 => {
+					console.log("contentLoaded #2", evt2.content.src, evt2.projectionType);
+					// Then
+					expect(evt2.content.src).to.not.equal(prevContentSrc);
+					expect(evt2.projectionType).to.not.equal(prevProjectionType);
+					done();
+				});
 
-		// 		// When
-		// 		// Change image of other projection type.
-		// 		panoViewer.setImage("./images/glasscITy_cube_1024.jpg", PanoViewer.ProjectionType.VERTICAL_CUBESTRIP);
-		// 	});
-		// });
+				// When
+				// Change image of other projection type.
+				panoViewer.setImage("./images/glasscITy_cube_1024.jpg", PanoViewer.ProjectionType.VERTICAL_CUBESTRIP);
+			});
+		});
 	});
 
 	describe("event flow", function() {