From a0e2657fd2a8bffbb5004a138e825585b51b153b Mon Sep 17 00:00:00 2001
From: Jeshurun Hembd <jeshurun@cesium.com>
Date: Mon, 10 Feb 2025 18:36:56 -0500
Subject: [PATCH] Fix spurious merge changes

---
 packages/engine/Source/Scene/ResourceLoader.js |  2 +-
 .../engine/Specs/Scene/ImplicitSubtreeSpec.js  | 18 +++++++++---------
 packages/engine/Specs/Scene/SceneSpec.js       |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/engine/Source/Scene/ResourceLoader.js b/packages/engine/Source/Scene/ResourceLoader.js
index 919db471dd87..d4ca1e4f8e1f 100644
--- 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
index cca4eaab32e5..9843af4215ad 100644
--- 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
index d941c2754e4a..7f2d30742baa 100644
--- 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);