From aa72704d14cd2334612b26fffbfbe381445a2533 Mon Sep 17 00:00:00 2001 From: Pawel Boguslawski Date: Fri, 10 Jan 2025 12:49:35 +0100 Subject: [PATCH 1/3] Disable connecting external RSS during unit testing In 6370b5b2a7671819702b0269f969afdd93cc42e2 connecting externa RSS was disabled only in `Basic.t` and according to https://github.com/znuny/Znuny/pull/45 it should be disabled in `PictureUpload.t` also. This mod fixes it. Fixes: 6370b5b2a7671819702b0269f969afdd93cc42e2 Related: https://github.com/znuny/Znuny/pull/45 Author-Change-Id: IB#1156232 Signed-off-by: Pawel Boguslawski --- CHANGES.md | 3 +++ scripts/test/Frontend/PictureUpload.t | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index a442c3a6259..387a7dbc47c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,6 @@ +# 6.5.12 ????-??-?? + - 2025-01-10 Disable connecting external RSS during unit testing. + # 6.5.11 2024-10-02 - 2024-10-02 Added HTML filter to ProcessManagement/SLA template. Converts the characters <, >, & and " to <, >, &, and " respectively, protecting them from being interpreted as representing HTML tags or entities. - 2024-09-26 Removed regex from Kernel::System::HTMLUtils::DocumentCleanup that could lead to a security issue. It replaced HTML of Microsoft Word. Thanks for reporting to Emin Yazi (@eyazi), Efflux. diff --git a/scripts/test/Frontend/PictureUpload.t b/scripts/test/Frontend/PictureUpload.t index 105ed86c898..58877c48360 100644 --- a/scripts/test/Frontend/PictureUpload.t +++ b/scripts/test/Frontend/PictureUpload.t @@ -1,6 +1,7 @@ # -- # Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ # Copyright (C) 2021 Znuny GmbH, https://znuny.org/ +# Copyright (C) 2025 Informatyka Boguslawski sp. z o.o. sp.k., http://www.ib.pl/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you @@ -23,7 +24,10 @@ my $JSONObject = $Kernel::OM->Get('Kernel::System::JSON'); # get helper object $Kernel::OM->ObjectParamAdd( 'Kernel::System::UnitTest::Helper' => { - SkipSSLVerify => 1 + SkipSSLVerify => 1, + DisableSysConfigs => [ + 'DashboardBackend###0442-RSS', + ], }, ); my $HelperObject = $Kernel::OM->Get('Kernel::System::UnitTest::Helper'); From f66300f75ac963b5283ea89a14f446d9f4a79f22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bogus=C5=82awski?= Date: Fri, 10 Jan 2025 13:07:25 +0100 Subject: [PATCH 2/3] Update CHANGES.md --- CHANGES.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 387a7dbc47c..a442c3a6259 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,3 @@ -# 6.5.12 ????-??-?? - - 2025-01-10 Disable connecting external RSS during unit testing. - # 6.5.11 2024-10-02 - 2024-10-02 Added HTML filter to ProcessManagement/SLA template. Converts the characters <, >, & and " to <, >, &, and " respectively, protecting them from being interpreted as representing HTML tags or entities. - 2024-09-26 Removed regex from Kernel::System::HTMLUtils::DocumentCleanup that could lead to a security issue. It replaced HTML of Microsoft Word. Thanks for reporting to Emin Yazi (@eyazi), Efflux. From 3c7f3ac802a20baa3a872e351b628deb25859e0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bogus=C5=82awski?= Date: Fri, 10 Jan 2025 13:07:41 +0100 Subject: [PATCH 3/3] Update PictureUpload.t --- scripts/test/Frontend/PictureUpload.t | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/test/Frontend/PictureUpload.t b/scripts/test/Frontend/PictureUpload.t index 58877c48360..392e84606d1 100644 --- a/scripts/test/Frontend/PictureUpload.t +++ b/scripts/test/Frontend/PictureUpload.t @@ -1,7 +1,6 @@ # -- # Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ # Copyright (C) 2021 Znuny GmbH, https://znuny.org/ -# Copyright (C) 2025 Informatyka Boguslawski sp. z o.o. sp.k., http://www.ib.pl/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you