Index: openacs-4/packages/file-storage/file-storage.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/file-storage.info,v
diff -u -N -r1.60.2.2 -r1.60.2.3
--- openacs-4/packages/file-storage/file-storage.info	25 Mar 2019 14:35:49 -0000	1.60.2.2
+++ openacs-4/packages/file-storage/file-storage.info	17 Apr 2019 11:16:15 -0000	1.60.2.3
@@ -7,7 +7,7 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="5.10.0d4" url="http://openacs.org/repository/download/apm/file-storage-5.10.0d4.apm">
+    <version name="5.10.0d5" url="http://openacs.org/repository/download/apm/file-storage-5.10.0d5.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Collaborative document storage</summary>
         <release-date>2017-08-06</release-date>
@@ -17,10 +17,11 @@
         <maturity>2</maturity>
         <package_instance_name>#file-storage.file-storage#</package_instance_name>
 
-        <provides url="file-storage" version="5.10.0d4"/>
+        <provides url="file-storage" version="5.10.0d5"/>
 	<requires url="acs-kernel" version="5.9.1"/>
 	<requires url="acs-tcl" version="5.9.1"/>
         <requires url="acs-content-repository" version="5.9.1"/>
+	<requires url="acs-automated-testing" version="5.10.0d13"/>
         
         <requires url="categories" version="1.1.3"/>
         <requires url="notifications" version="5.9.1"/>
Index: openacs-4/packages/file-storage/tcl/test/webtest-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/test/Attic/webtest-procs.tcl,v
diff -u -N -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/file-storage/tcl/test/webtest-procs.tcl	17 Apr 2019 11:00:16 -0000	1.1.2.2
+++ openacs-4/packages/file-storage/tcl/test/webtest-procs.tcl	17 Apr 2019 11:16:15 -0000	1.1.2.3
@@ -26,12 +26,11 @@
 
 	set d [::acs::test::form_reply \
 		   -last_request $d \
-		   -url [dict get $form @action] \
+		   -form $form \
 		   -update [subst {
 		       folder_name "$folder_name"
 		       description "$folder_description"
-		   }] \
-		   [dict get $form fields]]
+		   }]]
 	acs::test::reply_has_status_code $d 302
 	set location [::xowiki::test::get_url_from_location $d]
 
@@ -61,14 +60,12 @@
 	set response [dict get $d body]
 	set form [acs::test::get_form $response {//form[@id='folder-edit']}]
 	aa_true "edit form was returned" {[llength $form] > 2}
-	aa_log form=$form
 	set d [::acs::test::form_reply \
 		   -last_request $d \
-		   -url [dict get $form @action] \
+		   -form $form \
 		   -update [subst {
 		       folder_name "$folder_name"
-		   }] \
-		   [dict get $form fields]]
+		   }]]
 	acs::test::reply_has_status_code $d 302
 	set location [::xowiki::test::get_url_from_location $d]
 
@@ -95,10 +92,7 @@
 	set form [acs::test::get_form [dict get $d body] {//form[@id='folder-delete']}]
 	aa_true "delete form was returned" {[llength $form] > 2}
 
-	set d [::acs::test::form_reply \
-		   -last_request $d \
-		   -url [dict get $form @action] \
-		   [dict get $form fields]]
+	set d [::acs::test::form_reply -last_request $d -form $form]
 	acs::test::reply_has_status_code $d 302
 	return $d
     }