Fix spurious merge changes

CesiumGS · Feb 10, 2025 · a0e2657 · a0e2657
1 parent c60a29b
commit a0e2657
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/packages/engine/Source/Scene/ResourceLoader.js b/packages/engine/Source/Scene/ResourceLoader.js
@@ -83,7 +83,7 @@ ResourceLoader.prototype.getError = function (errorMessage, error) {
 
   const runtimeError = new RuntimeError(errorMessage);
   if (defined(error)) {
-    runtimeError.stack = error.stack;
+    runtimeError.stack = `Original stack:\n${error.stack}\nHandler stack:\n${runtimeError.stack}`;
   }
 
   return runtimeError;

diff --git a/packages/engine/Specs/Scene/ImplicitSubtreeSpec.js b/packages/engine/Specs/Scene/ImplicitSubtreeSpec.js
@@ -254,15 +254,15 @@ describe("Scene/ImplicitSubtree", function () {
     }).toThrowDeveloperError();
   });
 
-  // it("throws without implicitTileset", function () {
-  //   expect(function () {
-  //     return new ImplicitSubtree(
-  //       subtreeResource,
-  //       undefined,
-  //       quadtreeCoordinates
-  //     );
-  //   }).toThrowDeveloperError();
-  // });
+  it("throws without implicitTileset", function () {
+    expect(function () {
+      return new ImplicitSubtree(
+        subtreeResource,
+        undefined,
+        quadtreeCoordinates,
+      );
+    }).toThrowDeveloperError();
+  });
 
   it("throws without implicitCoordinates", function () {
     expect(function () {

diff --git a/packages/engine/Specs/Scene/SceneSpec.js b/packages/engine/Specs/Scene/SceneSpec.js
@@ -1189,7 +1189,7 @@ describe(
         });
       });
 
-      it("renders a globe with SlopeRamp", function () {
+      it("renders a globe with a SlopeRamp", function () {
         s.globe = new Globe(Ellipsoid.UNIT_SPHERE);
         s.globe.material = Material.fromType("SlopeRamp");
         s.camera.position = new Cartesian3(1.02, 0.0, 0.0);
@@ -1224,7 +1224,7 @@ describe(
         });
       });
 
-      it("renders a globe with ElevationRamp", function () {
+      it("renders a globe with a ElevationRamp", function () {
         s.globe = new Globe(Ellipsoid.UNIT_SPHERE);
         s.globe.material = Material.fromType("ElevationRamp");
         s.camera.position = new Cartesian3(1.02, 0.0, 0.0);