#30420 include in 24.04.24 LTS

dotCMS · Oct 22, 2024 · d9fc770 · d9fc770
1 parent 352097c
commit d9fc770
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/dotCMS/hotfix_tracking.md b/dotCMS/hotfix_tracking.md
@@ -76,3 +76,4 @@ This maintenance release includes the following code fixes:
 70. https://github.com/dotCMS/core/issues/28855 : When page is locked, hover text still says "Lock Page" #28855
 71. https://github.com/dotCMS/core/issues/28576 : GraphQL __icon__ field violates GraphQL introspection convention prohibiting __ prefixes #28576
 72. https://github.com/dotCMS/core/issues/29355 : Sessions expiring unexpectedly when using Redis #29355
+73. https://github.com/dotCMS/core/issues/30420 : Fix Test CircuitBreakerUrlTest.testGet and RemoteAnnouncementsLoaderIntegrationTest.TestAnnouncementsLoader #30420
diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/announcements/RemoteAnnouncementsLoaderImpl.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/announcements/RemoteAnnouncementsLoaderImpl.java
@@ -32,7 +32,7 @@ public class RemoteAnnouncementsLoaderImpl implements AnnouncementsLoader{
 
     //This is the url to the dotCMS instance set to provide and feed all consumers with announcements
     static final  Lazy<String> BASE_URL_LAZY_SUPPLIER =
-            Lazy.of(() -> Config.getStringProperty("ANNOUNCEMENTS_BASE_URL", "https://www.dotcms.com"));
+            Lazy.of(() -> Config.getStringProperty("ANNOUNCEMENTS_BASE_URL", "https://www2.dotcms.com"));
 
     static final String ANNOUNCEMENTS_QUERY = "/api/content/render/false/query/+contentType:Announcement%20+languageId:1%20+deleted:false%20+live:true%20/orderby/Announcement.announcementDate%20desc";
 
@@ -160,4 +160,4 @@ List<Announcement> toAnnouncements(final JsonNode root) {
     }
 
 
-}
+}
diff --git a/dotcms-integration/src/test/java/com/dotcms/filters/VanityUrlFilterTest.java b/dotcms-integration/src/test/java/com/dotcms/filters/VanityUrlFilterTest.java
@@ -176,7 +176,7 @@ public void test_that_vanity_url_filter_handles_proxy_requests() throws Exceptio
             String content = FileUtil.read(tmp);
             assert (content != null);
             assert (content.contains("All rights reserved"));
-            assert (content.contains("<meta property=\"og:url\" content=\"https://www.dotcms.com/\">"));
+            assert (content.contains("content=\"dotCMS\""));
         }
     }
 

diff --git a/dotcms-integration/src/test/java/com/dotcms/http/CircuitBreakerUrlTest.java b/dotcms-integration/src/test/java/com/dotcms/http/CircuitBreakerUrlTest.java
@@ -359,7 +359,7 @@ public void testGet() {
         for (int i = 0; i < 10; i++) {
             try {
                 String x = new CircuitBreakerUrl(goodUrl, 2000).doString();
-                assert (x.contains("/application/themes/dotcms/js/bootstrap.min.js"));
+                assert (x.contains("content=\"dotCMS\""));
 
             } catch (Exception e) {
                 assert (e instanceof CircuitBreakerOpenException);

diff --git a/...t/java/com/dotcms/rest/api/v1/announcements/RemoteAnnouncementsLoaderIntegrationTest.java b/...t/java/com/dotcms/rest/api/v1/announcements/RemoteAnnouncementsLoaderIntegrationTest.java
@@ -22,7 +22,7 @@
  */
 public class RemoteAnnouncementsLoaderIntegrationTest {
 
-    public static final String DOTCMS_COM = "https://www.dotcms.com";
+    public static final String DOTCMS_COM = "https://www2.dotcms.com";
 
     @BeforeClass
     public static void prepare() throws Exception {