Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 17 insertions, 2 deletions

diff --git a/browser/components/newtab/test/unit/content-src/components/CustomiseMenu.test.jsx b/browser/components/newtab/test/unit/content-src/components/CustomiseMenu.test.jsx
index 0407622cf9..6186ca71fe 100644
--- a/browser/components/newtab/test/unit/content-src/components/CustomiseMenu.test.jsx
+++ b/browser/components/newtab/test/unit/content-src/components/CustomiseMenu.test.jsx
@@ -10,6 +10,7 @@ const DEFAULT_PROPS = {
   },
   mayHaveSponsoredTopSites: true,
   mayHaveSponsoredStories: true,
+  mayHaveWeather: true,
   pocketRegion: true,
   dispatch: sinon.stub(),
   setPref: sinon.stub(),
@@ -68,5 +69,9 @@ describe("ContentSection", () => {
       wrapper.find("#highlights-toggle").prop("data-eventSource"),
       "HIGHLIGHTS"
     );
+    assert.equal(
+      wrapper.find("#weather-toggle").prop("data-eventSource"),
+      "WEATHER"
+    );
   });
 });
diff --git a/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamAdmin.test.jsx b/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamAdmin.test.jsx
index 7f40b66200..006e83e663 100644
--- a/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamAdmin.test.jsx
+++ b/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamAdmin.test.jsx
@@ -67,6 +67,9 @@ describe("DiscoveryStreamAdmin", () => {
           otherPrefs={{}}
           state={{
             DiscoveryStream: state,
+            Weather: {
+              suggestions: [],
+            },
           }}
         />
       );
@@ -90,7 +93,12 @@ describe("DiscoveryStreamAdmin", () => {
       wrapper = shallow(
         <DiscoveryStreamAdminUI
           otherPrefs={{}}
-          state={{ DiscoveryStream: state }}
+          state={{
+            DiscoveryStream: state,
+            Weather: {
+              suggestions: [],
+            },
+          }}
         />
       );
       wrapper.instance().onStoryToggle({ id: 12345 });
diff --git a/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamComponents/DSCard.test.jsx b/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamComponents/DSCard.test.jsx
index afb6d6dcd2..796f805444 100644
--- a/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamComponents/DSCard.test.jsx
+++ b/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamComponents/DSCard.test.jsx
@@ -70,7 +70,9 @@ describe("<DSCard>", () => {
   });
 
   it("should render DSLinkMenu", () => {
-    assert.equal(wrapper.children().at(3).type(), DSLinkMenu);
+    // Note: <DSLinkMenu> component moved from a direct child element of `.ds-card`. See Bug 1893936
+    const default_link_menu = wrapper.find(DSLinkMenu);
+    assert.ok(default_link_menu.exists());
   });
 
   it("should start with no .active class", () => {