Item15145: fixed upload unit tests

foswiki · Jun 17, 2022 · 6c7fdca · 6c7fdca
1 parent 8355d32
commit 6c7fdca
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/UnitTestContrib/test/unit/UIFnCompileTests.pm b/UnitTestContrib/test/unit/UIFnCompileTests.pm
@@ -14,6 +14,7 @@ our $SCRIPT_NAME;
 our %expected_status_main_webhome = (
     search => 302,
     save   => 302,
+    upload => 302,
     login  => 200,
     logon  => 200,
 );

diff --git a/UnitTestContrib/test/unit/UploadScriptTests.pm b/UnitTestContrib/test/unit/UploadScriptTests.pm
@@ -92,7 +92,7 @@ sub do_upload {
     );
     $query->uploads( \%uploads );
 
-    my $stream = $query->upload('filepath');
+    my $stream = $query->upload($fn);
     $this->assert($stream);
     seek( $stream, 0, 0 );
 

diff --git a/core/lib/Foswiki/Request.pm b/core/lib/Foswiki/Request.pm
@@ -715,7 +715,7 @@ to uploaded file.
 
 sub upload {
     my ( $this, $name ) = @_;
-    my $upload = $this->{uploads}{ $this->param($name) };
+    my $upload = $this->{uploads}{$name};
     return defined $upload ? $upload->handle : undef;
 }
 

diff --git a/core/lib/Foswiki/UI/Upload.pm b/core/lib/Foswiki/UI/Upload.pm
@@ -114,6 +114,11 @@ sub _upload {
     my $user  = $session->{user};
 
     Foswiki::UI::checkValidationKey($session);
+    Foswiki::UI::checkWebExists( $session, $web, $topic, 'attach files to' );
+    Foswiki::UI::checkTopicExists( $session, $web, $topic, 'attach files to' );
+
+    my ($topicObject) = Foswiki::Func::readTopic( $web, $topic );
+    Foswiki::UI::checkAccess( $session, 'CHANGE', $topicObject );
 
     my $hideFile    = $query->param('hidefile')    || '';
     my $fileComment = $query->param('filecomment') || '';
@@ -134,14 +139,6 @@ sub _upload {
         $filePath =~ s/\s*$//;
 
         push @fileNames, $fileName;
-
-        Foswiki::UI::checkWebExists( $session, $web, $topic,
-            'attach files to' );
-        Foswiki::UI::checkTopicExists( $session, $web, $topic,
-            'attach files to' );
-        my ($topicObject) = Foswiki::Func::readTopic( $web, $topic );
-        Foswiki::UI::checkAccess( $session, 'CHANGE', $topicObject );
-
         my $origName = $fileName;
 
         # SMELL: would be much better to throw an exception if an attempt