Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Eliminate otrs reference tests #1200

Merged
merged 9 commits into from
Aug 28, 2021
Merged

Eliminate otrs reference tests #1200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a821ae6
Replace otrs with otobo and all succeed
niccord Jun 1, 2021
ca1dc70
Replace otrs with otobo but currently unable to test them
niccord Jun 1, 2021
f7eeb40
Restore wrong Copyright change
niccord Jun 1, 2021
346bbcb
Replace otrs with otobo and all succeed
niccord Jun 1, 2021
6184300
Replace otrs with otobo but currently unable to test them
niccord Jun 1, 2021
31a0721
Restore wrong Copyright change
niccord Jun 1, 2021
de185c9
Merge branch 'fix-1013-eliminate-otrs-reference-tests' of https://git…
niccord Jul 13, 2021
d6a9f9e
Fix md5 value to check
niccord Aug 27, 2021
d15e86d
Merge branch 'rel-10_0' of github.com:RotherOSS/otobo into fix-1013-e…
niccord Aug 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions scripts/test/CheckItem.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,10 @@ my @Tests = (
},

# Local part of email address is too long according to RFC.
# See http://isemail.info/modperl-uc.1384763750.ffhelkebjhfdihihkbce-michiel.beijen%3Dotrs.com%40perl.apache.org
# See http://isemail.info/modperl-uc.1384763750.ffhelkebjhfdihihkbce-michiel.beijen%3Dotobo.org%40perl.apache.org
{
Email =>
'modperl-uc.1384763750.ffhelkebjhfdihihkbce-michiel.beijen=otrs.com@perl.apache.org',
'modperl-uc.1384763750.ffhelkebjhfdihihkbce-michiel.beijen=otobo.org@perl.apache.org',
Valid => 0,
},

Expand Down Expand Up @@ -489,12 +489,12 @@ is(
"CheckError() - 'some..body\@example.com'",
);

$Result = $CheckItemObject->CheckEmail( Address => 'somebody123456789@otrs.com' );
$Result = $CheckItemObject->CheckEmail( Address => 'somebody123456789@otobo.org' );

# Execute unit test.
ok(
$Result,
"CheckEmail() - 'somebody123456789\@otrs.com'",
"CheckEmail() - 'somebody123456789\@otobo.org'",
);

done_testing();
2 changes: 1 addition & 1 deletion scripts/test/Console/Command/Maint/FormDraft/Delete.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ my $TicketID = $Kernel::OM->Get('Kernel::System::Ticket')->TicketCreate(
Priority => '3 normal',
State => 'closed successful',
CustomerNo => '123465',
CustomerUser => 'unittest@otrs.com',
CustomerUser => 'unittest@otobo.org',
OwnerID => 1,
UserID => 1,
);
Expand Down
4 changes: 2 additions & 2 deletions scripts/test/Email/Bounce.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ my @Tests = (
'Message-ID' => '<bounce@mail>',
Email => <<'EOF',
From: test@home.com
To: test@otrs.com
To: test@otobo.org
Message-ID: <original@mail>
Subject: Bounce test

Expand All @@ -75,7 +75,7 @@ EOF
},
Result => <<'EOF',
From: test@home.com
To: test@otrs.com
To: test@otobo.org
Message-ID: <original@mail>
Subject: Bounce test
Resent-Message-ID: <bounce@mail>
Expand Down
8 changes: 4 additions & 4 deletions scripts/test/EmailParser.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ $Self->Is(
$MD5 = $MainObject->MD5sum( String => $Attachments[1]->{Content} ) || '';
$Self->Is(
$MD5,
'0596f2939525c6bd50fc2b649e40fbb6',
'd2288c4aa6a50bc41a0e9b8820495922',
"#5 md5 check",
);
$Self->Is(
Expand Down Expand Up @@ -469,15 +469,15 @@ $Self->Is(
$MD5 = $MainObject->MD5sum( String => $EmailParserObject->GetMessageBody() ) || '';
$Self->Is(
$MD5,
'7ddc731e5a3e76cd27d4b1e0628468b1',
'4e269fc57c9aa7861ad432607e660ae9',
"#10 md5 body check",
);

@Attachments = $EmailParserObject->GetAttachments();
$MD5 = $MainObject->MD5sum( String => $Attachments[0]->{Content} ) || '';
$Self->Is(
$MD5,
'7ddc731e5a3e76cd27d4b1e0628468b1',
'4e269fc57c9aa7861ad432607e660ae9',
"#10 md5 check",
);

Expand Down Expand Up @@ -717,7 +717,7 @@ $Self->Is(
$MD5 = $MainObject->MD5sum( String => $Attachments[1]->{Content} ) || '';
$Self->Is(
$MD5,
'e86c2c15e59fc1e1695f890ff102b06c',
'9a7c5ce111d1ec69e1625d51abba0442',
"#15 md5 check",
);
$Self->Is(
Expand Down
2 changes: 1 addition & 1 deletion scripts/test/FormDraft.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ my $TicketID = $Kernel::OM->Get('Kernel::System::Ticket')->TicketCreate(
Priority => '3 normal',
State => 'closed successful',
CustomerNo => '123465',
CustomerUser => 'unittest@otrs.com',
CustomerUser => 'unittest@otobo.org',
OwnerID => 1,
UserID => 1,
);
Expand Down
4 changes: 2 additions & 2 deletions scripts/test/GenericInterface/Event/Handler.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ for my $Test (@Tests) {
Priority => '3 normal',
State => 'closed successful',
CustomerID => '123465',
CustomerUser => 'unittest@otrs.com',
CustomerUser => 'unittest@otobo.org',
OwnerID => 1,
UserID => 1,
);
Expand Down Expand Up @@ -606,7 +606,7 @@ my $TicketObject = $Kernel::OM->Get('Kernel::System::Ticket');
# cleanup ticket database
my @DeleteTicketList = $TicketObject->TicketSearch(
Result => 'ARRAY',
CustomerUserLogin => 'unittest@otrs.com',
CustomerUserLogin => 'unittest@otobo.org',
UserID => 1,
);
for my $TicketID (@DeleteTicketList) {
Expand Down
4 changes: 2 additions & 2 deletions scripts/test/GenericInterface/Operation/Ticket/TicketCreate.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3541,7 +3541,7 @@ my @Tests = (
AutoResponseType => 'auto reply',
SenderType => 'agent',
IsVisibleForCustomer => 1,
From => 'enjoy@otrs.com',
From => 'enjoy@otobo.org',
ContentType => 'text/plain; charset=UTF8',
HistoryType => 'NewTicket',
HistoryComment => '% % ',
Expand Down Expand Up @@ -4012,7 +4012,7 @@ my @Tests = (
AutoResponseType => 'auto reply',
SenderTypeID => 1,
IsVisibleForCustomer => 1,
From => 'enjoy@otrs.com',
From => 'enjoy@otobo.org',
ContentType => 'text/plain; charset=utf8',
HistoryType => 'NewTicket',
HistoryComment => '% % ',
Expand Down
12 changes: 6 additions & 6 deletions scripts/test/GenericInterface/Operation/Ticket/TicketUpdate.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ my $TicketID1 = $TicketObject->TicketCreate(
Priority => '3 normal',
State => 'new',
CustomerID => $CustomerUserLogin,
CustomerUser => 'unittest@otrs.com',
CustomerUser => 'unittest@otobo.org',
OwnerID => 1,
UserID => 1,
);
Expand Down Expand Up @@ -832,9 +832,9 @@ my @Tests = (
CommunicationChannel => 'Email',
SenderType => 'agent',
From => 'hello@otobo.org',
To => 'someTo@otrs.com',
Cc => 'someCc@otrs.com',
Bcc => 'someBcc@otrs.com',
To => 'someTo@otobo.org',
Cc => 'someCc@otobo.org',
Bcc => 'someBcc@otobo.org',
Charset => 'utf8',
MimeType => 'text/plain',
HistoryType => 'AddNote',
Expand Down Expand Up @@ -1325,7 +1325,7 @@ my $TicketIDNoOutOfOffice = $TicketObject->TicketCreate(
Priority => '3 normal',
State => 'new',
CustomerID => $CustomerUserLogin,
CustomerUser => 'unittest@otrs.com',
CustomerUser => 'unittest@otobo.org',
OwnerID => $UserIDNoOutOfOffice,
UserID => 1,
);
Expand All @@ -1338,7 +1338,7 @@ my $TicketIDOutOfOffice = $TicketObject->TicketCreate(
Priority => '3 normal',
State => 'new',
CustomerID => $CustomerUserLogin,
CustomerUser => 'unittest@otrs.com',
CustomerUser => 'unittest@otobo.org',
OwnerID => $UserIDOutOfOffice,
UserID => 1,
);
Expand Down
2 changes: 1 addition & 1 deletion scripts/test/GenericInterface/Operation/Ticket/TicketUpdateIncludeTicketData.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ my $TicketID1 = $TicketObject->TicketCreate(
Priority => '3 normal',
State => 'new',
CustomerID => $CustomerUserLogin,
CustomerUser => 'unittest@otrs.com',
CustomerUser => 'unittest@otobo.org',
OwnerID => 1,
UserID => 1,
);
Expand Down
16 changes: 8 additions & 8 deletions scripts/test/Layout/RichTextReplaceLinkOfInlineContent.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,32 +37,32 @@ my @Tests = (
{
Name => '_RichTextReplaceLinkOfInlineContent() - generated itself',
String =>
'<img width="343" height="563" alt="" src="/otobo-cvs/otobo-cvs/bin/cgi-bin/index.pl?Action=PictureUpload&amp;FormID=1255961382.1012148.29113074&amp;ContentID=inline244217.547683276.1255961382.1012148.29113074@vo7.vo.otrs.com" />',
'<img width="343" height="563" alt="" src="/otobo-cvs/otobo-cvs/bin/cgi-bin/index.pl?Action=PictureUpload&amp;FormID=1255961382.1012148.29113074&amp;ContentID=inline244217.547683276.1255961382.1012148.29113074@vo7.vo.otobo.org" />',
Result =>
'<img width="343" height="563" alt="" src="cid:inline244217.547683276.1255961382.1012148.29113074@vo7.vo.otrs.com" />',
'<img width="343" height="563" alt="" src="cid:inline244217.547683276.1255961382.1012148.29113074@vo7.vo.otobo.org" />',
},
{
Name => '_RichTextReplaceLinkOfInlineContent() - generated itself, with newline',
String =>
"<img width=\"343\" height=\"563\" alt=\"\"\nsrc=\"/otobo-cvs/otobo-cvs/bin/cgi-bin/index.pl?Action=PictureUpload&amp;FormID=1255961382.1012148.29113074&amp;ContentID=inline244217.547683276.1255961382.1012148.29113074\@vo7.vo.otrs.com\" />",
"<img width=\"343\" height=\"563\" alt=\"\"\nsrc=\"/otobo-cvs/otobo-cvs/bin/cgi-bin/index.pl?Action=PictureUpload&amp;FormID=1255961382.1012148.29113074&amp;ContentID=inline244217.547683276.1255961382.1012148.29113074\@vo7.vo.otobo.org\" />",
Result =>
"<img width=\"343\" height=\"563\" alt=\"\"\nsrc=\"cid:inline244217.547683276.1255961382.1012148.29113074\@vo7.vo.otrs.com\" />",
"<img width=\"343\" height=\"563\" alt=\"\"\nsrc=\"cid:inline244217.547683276.1255961382.1012148.29113074\@vo7.vo.otobo.org\" />",
},
{
Name =>
'_RichTextReplaceLinkOfInlineContent() - generated itself, with internal and external image',
String =>
'<img width="140" vspace="10" hspace="1" height="38" border="0" alt="AltText" src="http://www.otrs.com/fileadmin/templates/skins/skin_otobo/css/images/logo.gif" /> This text should be displayed <img width="400" height="81" border="0" alt="Description: cid:image001.jpg@01CC3AFE.F81F0B30" src="/otobo/index.pl?Action=PictureUpload&amp;FormID=1311080525.12118416.3676164&amp;ContentID=image001.jpg@01CC4216.1E22E9A0" id="Picture_x0020_1" />',
'<img width="140" vspace="10" hspace="1" height="38" border="0" alt="AltText" src="http://www.otobo.org/fileadmin/templates/skins/skin_otobo/css/images/logo.gif" /> This text should be displayed <img width="400" height="81" border="0" alt="Description: cid:image001.jpg@01CC3AFE.F81F0B30" src="/otobo/index.pl?Action=PictureUpload&amp;FormID=1311080525.12118416.3676164&amp;ContentID=image001.jpg@01CC4216.1E22E9A0" id="Picture_x0020_1" />',
Result =>
'<img width="140" vspace="10" hspace="1" height="38" border="0" alt="AltText" src="http://www.otrs.com/fileadmin/templates/skins/skin_otobo/css/images/logo.gif" /> This text should be displayed <img width="400" height="81" border="0" alt="Description: cid:image001.jpg@01CC3AFE.F81F0B30" src="cid:image001.jpg@01CC4216.1E22E9A0" id="Picture_x0020_1" />',
'<img width="140" vspace="10" hspace="1" height="38" border="0" alt="AltText" src="http://www.otobo.org/fileadmin/templates/skins/skin_otobo/css/images/logo.gif" /> This text should be displayed <img width="400" height="81" border="0" alt="Description: cid:image001.jpg@01CC3AFE.F81F0B30" src="cid:image001.jpg@01CC4216.1E22E9A0" id="Picture_x0020_1" />',
},
{
Name =>
'_RichTextReplaceLinkOfInlineContent() - generated itself, with internal and external image, no space before />',
String =>
'<img width="140" vspace="10" hspace="1" height="38" border="0" alt="AltText" src="http://www.otrs.com/fileadmin/templates/skins/skin_otobo/css/images/logo.gif" /> This text should be displayed <img width="400" height="81" border="0" alt="Description: cid:image001.jpg@01CC3AFE.F81F0B30" src="/otobo/index.pl?Action=PictureUpload&amp;FormID=1311080525.12118416.3676164&amp;ContentID=image001.jpg@01CC4216.1E22E9A0" id="Picture_x0020_1"/>',
'<img width="140" vspace="10" hspace="1" height="38" border="0" alt="AltText" src="http://www.otobo.org/fileadmin/templates/skins/skin_otobo/css/images/logo.gif" /> This text should be displayed <img width="400" height="81" border="0" alt="Description: cid:image001.jpg@01CC3AFE.F81F0B30" src="/otobo/index.pl?Action=PictureUpload&amp;FormID=1311080525.12118416.3676164&amp;ContentID=image001.jpg@01CC4216.1E22E9A0" id="Picture_x0020_1"/>',
Result =>
'<img width="140" vspace="10" hspace="1" height="38" border="0" alt="AltText" src="http://www.otrs.com/fileadmin/templates/skins/skin_otobo/css/images/logo.gif" /> This text should be displayed <img width="400" height="81" border="0" alt="Description: cid:image001.jpg@01CC3AFE.F81F0B30" src="cid:image001.jpg@01CC4216.1E22E9A0" id="Picture_x0020_1"/>',
'<img width="140" vspace="10" hspace="1" height="38" border="0" alt="AltText" src="http://www.otobo.org/fileadmin/templates/skins/skin_otobo/css/images/logo.gif" /> This text should be displayed <img width="400" height="81" border="0" alt="Description: cid:image001.jpg@01CC3AFE.F81F0B30" src="cid:image001.jpg@01CC4216.1E22E9A0" id="Picture_x0020_1"/>',
},
{
Name =>
Expand Down
8 changes: 4 additions & 4 deletions scripts/test/MailQueue/Create.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ my $CreateMailQueueElement = sub {

my $MailQueueObject = $Kernel::OM->Get('Kernel::System::MailQueue');
my %ElementData = (
Sender => 'mailqueue.test@otrs.com',
Recipient => 'mailqueue.test@otrs.com',
Sender => 'mailqueue.test@otobo.org',
Recipient => 'mailqueue.test@otobo.org',
Message => {
'Key1' => 'Value1',
'Key2' => 'Value2',
Expand Down Expand Up @@ -93,7 +93,7 @@ $Self->False(

# Pass an invalid Recipient address (array)
$Result = $CreateMailQueueElement->(
Recipient => [ 'mailqueue.test@otrs.com', 'dummy' ],
Recipient => [ 'mailqueue.test@otobo.org', 'dummy' ],
);
$Self->False(
$Result,
Expand All @@ -109,7 +109,7 @@ $Self->True(

# ArrayRef recipient
$Result = $CreateMailQueueElement->(
Recipient => [ 'mailqueue.test@otrs.com', 'mailqueue.test@otrs.com' ],
Recipient => [ 'mailqueue.test@otobo.org', 'mailqueue.test@otobo.org' ],
);
$Self->True(
$Result,
Expand Down
6 changes: 3 additions & 3 deletions scripts/test/MailQueue/Delete.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ my $CreateTestData = sub {
);

my %ElementData = (
Sender => 'mailqueue.test@otrs.com',
Recipient => 'mailqueue.test@otrs.com',
Sender => 'mailqueue.test@otobo.org',
Recipient => 'mailqueue.test@otobo.org',
Message => {
'Key1' => 'Value1',
'Key2' => 'Value2',
Expand Down Expand Up @@ -199,7 +199,7 @@ my $TestDeleteByMultipleColumns = sub {
$Test->(
Filters => {
ArticleID => $Element->{ArticleID},
Sender => 'mailqueue.test@otrs.com',
Sender => 'mailqueue.test@otobo.org',
},
);

Expand Down
4 changes: 2 additions & 2 deletions scripts/test/MailQueue/Get.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ my $CreateTestData = sub {

my $MailQueueObject = $Kernel::OM->Get('Kernel::System::MailQueue');
my %ElementData = (
Sender => 'mailqueue.test@otrs.com',
Recipient => ['mailqueue.test@otrs.com'],
Sender => 'mailqueue.test@otobo.org',
Recipient => ['mailqueue.test@otobo.org'],
Message => {
'Key1' => 'Value1',
'Key2' => 'Value2',
Expand Down
20 changes: 10 additions & 10 deletions scripts/test/MailQueue/List.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ my $CreateTestData = sub {

my $MailQueueObject = $Kernel::OM->Get('Kernel::System::MailQueue');
my %ElementData = (
Sender => 'mailqueue.test@otrs.com',
Recipient => 'mailqueue.test@otrs.com',
Sender => 'mailqueue.test@otobo.org',
Recipient => 'mailqueue.test@otobo.org',
Message => {
'Key1' => 'Value1',
'Key2' => 'Value2',
Expand All @@ -139,9 +139,9 @@ my $CreateTestData = sub {
Attempts => 3,
},

'Recipient::mailqueue.test2@otrs.com' => {
'Recipient::mailqueue.test2@otobo.org' => {
%ElementData,
Recipient => 'mailqueue.test2@otrs.com',
Recipient => 'mailqueue.test2@otobo.org',
}
);

Expand All @@ -164,7 +164,7 @@ my $MailQueueObject = $Kernel::OM->Get('Kernel::System::MailQueue');
my $Result;

my %BaseSearch = (
Sender => 'mailqueue.test@otrs.com',
Sender => 'mailqueue.test@otobo.org',
);

my $TestMessage = sub {
Expand All @@ -179,10 +179,10 @@ $Self->True(
);

# Get all the records for the sender X and recipient Y
$Result = $MailQueueObject->List( %BaseSearch, Recipient => 'mailqueue.test2@otrs.com' );
$Result = $MailQueueObject->List( %BaseSearch, Recipient => 'mailqueue.test2@otobo.org' );
$Self->True(
$Result && scalar( @{$Result} ) == 1,
$TestMessage->(q{ and recipient 'mailqueue.test2@otrs.com'}),
$TestMessage->(q{ and recipient 'mailqueue.test2@otobo.org'}),
);

# Get all the records for the sender X and attempts 3
Expand All @@ -199,11 +199,11 @@ $Self->True(
$TestMessage->(" and article-id '$ArticleID'"),
);

# Get all the records for the sender X and recipent that match '@otrs.com'
$Result = $MailQueueObject->List( %BaseSearch, Recipient => '@otrs.com' );
# Get all the records for the sender X and recipent that match '@otobo.org'
$Result = $MailQueueObject->List( %BaseSearch, Recipient => '@otobo.org' );
$Self->True(
$Result && scalar( @{$Result} ) == $TotalTestRecords,
$TestMessage->(q{ and recipent that match '@otrs.com'}),
$TestMessage->(q{ and recipent that match '@otobo.org'}),
);

# Get all the records for the sender that match 'mailqueue.test'
Expand Down
12 changes: 6 additions & 6 deletions scripts/test/MailQueue/Update.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ my $CreateTestData = sub {

my $MailQueueObject = $Kernel::OM->Get('Kernel::System::MailQueue');
my %ElementData = (
Sender => 'mailqueue.test@otrs.com',
Recipient => 'mailqueue.test@otrs.com',
Sender => 'mailqueue.test@otobo.org',
Recipient => 'mailqueue.test@otobo.org',
Message => {
'Key1' => 'Value1',
'Key2' => 'Value2',
Expand Down Expand Up @@ -277,21 +277,21 @@ $Test->(
# Change the Recipient for more than one record
$Test->(
Data => {
Recipient => 'mailqueue.test3@otrs.com',
Recipient => 'mailqueue.test3@otobo.org',
},
Filters => {
Sender => 'mailqueue.test@otrs.com',
Sender => 'mailqueue.test@otobo.org',
},
NumberOfRowsToUpdate => scalar( keys %Elements ),
);

# Change the Recipient (arrayref) for more than one record
$Test->(
Data => {
Recipient => [ 'mailqueue.test3@otrs.com', 'mailqueue.test4@otrs.com' ],
Recipient => [ 'mailqueue.test3@otobo.org', 'mailqueue.test4@otobo.org' ],
},
Filters => {
Sender => 'mailqueue.test@otrs.com',
Sender => 'mailqueue.test@otobo.org',
},
NumberOfRowsToUpdate => scalar( keys %Elements ),
);
Expand Down
Loading