Index: openacs-4/packages/xowf/tcl/test/xowf-test-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/test/xowf-test-procs.tcl,v diff -u -N -r1.14.2.18 -r1.14.2.19 --- openacs-4/packages/xowf/tcl/test/xowf-test-procs.tcl 15 Mar 2021 13:27:56 -0000 1.14.2.18 +++ openacs-4/packages/xowf/tcl/test/xowf-test-procs.tcl 19 Mar 2021 19:19:00 -0000 1.14.2.19 @@ -57,24 +57,24 @@ Create a folder in an xowf instance with a form page and edit this } { - # - # Setup of test user_id - # - set d [::acs::test::user::create -email xowf@acs-testing.test -admin] - set user_id [dict get $d user_id] - set instance $_xowf_test_instance_name set testfolder .testfolder set locale [lang::system::locale] set lang [string range $locale 0 1] + # + # Setup of test user_id and login + # + set user_info [::acs::test::user::create -email xowf@acs-testing.test -admin] + set d [::acs::test::login $user_info] + try { ########################################################### aa_section "Make sure we have a fresh test folder" ############################################################ set folder_info [::xowiki::test::require_test_folder \ - -user_id $user_id \ + -last_request $d \ -instance $instance \ -folder_name $testfolder \ -fresh \ @@ -90,7 +90,7 @@ ########################################################### ::xowiki::test::create_form_page \ - -user_id $user_id \ + -last_request $d \ -instance $instance \ -path $testfolder \ -parent_id $folder_id \ @@ -108,7 +108,7 @@ ########################################################### ::xowiki::test::edit_form_page \ - -user_id $user_id \ + -last_request $d \ -instance $instance \ -path $testfolder/hello \ -update [subst { @@ -190,25 +190,25 @@ The procs list contains the public methods called via the web interface. } { - # - # Setup of test user_id - # - set d [::acs::test::user::create -email xowf@acs-testing.test -admin] - set user_id [dict get $d user_id] - set instance $_xowf_test_instance_name set testfolder .testfolder set locale [lang::system::locale] set lang [string range $locale 0 1] + # + # Setup of test user_id and login + # + set user_info [::acs::test::user::create -email xowf@acs-testing.test -admin] + set d [::acs::test::login $user_info] + try { ########################################################### aa_section "Require test folder" ########################################################### set folder_info [::xowiki::test::require_test_folder \ - -user_id $user_id \ + -last_request $d \ -instance $instance \ -folder_name $testfolder \ -fresh \ @@ -221,7 +221,7 @@ set locale [lang::system::locale] set lang [string range $locale 0 1] ::xowiki::test::create_form \ - -user_id $user_id \ + -last_request $d \ -instance $instance \ -path $testfolder \ -parent_id $folder_id \ @@ -247,7 +247,7 @@ ########################################################### ::xowiki::test::create_form_page \ - -user_id $user_id \ + -last_request $d \ -instance $instance \ -path $testfolder \ -parent_id $folder_id \ @@ -298,7 +298,7 @@ ########################################################### ::xowiki::test::create_form_page \ - -user_id $user_id \ + -last_request $d \ -instance $instance \ -path $testfolder \ -parent_id $folder_id \ @@ -319,7 +319,7 @@ ########################################################### ::xowiki::test::edit_form_page \ - -user_id $user_id \ + -last_request $d \ -instance $instance \ -path $testfolder/tip1 \ -update {