Merge pull request #631 from RotherOSS/issue-#622_env_hash

Issue #622 env hash
RotherOSS · Nov 10, 2020 · 4d52c3a · 4d52c3a
2 parents fb04570 + 37716d8
commit 4d52c3a
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 50 deletions.
diff --git a/scripts/test/DynamicField/Driver/WebService/FormDataGet.t b/scripts/test/DynamicField/Driver/WebService/FormDataGet.t
@@ -103,14 +103,15 @@ my $DynamicFieldDriverObject = $Kernel::OM->Get('Kernel::System::DynamicField::D
 TEST:
 for my $Test (@Tests) {
 
+    # %ENV will be picked up in Kernel::System::Web::Request::new().
     local %ENV = (
         REQUEST_METHOD => 'GET',
         QUERY_STRING   => $Test->{Request} // '',
     );
 
     CGI->initialize_globals();
-    my $Request = Kernel::System::Web::Request->new();
 
+    # _FormDataGet() implicitly calls Kernel::System::Web::Request->new();
     my $FormData = $DynamicFieldDriverObject->_FormDataGet();
 
     $Self->IsDeeply(
@@ -125,7 +126,4 @@ continue {
     );
 }
 
-
 $Self->DoneTesting();
-
-
diff --git a/scripts/test/DynamicField/Driver/WebService/PossibleValuesGet.t b/scripts/test/DynamicField/Driver/WebService/PossibleValuesGet.t
@@ -608,18 +608,6 @@ for my $Test (@Tests) {
         );
         ok( $WebserviceUpdate, 'updated webservice' );
 
-        # TODO: why fiddle with Kernel::System::Web::Request when simple doing a SOAP call under the hood?
-        local %ENV = (
-            REQUEST_METHOD => 'GET',
-            QUERY_STRING   => $Test->{Request} // '',
-        );
-
-        # reset CGI object from previous runs
-        CGI::initialize_globals();
-
-        # discard Web::Request from OM to prevent errors
-        $Kernel::OM->ObjectsDiscard( Objects => ['Kernel::System::Web::Request'] );
-
         my $PossibleValues = $DynamicFieldBackendObject->PossibleValuesGet(
             DynamicFieldConfig => $DynamicFieldConfig,
         );
@@ -639,17 +627,17 @@ for my $TicketID ( $SourceTicketID1, $SourceTicketID2 ) {
 }
 
 # Delete test created database dynamic field.
-my $Success = $DynamicFieldObject->DynamicFieldDelete(
+my $DynamicFieldDeleteSuccess = $DynamicFieldObject->DynamicFieldDelete(
     ID     => $DynamicFieldID,
     UserID => 1,
 );
-ok( $Success, "Database dynamic field ID $DynamicFieldID - deleted" );
+ok( $DynamicFieldDelete, "Database dynamic field ID $DynamicFieldID - deleted" );
 
-$Success = $WebserviceObject->WebserviceDelete(
+my $WebserviceDeleteSuccess = $WebserviceObject->WebserviceDelete(
     ID     => $WebserviceID,
     UserID => 1,
 );
-ok( $Success, "Web Service ID $WebserviceID - deleted" );
+ok( $WebserviceDeleteSuccess, "Web Service ID $WebserviceID - deleted" );
 
 # Make sure the cache is correct.
 for my $Cache ( qw(Ticket DynamicField Webservice) ) {

diff --git a/scripts/test/DynamicField/ObjectType/Article/ObjectDataGet.t b/scripts/test/DynamicField/ObjectType/Article/ObjectDataGet.t
@@ -217,8 +217,8 @@ for my $Test (@Tests) {
     );
 
     CGI->initialize_globals();
-    my $Request = Kernel::System::Web::Request->new();
 
+    # implicitly call Kernel::System::Web::Request->new();
     my %ObjectData = $ObjectHandlerObject->ObjectDataGet( %{ $Test->{Config} } );
 
     if ( !$Test->{Success} ) {
@@ -244,7 +244,4 @@ continue {
 
 # cleanup is done by RestoreDatabase
 
-
 $Self->DoneTesting();
-
-
diff --git a/scripts/test/DynamicField/ObjectType/CustomerCompany/ObjectDataGet.t b/scripts/test/DynamicField/ObjectType/CustomerCompany/ObjectDataGet.t
@@ -159,8 +159,8 @@ for my $Test (@Tests) {
     );
 
     CGI->initialize_globals();
-    my $Request = Kernel::System::Web::Request->new();
 
+    # implicitly call Kernel::System::Web::Request->new();
     my %ObjectData = $ObjectHandlerObject->ObjectDataGet( %{ $Test->{Config} } );
 
     if ( !$Test->{Success} ) {
@@ -186,7 +186,4 @@ continue {
 
 # cleanup is done by RestoreDatabase
 
-
 $Self->DoneTesting();
-
-
diff --git a/scripts/test/DynamicField/ObjectType/CustomerUser/ObjectDataGet.t b/scripts/test/DynamicField/ObjectType/CustomerUser/ObjectDataGet.t
@@ -158,8 +158,8 @@ for my $Test (@Tests) {
     );
 
     CGI->initialize_globals();
-    my $Request = Kernel::System::Web::Request->new();
 
+    # implicitly call Kernel::System::Web::Request->new();
     my %ObjectData = $ObjectHandlerObject->ObjectDataGet( %{ $Test->{Config} } );
 
     if ( !$Test->{Success} ) {
@@ -185,7 +185,4 @@ continue {
 
 # cleanup is done by RestoreDatabase
 
-
 $Self->DoneTesting();
-
-
diff --git a/scripts/test/DynamicField/ObjectType/Ticket/ObjectDataGet.t b/scripts/test/DynamicField/ObjectType/Ticket/ObjectDataGet.t
@@ -162,8 +162,8 @@ for my $Test (@Tests) {
     );
 
     CGI->initialize_globals();
-    my $Request = Kernel::System::Web::Request->new();
 
+    # implicitly call Kernel::System::Web::Request->new();
     my %ObjectData = $ObjectHandlerObject->ObjectDataGet( %{ $Test->{Config} } );
 
     if ( !$Test->{Success} ) {
@@ -189,7 +189,4 @@ continue {
 
 # cleanup is done by RestoreDatabase
 
-
 $Self->DoneTesting();
-
-
diff --git a/scripts/test/GenericInterface/Provider/Provider.t b/scripts/test/GenericInterface/Provider/Provider.t
@@ -306,6 +306,7 @@ for my $Test  (@Tests) {
                 my $ResponseData = '';
 
                 {
+                    # %ENV will be picked up in Kernel::System::Web::Request::new().
                     local %ENV;
 
                     if ( $RequestMethod eq 'post' ) {

diff --git a/scripts/test/GenericInterface/Transport/HTTP/SOAP/ContentCharset.t b/scripts/test/GenericInterface/Transport/HTTP/SOAP/ContentCharset.t
@@ -110,8 +110,9 @@ EOF
     local *STDIN = $StandardInput;
 
     # Fake environment variables as it gets it from the request.
-    local $ENV{'CONTENT_LENGTH'} = length $Request;
-    local $ENV{'CONTENT_TYPE'}   = $Test->{ContentType};
+    # %ENV will be picked up in Kernel::System::Web::Request::new().
+    local $ENV{CONTENT_LENGTH} = length $Request;
+    local $ENV{CONTENT_TYPE}   = $Test->{ContentType};
 
     my $Result = $SOAPObject->ProviderProcessRequest();
 
@@ -127,7 +128,4 @@ EOF
     );
 }
 
-
 $Self->DoneTesting();
-
-
diff --git a/scripts/test/GenericInterface/Transport/Transport.t b/scripts/test/GenericInterface/Transport/Transport.t
@@ -234,6 +234,7 @@ for my $Fail ( 0 .. 1 ) {
         {
 
             # prepare CGI environment variables
+            # %ENV will be picked up in Kernel::System::Web::Request::new().
             local $ENV{REQUEST_METHOD} = 'POST';
             local $ENV{CONTENT_LENGTH} = length( $TestEntry->{RequestContent} );
             local $ENV{CONTENT_TYPE}   = 'application/x-www-form-urlencoded; charset=utf-8;';

diff --git a/scripts/test/SysConfig/ValueType/Entity/EntityLookupFromWebRequest.t b/scripts/test/SysConfig/ValueType/Entity/EntityLookupFromWebRequest.t
@@ -169,14 +169,16 @@ my @Tests = (
 
 TEST:
 for my $Test (@Tests) {
+
+    # used in Kernel::System::Web::Request::new()
     local %ENV = (
         REQUEST_METHOD => 'GET',
         QUERY_STRING   => $Test->{QueryString} // '',
     );
 
     CGI->initialize_globals();
-    my $Request = Kernel::System::Web::Request->new();
 
+    # implicitly call Kernel::System::Web::Request->new();
     my $EntityName = $Kernel::OM->Get('Kernel::System::SysConfig::ValueType::Entity')->EntityLookupFromWebRequest(
         EntityType => $Test->{EntityType} // '',
     );
@@ -201,7 +203,4 @@ for my $Test (@Tests) {
     );
 }
 
-
 $Self->DoneTesting();
-
-
diff --git a/scripts/test/Ticket/Event/LockAfterCreate.t b/scripts/test/Ticket/Event/LockAfterCreate.t
@@ -162,10 +162,12 @@ my $TicketObject = $Kernel::OM->Get('Kernel::System::Ticket');
 for my $Test (@Tests) {
 
     # Fake a web request, as Action is used by the LockAfterCreate event.
+    # %ENV will be picked up in Kernel::System::Web::Request::new().
     local %ENV = (
         REQUEST_METHOD => 'GET',
         QUERY_STRING   => $Test->{Request} || '',
     );
+
     CGI->initialize_globals();
     my $Request = Kernel::System::Web::Request->new();
 
@@ -196,5 +198,3 @@ for my $Test (@Tests) {
 # Cleanup is done by RestoreDatabase.
 
 $Self->DoneTesting();
-
-
diff --git a/scripts/test/WebRequest.t b/scripts/test/WebRequest.t
@@ -27,6 +27,7 @@ use CGI;
 use Kernel::System::Web::Request;
 
 {
+    # %ENV will be picked up in Kernel::System::Web::Request::new().
     local %ENV = (
         REQUEST_METHOD => 'GET',
         QUERY_STRING   => 'a=4;b=5',
@@ -68,6 +69,8 @@ use Kernel::System::Web::Request;
 
 {
     my $PostData = 'a=4&b=5;d=2';
+
+    # %ENV will be picked up in Kernel::System::Web::Request::new().
     local %ENV = (
         REQUEST_METHOD => 'POST',
         CONTENT_LENGTH => length($PostData),
@@ -111,7 +114,4 @@ use Kernel::System::Web::Request;
 
 }
 
-
 $Self->DoneTesting();
-
-