From d9fc7705db8cb5fc22cf739fde24b635781589d8 Mon Sep 17 00:00:00 2001 From: erickgonzalez Date: Tue, 22 Oct 2024 15:06:42 -0600 Subject: [PATCH] #30420 include in 24.04.24 LTS --- dotCMS/hotfix_tracking.md | 1 + .../api/v1/announcements/RemoteAnnouncementsLoaderImpl.java | 4 ++-- .../src/test/java/com/dotcms/filters/VanityUrlFilterTest.java | 2 +- .../src/test/java/com/dotcms/http/CircuitBreakerUrlTest.java | 2 +- .../RemoteAnnouncementsLoaderIntegrationTest.java | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dotCMS/hotfix_tracking.md b/dotCMS/hotfix_tracking.md index 1de9725dbc80..be5915d02729 100644 --- 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 index a7eb29c74a01..3e093d19209a 100644 --- 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 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 toAnnouncements(final JsonNode root) { } -} \ No newline at end of file +} diff --git a/dotcms-integration/src/test/java/com/dotcms/filters/VanityUrlFilterTest.java b/dotcms-integration/src/test/java/com/dotcms/filters/VanityUrlFilterTest.java index 24cd6359df07..88e60551278e 100644 --- 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("")); + 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 index 2877cd65b4c5..caed834a666a 100644 --- 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/dotcms-integration/src/test/java/com/dotcms/rest/api/v1/announcements/RemoteAnnouncementsLoaderIntegrationTest.java b/dotcms-integration/src/test/java/com/dotcms/rest/api/v1/announcements/RemoteAnnouncementsLoaderIntegrationTest.java index 0e486250fd12..a1a71e0c4ae4 100644 --- a/dotcms-integration/src/test/java/com/dotcms/rest/api/v1/announcements/RemoteAnnouncementsLoaderIntegrationTest.java +++ b/dotcms-integration/src/test/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 {