Index: openacs-4/packages/file-storage/tcl/test/tclwebtest-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/test/tclwebtest-procs.tcl,v diff -u -N -r1.9 -r1.9.2.1 --- openacs-4/packages/file-storage/tcl/test/tclwebtest-procs.tcl 15 Aug 2018 16:35:22 -0000 1.9 +++ openacs-4/packages/file-storage/tcl/test/tclwebtest-procs.tcl 17 Apr 2019 11:00:16 -0000 1.9.2.1 @@ -37,16 +37,16 @@ Creates a new folder from the UI. } { set response 0 - + tclwebtest::link follow {New Folder} - + tclwebtest::form find ~n "folder-ae" tclwebtest::field find ~n "folder_name" tclwebtest::field fill $folder_name tclwebtest::field find ~n "description" tclwebtest::field fill $folder_description tclwebtest::form submit - + set response_url [tclwebtest::response url] if { [string match "*/\?folder_id*" $response_url] } { @@ -70,7 +70,7 @@ set response 0 tclwebtest::link follow {Delete this folder} - + tclwebtest::form find ~n "folder-delete" tclwebtest::form submit ~n {formbutton:ok} @@ -91,35 +91,7 @@ return $response } -ad_proc file_storage::twt::edit_folder { folder_name } { - Edits a folder from the UI. -} { - set response 0 - tclwebtest::link follow {Edit Folder} - - tclwebtest::form find ~a "folder-edit-2" - tclwebtest::field find ~n "folder_name" - tclwebtest::field fill $folder_name - tclwebtest::form submit - - set response_url [tclwebtest::response url] - - if { [string match "*\?folder_id*" $response_url] } { - - if { [catch {tclwebtest::assert text $folder_name} errmsg]} { - aa_error "file_storage::twt::edit_folder failed $errmsg : Didn't Edit a Folder" - } else { - aa_log "a Folder edited" - set response 1 - } - } else { - aa_error "file_storage::twt::edit_folder failed, bad response url : $response_url" - } - - return $response -} - ad_proc file_storage::twt::add_file_to_folder { folder_name file_name file_description } { Adds a file to a folder from the UI. } { @@ -214,7 +186,7 @@ if { [string match "*\?folder*id*" $response_url] } { - set list_words [split "$file_name" /] + set list_words [split "$file_name" /] set short_file_name [lindex $list_words [llength $list_words]-1] if {[catch {tclwebtest::link find $short_file_name} errmsg]} { @@ -226,14 +198,14 @@ } else { aa_error "file_storage::twt::upload_file failed, bad response url : $response_url" } - + return $response } ad_proc file_storage::twt::delete_uploaded_file { file_name } { Deletes a file from the UI. } { - + set response 0 # Follow the Delete File Link @@ -247,9 +219,9 @@ if { [string match "*\?folder*id*" $response_url] } { - # Get the short file name - set list_words [split "$file_name" /] - set short_file_name [lindex $list_words [llength $list_words]-1] + # Get the short file name + set list_words [split "$file_name" /] + set short_file_name [lindex $list_words [llength $list_words]-1] if {![catch {tclwebtest::link find $short_file_name} errmsg]} { aa_error "file_storage::twt::delete_file failed $errmsg : Didn't delete a File" @@ -260,7 +232,7 @@ } else { aa_error "file_storage::twt::delete_file failed, bad response url : $response_url" } - + return $response } @@ -387,18 +359,18 @@ set response_url [tclwebtest::response url] if { [string match "*\?folder*id*" $response_url] } { - + if {[catch {tclwebtest::link find $url_title} errmsg]} { aa_error "file_storage::twt::create_url $errmsg : Didn't create a URL" } else { aa_log "a URL created" set response 1 } - + } else { - aa_error "file_storage::twt::create_url failed, bad response url : $response_url" + aa_error "file_storage::twt::create_url failed, bad response url : $response_url" } - + return $response } @@ -433,7 +405,7 @@ aa_log "a URL edited" set response 1 } - + } else { aa_error "file_storage::twt::edit_url failed, bad response url : $response_url" } @@ -451,7 +423,7 @@ # Follow the Delete URL link tclwebtest::link follow {delete} - + set response_url [tclwebtest::response url] if { [string match "*/dotlrn/file-storage/\?folder*id*" $response_url] } {