Index: openacs-4/packages/faq/tcl/test/tclwebtest-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/tcl/test/tclwebtest-procs.tcl,v diff -u -N -r1.1.4.2 -r1.1.4.3 --- openacs-4/packages/faq/tcl/test/tclwebtest-procs.tcl 24 Sep 2005 01:20:00 -0000 1.1.4.2 +++ openacs-4/packages/faq/tcl/test/tclwebtest-procs.tcl 14 Nov 2005 14:22:51 -0000 1.1.4.3 @@ -11,11 +11,6 @@ ad_proc new { faq_name } { set response 0 - tclwebtest::cookies clear - # Login user - array set user_info [twt::user::create -admin] - twt::user::login $user_info(email) $user_info(password) - # The Faq page url set faq_page_url [aa_get_first_url -package_key faq] ::twt::do_request $faq_page_url @@ -43,19 +38,14 @@ } else { aa_error "faq::twt::new failed, bad response url : $response_url" } - twt::user::logout + return $response } ad_proc delete { faq_name} { set response 0 - tclwebtest::cookies clear - # Login user - array set user_info [twt::user::create -admin] - twt::user::login $user_info(email) $user_info(password) - # The Faq page url set faq_page_url [aa_get_first_url -package_key faq] ::twt::do_request $faq_page_url @@ -77,19 +67,14 @@ } else { aa_error "faq::twt::delete failed, bad response url : $response_url" } - twt::user::logout + return $response } ad_proc edit_one { faq_name faq_new_name} { set response 0 - tclwebtest::cookies clear - # Login user - array set user_info [twt::user::create -admin] - twt::user::login $user_info(email) $user_info(password) - db_1row faq_id "select faq_id from faqs where faq_name=:faq_name" # Edit the FAQ and request the FAQ Admin page @@ -118,19 +103,14 @@ } else { aa_error "faq::twt::edit_one failed, bad response url : $response_url" } - twt::user::logout + return $response } ad_proc edit_two { faq_name faq_new_name} { set response 0 - tclwebtest::cookies clear - # Login user - array set user_info [twt::user::create -admin] - twt::user::login $user_info(email) $user_info(password) - # Edit the FAQ and request the FAQ Admin page # The Faq page url set faq_page_url [aa_get_first_url -package_key faq] @@ -162,7 +142,7 @@ } else { aa_error "faq::twt::edit_two failed, bad response url : $response_url" } - twt::user::logout + return $response } @@ -171,11 +151,6 @@ # Option : disable or enable set response 0 - tclwebtest::cookies clear - - # Login user - array set user_info [twt::user::create -admin] - twt::user::login $user_info(email) $user_info(password) db_1row faq_id "select faq_id from faqs where faq_name=:faq_name" @@ -200,19 +175,14 @@ } else { aa_error "faq::twt::$option failed. Bad response url : $response_url " } - twt::user::logout + return $response } ad_proc new_Q_A { faq_name question answer} { set response 0 - tclwebtest::cookies clear - # Login user - array set user_info [twt::user::create -admin] - twt::user::login $user_info(email) $user_info(password) - db_1row faq_id "select faq_id from faqs where faq_name=:faq_name" # The Faq page url @@ -244,19 +214,14 @@ } else { aa_error "faq::twt::new_Q_A failed. Bad response url : $response_url" } - twt::user::logout + return $response } ad_proc edit_Q_A { faq_name new_question new_answer } { set response 0 - tclwebtest::cookies clear - # Login user - array set user_info [twt::user::create -admin] - twt::user::login $user_info(email) $user_info(password) - db_1row faq_id "select faq_id from faqs where faq_name=:faq_name" # The Faq page url @@ -287,19 +252,14 @@ } else { aa_error "faq::twt::edit_Q_A failed. Bad response url : $response_url" } - twt::user::logout + return $response } ad_proc preview_Q_A { faq_name } { set response 0 - tclwebtest::cookies clear - # Login user - array set user_info [twt::user::create -admin] - twt::user::login $user_info(email) $user_info(password) - db_1row faq_id "select faq_id from faqs where faq_name=:faq_name" # The Faq page url @@ -325,19 +285,14 @@ } else { aa_error "faq::twt::preview_Q_A failed. Bad response url : $response_url" } - twt::user::logout + return $response } ad_proc delete_Q_A { faq_name question } { set response 0 - tclwebtest::cookies clear - # Login user - array set user_info [twt::user::create -admin] - twt::user::login $user_info(email) $user_info(password) - db_1row faq_id "select faq_id from faqs where faq_name=:faq_name" # The Faq page url @@ -360,19 +315,14 @@ } else { aa_error "faq::twt::delete_Q_A failed. Bad response url : $response_url" } - twt::user::logout + return $response } ad_proc insert_after_Q_A { faq_name } { set response 0 - tclwebtest::cookies clear - # Login user - array set user_info [twt::user::create -admin] - twt::user::login $user_info(email) $user_info(password) - db_1row faq_id "select faq_id from faqs where faq_name=:faq_name" # The Faq page url @@ -407,18 +357,14 @@ } else { aa_error "faq::twt::insert_after_Q_A failed. Bad response url : $response_url" } - twt::user::logout + return $response } ad_proc swap_with_next_Q_A { faq_name } { - tclwebtest::cookies clear + set response 0 - # Login user - array set user_info [twt::user::create -admin] - twt::user::login $user_info(email) $user_info(password) - db_1row faq_id "select faq_id from faqs where faq_name=:faq_name" # The Faq page url @@ -438,7 +384,7 @@ } else { aa_error "faq::twt::insert_after_Q_A failed. Bad response url : $response_url" } - twt::user::logout + return $response }