Index: openacs-4/packages/faq-portlet/tcl/test/faq-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/tcl/test/faq-portlet-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/faq-portlet/tcl/test/faq-portlet-procs.tcl 18 Sep 2018 13:38:48 -0000 1.5
+++ openacs-4/packages/faq-portlet/tcl/test/faq-portlet-procs.tcl 18 Sep 2018 13:42:36 -0000 1.6
@@ -10,178 +10,178 @@
Testing the creation a Faq from the portlet.
} {
- aa_run_with_teardown -test_code {
-
- tclwebtest::cookies clear
- # Login user
- array set user_info [twt::user::create -admin]
- twt::user::login $user_info(email) $user_info(password)
+ aa_run_with_teardown -test_code {
- # Create new Faq
- set faq_name [ad_generate_random_string]
- set response [faq_portlet::twt::new $faq_name]
- aa_display_result -response $response -explanation {Webtest for creating a New Faq from the portlet}
-
- twt::user::logout
- }
-}
+ tclwebtest::cookies clear
+ # Login user
+ array set user_info [twt::user::create -admin]
+ twt::user::login $user_info(email) $user_info(password)
+ # Create new Faq
+ set faq_name [ad_generate_random_string]
+ set response [faq_portlet::twt::new $faq_name]
+ aa_display_result -response $response -explanation {Webtest for creating a New Faq from the portlet}
+
+ twt::user::logout
+ }
+}
+
aa_register_case -cats {web smoke} -libraries tclwebtest tclwebtest_delete_faq_portlet {
Testing the process of creating and deleting a Faq from the portlet.
} {
- aa_run_with_teardown -test_code {
-
- tclwebtest::cookies clear
- # Login user
- array set user_info [twt::user::create -admin]
- twt::user::login $user_info(email) $user_info(password)
+ aa_run_with_teardown -test_code {
- # Create a new Faq
- set faq_name [ad_generate_random_string]
- faq_portlet::twt::new $faq_name
-
- # Delete the faq
- set response [faq_portlet::twt::delete $faq_name]
- aa_display_result -response $response -explanation {Webtest for deleting a Faq}
-
- twt::user::logout
- }
+ tclwebtest::cookies clear
+ # Login user
+ array set user_info [twt::user::create -admin]
+ twt::user::login $user_info(email) $user_info(password)
+
+ # Create a new Faq
+ set faq_name [ad_generate_random_string]
+ faq_portlet::twt::new $faq_name
+
+ # Delete the faq
+ set response [faq_portlet::twt::delete $faq_name]
+ aa_display_result -response $response -explanation {Webtest for deleting a Faq}
+
+ twt::user::logout
+ }
}
aa_register_case -cats {web smoke} -libraries tclwebtest tclwebtest_disable_faq_portlet {
- Testing the process of creating and disabling a Faq.
+ Testing the process of creating and disabling a Faq.
} {
- aa_run_with_teardown -test_code {
-
- tclwebtest::cookies clear
- # Login user
- array set user_info [twt::user::create -admin]
- twt::user::login $user_info(email) $user_info(password)
+ aa_run_with_teardown -test_code {
- # Create new faq
- set faq_name [ad_generate_random_string]
- faq_portlet::twt::new $faq_name
-
- # Disable the Faq
- set option "disable"
- set response [faq_portlet::twt::disable_enable $faq_name $option]
- aa_display_result -response $response -explanation {Webtest for disabling a Faq}
-
- twt::user::logout
- }
+ tclwebtest::cookies clear
+ # Login user
+ array set user_info [twt::user::create -admin]
+ twt::user::login $user_info(email) $user_info(password)
+
+ # Create new faq
+ set faq_name [ad_generate_random_string]
+ faq_portlet::twt::new $faq_name
+
+ # Disable the Faq
+ set option "disable"
+ set response [faq_portlet::twt::disable_enable $faq_name $option]
+ aa_display_result -response $response -explanation {Webtest for disabling a Faq}
+
+ twt::user::logout
+ }
}
aa_register_case -cats {web smoke} -libraries tclwebtest tclwebtest_enable_faq_portlet {
- Testing the process of creating, disabling and enabling Faq.
+ Testing the process of creating, disabling and enabling Faq.
} {
- aa_run_with_teardown -test_code {
+ aa_run_with_teardown -test_code {
- tclwebtest::cookies clear
- # Login user
- array set user_info [twt::user::create -admin]
- twt::user::login $user_info(email) $user_info(password)
+ tclwebtest::cookies clear
+ # Login user
+ array set user_info [twt::user::create -admin]
+ twt::user::login $user_info(email) $user_info(password)
- # Create the Faq
- set faq_name [ad_generate_random_string]
- faq_portlet::twt::new $faq_name
-
- # Disable the faq
- set option "disable"
- faq_portlet::twt::disable_enable $faq_name $option
-
- # Enable the faq
- set option "enable"
- set response [faq_portlet::twt::disable_enable $faq_name $option]
- aa_display_result -response $response -explanation {Webtest for enabling a Faq}
-
- twt::user::logout
- }
+ # Create the Faq
+ set faq_name [ad_generate_random_string]
+ faq_portlet::twt::new $faq_name
+
+ # Disable the faq
+ set option "disable"
+ faq_portlet::twt::disable_enable $faq_name $option
+
+ # Enable the faq
+ set option "enable"
+ set response [faq_portlet::twt::disable_enable $faq_name $option]
+ aa_display_result -response $response -explanation {Webtest for enabling a Faq}
+
+ twt::user::logout
+ }
}
aa_register_case -cats {web smoke} -libraries tclwebtest tclwebtest_edit_faq_portlet {
- Testing the process of creating and editing a Faq.
+ Testing the process of creating and editing a Faq.
} {
- aa_run_with_teardown -test_code {
-
- tclwebtest::cookies clear
- # Login user
- array set user_info [twt::user::create -admin]
- twt::user::login $user_info(email) $user_info(password)
+ aa_run_with_teardown -test_code {
- # Creat a new faq
- set faq_name [ad_generate_random_string]
- faq_portlet::twt::new $faq_name
-
- # Edit the faq
- set new_faq_name [ad_generate_random_string]
- set response [faq_portlet::twt::edit_faq $faq_name $new_faq_name]
- aa_display_result -response $response -explanation {Webtest for editing a Faq}
-
- twt::user::logout
- }
+ tclwebtest::cookies clear
+ # Login user
+ array set user_info [twt::user::create -admin]
+ twt::user::login $user_info(email) $user_info(password)
+
+ # Creat a new faq
+ set faq_name [ad_generate_random_string]
+ faq_portlet::twt::new $faq_name
+
+ # Edit the faq
+ set new_faq_name [ad_generate_random_string]
+ set response [faq_portlet::twt::edit_faq $faq_name $new_faq_name]
+ aa_display_result -response $response -explanation {Webtest for editing a Faq}
+
+ twt::user::logout
+ }
}
aa_register_case -cats {web smoke} -libraries tclwebtest tclwebtest_new_Q_A_faq_portlet {
- Testing the process of create a Faq and create a new Q&A.
+ Testing the process of create a Faq and create a new Q&A.
} {
- aa_run_with_teardown -test_code {
+ aa_run_with_teardown -test_code {
- tclwebtest::cookies clear
- # Login user
- array set user_info [twt::user::create -admin]
- twt::user::login $user_info(email) $user_info(password)
-
- # Creat a new faq
- set faq_name [ad_generate_random_string]
- faq_portlet::twt::new $faq_name
-
- # Create a new Question_Answer
- set question [ad_generate_random_string]
- set answer [ad_generate_random_string]
- set response [faq_portlet::twt::new_Q_A $faq_name $question $answer]
- aa_display_result -response $response -explanation {Webtest for creating a New Question in a dotLRN Faq}
-
- twt::user::logout
- }
+ tclwebtest::cookies clear
+ # Login user
+ array set user_info [twt::user::create -admin]
+ twt::user::login $user_info(email) $user_info(password)
+
+ # Creat a new faq
+ set faq_name [ad_generate_random_string]
+ faq_portlet::twt::new $faq_name
+
+ # Create a new Question_Answer
+ set question [ad_generate_random_string]
+ set answer [ad_generate_random_string]
+ set response [faq_portlet::twt::new_Q_A $faq_name $question $answer]
+ aa_display_result -response $response -explanation {Webtest for creating a New Question in a dotLRN Faq}
+
+ twt::user::logout
+ }
}
aa_register_case -cats {web smoke} -libraries tclwebtest tclwebtest_delete_Q_A_faq_portlet {
- Testing the process of create a faq, create a Q&A and then delete the Q&A.
+ Testing the process of create a faq, create a Q&A and then delete the Q&A.
} {
- aa_run_with_teardown -test_code {
-
- tclwebtest::cookies clear
- # Login user
- array set user_info [twt::user::create -admin]
- twt::user::login $user_info(email) $user_info(password)
-
- # Creat a new faq
- set faq_name [ad_generate_random_string]
- faq_portlet::twt::new $faq_name
-
- # Create a new Question_Answer
- set question [ad_generate_random_string]
- set answer [ad_generate_random_string]
- faq_portlet::twt::new_Q_A $faq_name $question $answer
-
- # Delete the Question_Answer
- set response [faq_portlet::twt::delete_Q_A $faq_name $question]
- aa_display_result -response $response -explanation {Webtest for deleting a Question in a Faq}
-
- twt::user::logout
- }
+ aa_run_with_teardown -test_code {
+
+ tclwebtest::cookies clear
+ # Login user
+ array set user_info [twt::user::create -admin]
+ twt::user::login $user_info(email) $user_info(password)
+
+ # Creat a new faq
+ set faq_name [ad_generate_random_string]
+ faq_portlet::twt::new $faq_name
+
+ # Create a new Question_Answer
+ set question [ad_generate_random_string]
+ set answer [ad_generate_random_string]
+ faq_portlet::twt::new_Q_A $faq_name $question $answer
+
+ # Delete the Question_Answer
+ set response [faq_portlet::twt::delete_Q_A $faq_name $question]
+ aa_display_result -response $response -explanation {Webtest for deleting a Question in a Faq}
+
+ twt::user::logout
+ }
}
# Local variables:
Index: openacs-4/packages/faq-portlet/tcl/test/tclwebtest-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/tcl/test/tclwebtest-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/faq-portlet/tcl/test/tclwebtest-procs.tcl 18 Sep 2018 13:38:48 -0000 1.6
+++ openacs-4/packages/faq-portlet/tcl/test/tclwebtest-procs.tcl 18 Sep 2018 13:42:36 -0000 1.7
@@ -3,7 +3,6 @@
@author Mounir Lallali
@author Gerardo Morales
@creation-date 14 June 2005
-
}
@@ -17,214 +16,214 @@
ad_proc -private faq_portlet::twt::new { faq_name } {
- set response 0
-
- set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"
- ::twt::do_request $dotlrn_page_url
- tclwebtest::link follow "Classes"
+ set response 0
- # Create a new FAQ
- tclwebtest::link follow ~u {one-community-admin$}
+ set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"
+ ::twt::do_request $dotlrn_page_url
+ tclwebtest::link follow "Classes"
- tclwebtest::link follow "New FAQ"
- tclwebtest::form find ~n "faq"
- tclwebtest::field find ~n "faq_name"
- tclwebtest::field fill "$faq_name"
- tclwebtest::form submit
- aa_log "Faq form submitted"
+ # Create a new FAQ
+ tclwebtest::link follow ~u {one-community-admin$}
- set response_url [tclwebtest::response url]
-
- if {[string match "*/dotlrn/classes*/faq/admin*" $response_url] } {
- if {[catch {tclwebtest::link find "$faq_name"} errmsg] } {
- aa_error "faq_portlet::twt::new failed $errmsg : Didn't create a New Faq"
- } else {
- aa_log "New faq Created !!"
- set response 1
- }
- } else {
- aa_error "faq_portlet::twt::new failed, bad response url : $response_url"
- }
-
- return $response
+ tclwebtest::link follow "New FAQ"
+ tclwebtest::form find ~n "faq"
+ tclwebtest::field find ~n "faq_name"
+ tclwebtest::field fill "$faq_name"
+ tclwebtest::form submit
+ aa_log "Faq form submitted"
+
+ set response_url [tclwebtest::response url]
+
+ if {[string match "*/dotlrn/classes*/faq/admin*" $response_url] } {
+ if {[catch {tclwebtest::link find "$faq_name"} errmsg] } {
+ aa_error "faq_portlet::twt::new failed $errmsg : Didn't create a New Faq"
+ } else {
+ aa_log "New faq Created !!"
+ set response 1
+ }
+ } else {
+ aa_error "faq_portlet::twt::new failed, bad response url : $response_url"
+ }
+
+ return $response
}
ad_proc -private faq_portlet::twt::delete { faq_name} {
- set response 0
+ set response 0
- set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"
- ::twt::do_request $dotlrn_page_url
-
- tclwebtest::link follow "Classes"
+ set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"
+ ::twt::do_request $dotlrn_page_url
- # Create a new FAQ
- tclwebtest::link follow ~u {one-community-admin$}
-
- tclwebtest::link follow $faq_name
- tclwebtest::link follow {View All FAQs}
+ tclwebtest::link follow "Classes"
- db_1row faq_id "select faq_id from faqs where faq_name=:faq_name"
- ::twt::do_request [export_vars -base "faq-delete" {faq_id}]
+ # Create a new FAQ
+ tclwebtest::link follow ~u {one-community-admin$}
- set response_url [tclwebtest::response url]
-
- if { [string match "*/faq/admin/index" $response_url] } {
- if {![catch {tclwebtest::link find "$faq_name" } errmsg]} {
- aa_error "faq_portlet::twt::delete failed $errmsg : Didn't delete $faq_name Faq"
- } else {
- aa_log "Faq Deleted"
- set response 1
- }
- } else {
- aa_error "faq_portlet::twt::delete failed, bad response url : $response_url"
- }
-
- return $response
+ tclwebtest::link follow $faq_name
+ tclwebtest::link follow {View All FAQs}
+
+ db_1row faq_id "select faq_id from faqs where faq_name=:faq_name"
+ ::twt::do_request [export_vars -base "faq-delete" {faq_id}]
+
+ set response_url [tclwebtest::response url]
+
+ if { [string match "*/faq/admin/index" $response_url] } {
+ if {![catch {tclwebtest::link find "$faq_name" } errmsg]} {
+ aa_error "faq_portlet::twt::delete failed $errmsg : Didn't delete $faq_name Faq"
+ } else {
+ aa_log "Faq Deleted"
+ set response 1
+ }
+ } else {
+ aa_error "faq_portlet::twt::delete failed, bad response url : $response_url"
+ }
+
+ return $response
}
ad_proc -private faq_portlet::twt::disable_enable { faq_name option } {
- set response 0
+ set response 0
- set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"
- ::twt::do_request $dotlrn_page_url
+ set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"
+ ::twt::do_request $dotlrn_page_url
- tclwebtest::link follow "Classes"
+ tclwebtest::link follow "Classes"
- # Create a new FAQ
- tclwebtest::link follow ~u {one-community-admin$}
+ # Create a new FAQ
+ tclwebtest::link follow ~u {one-community-admin$}
- tclwebtest::link follow $faq_name
- tclwebtest::link follow {View All FAQs}
+ tclwebtest::link follow $faq_name
+ tclwebtest::link follow {View All FAQs}
- db_1row faq_id "select faq_id from faqs where faq_name=:faq_name"
- set url_option [export_vars -base "faq-$option" {faq_id}]
- ::twt::do_request $url_option
-
- set response_url [tclwebtest::response url]
+ db_1row faq_id "select faq_id from faqs where faq_name=:faq_name"
+ set url_option [export_vars -base "faq-$option" {faq_id}]
+ ::twt::do_request $url_option
- if {[string match "*/dotlrn/classes*/faq/admin*" $response_url] } {
- if {! [catch {tclwebtest::link find ~u $url_option } errmsg]} {
- aa_error "faq_portlet::twt::$option failed $errmsg : Didn't $option $faq_name Faq"
- } else {
- aa_log "Faq $option"
- set response 1
- }
- } else {
- aa_error "faq_portlet::twt::$option failed. Bad response url : $response_url "
- }
-
- return $response
+ set response_url [tclwebtest::response url]
+
+ if {[string match "*/dotlrn/classes*/faq/admin*" $response_url] } {
+ if {! [catch {tclwebtest::link find ~u $url_option } errmsg]} {
+ aa_error "faq_portlet::twt::$option failed $errmsg : Didn't $option $faq_name Faq"
+ } else {
+ aa_log "Faq $option"
+ set response 1
+ }
+ } else {
+ aa_error "faq_portlet::twt::$option failed. Bad response url : $response_url "
+ }
+
+ return $response
}
ad_proc -private faq_portlet::twt::edit_faq { faq_name faq_new_name } {
- set response 0
+ set response 0
- db_1row faq_id "select faq_id from faqs where faq_name=:faq_name"
-
- set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"
- ::twt::do_request $dotlrn_page_url
- tclwebtest::link follow "Classes"
+ db_1row faq_id "select faq_id from faqs where faq_name=:faq_name"
- tclwebtest::link follow ~u {one-community-admin$}
- tclwebtest::link follow $faq_name
-
- tclwebtest::form find ~n "faq_add_edit"
- tclwebtest::form submit
+ set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"
+ ::twt::do_request $dotlrn_page_url
+ tclwebtest::link follow "Classes"
- tclwebtest::form find ~n "faq_add_edit"
- tclwebtest::field find ~n "faq_name"
- tclwebtest::field fill "$faq_new_name"
- tclwebtest::form submit
- aa_log " Faq form submitted"
+ tclwebtest::link follow ~u {one-community-admin$}
+ tclwebtest::link follow $faq_name
- set response_url [tclwebtest::response url]
-
- if {[string match "*/faq/admin/one-faq*" $response_url] } {
- if { [catch {tclwebtest::form find ~n "faq_add_edit"} errmsg] || [catch {tclwebtest::field find ~v "$faq_new_name"} errmsg] } {
- aa_error "faq_portlet::twt::edit_faq failed $errmsg : Didn't Edit the Faq"
- } else {
- aa_log "Faq Edited"
- set response 1
- }
- } else {
- aa_error "faq_portlet::twt::new failed, bad response url : $response_url"
- }
-
- return $response
+ tclwebtest::form find ~n "faq_add_edit"
+ tclwebtest::form submit
+
+ tclwebtest::form find ~n "faq_add_edit"
+ tclwebtest::field find ~n "faq_name"
+ tclwebtest::field fill "$faq_new_name"
+ tclwebtest::form submit
+ aa_log " Faq form submitted"
+
+ set response_url [tclwebtest::response url]
+
+ if {[string match "*/faq/admin/one-faq*" $response_url] } {
+ if { [catch {tclwebtest::form find ~n "faq_add_edit"} errmsg] || [catch {tclwebtest::field find ~v "$faq_new_name"} errmsg] } {
+ aa_error "faq_portlet::twt::edit_faq failed $errmsg : Didn't Edit the Faq"
+ } else {
+ aa_log "Faq Edited"
+ set response 1
+ }
+ } else {
+ aa_error "faq_portlet::twt::new failed, bad response url : $response_url"
+ }
+
+ return $response
}
ad_proc -private faq_portlet::twt::new_Q_A { faq_name question answer} {
- set response 0
+ set response 0
- set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"
- ::twt::do_request $dotlrn_page_url
- tclwebtest::link follow "Classes"
- tclwebtest::link follow ~u {one-community-admin$}
- tclwebtest::link follow $faq_name
-
- tclwebtest::link follow "Create New Q&A"
-
- tclwebtest::form find ~n "new_quest_answ"
- tclwebtest::field find ~n "question"
- tclwebtest::field fill "$question"
- tclwebtest::field find ~n "answer"
- tclwebtest::field fill "$answer"
- tclwebtest::form submit
- aa_log " Faq Question Form submitted"
-
- set response_url [tclwebtest::response url]
+ set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"
+ ::twt::do_request $dotlrn_page_url
+ tclwebtest::link follow "Classes"
+ tclwebtest::link follow ~u {one-community-admin$}
+ tclwebtest::link follow $faq_name
- if { [string match "*/faq/admin/one-faq*" $response_url] } {
- if { [catch {tclwebtest::assert text "$question"} errmsg] } {
- aa_error "faq_portlet::twt::new_Q_A : failed $errmsg : Didn't Create a New Question"
- } else {
- aa_log "New Faq Question Created"
- set response 1
- }
- } else {
- aa_error "dotlrn_faq::twt::new_Q_A failed. Bad response url : $response_url"
- }
-
- return $response
+ tclwebtest::link follow "Create New Q&A"
+
+ tclwebtest::form find ~n "new_quest_answ"
+ tclwebtest::field find ~n "question"
+ tclwebtest::field fill "$question"
+ tclwebtest::field find ~n "answer"
+ tclwebtest::field fill "$answer"
+ tclwebtest::form submit
+ aa_log " Faq Question Form submitted"
+
+ set response_url [tclwebtest::response url]
+
+ if { [string match "*/faq/admin/one-faq*" $response_url] } {
+ if { [catch {tclwebtest::assert text "$question"} errmsg] } {
+ aa_error "faq_portlet::twt::new_Q_A : failed $errmsg : Didn't Create a New Question"
+ } else {
+ aa_log "New Faq Question Created"
+ set response 1
+ }
+ } else {
+ aa_error "dotlrn_faq::twt::new_Q_A failed. Bad response url : $response_url"
+ }
+
+ return $response
}
ad_proc -private faq_portlet::twt::delete_Q_A { faq_name question} {
- set response 0
+ set response 0
- set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"
- ::twt::do_request $dotlrn_page_url
- tclwebtest::link follow "Classes"
- tclwebtest::link follow ~u {one-community-admin$}
- tclwebtest::link follow $faq_name
+ set dotlrn_page_url "[site_node::get_package_url -package_key dotlrn]admin"
+ ::twt::do_request $dotlrn_page_url
+ tclwebtest::link follow "Classes"
+ tclwebtest::link follow ~u {one-community-admin$}
+ tclwebtest::link follow $faq_name
- tclwebtest::link follow {View All FAQs}
- tclwebtest::link follow $faq_name
+ tclwebtest::link follow {View All FAQs}
+ tclwebtest::link follow $faq_name
- db_1row faq_id "select faq_id from faqs where faq_name=:faq_name"
- tclwebtest::link follow delete
-
- set response_url [tclwebtest::response url]
+ db_1row faq_id "select faq_id from faqs where faq_name=:faq_name"
+ tclwebtest::link follow delete
- if { [string match "*/faq/admin/one-faq*" $response_url] } {
- if { [catch {tclwebtest::assert text -fail "$question"} errmsg] } {
- aa_error "faq_portlet::twt::delete_Q_A : failed $errmsg : Didn't Delete a Question"
- } else {
- aa_log "Faq Question Deleted"
- set response 1
- }
+ set response_url [tclwebtest::response url]
+
+ if { [string match "*/faq/admin/one-faq*" $response_url] } {
+ if { [catch {tclwebtest::assert text -fail "$question"} errmsg] } {
+ aa_error "faq_portlet::twt::delete_Q_A : failed $errmsg : Didn't Delete a Question"
} else {
- aa_error "dotlrn_faq::twt::delete_Q_A failed. Bad response url : $response_url"
+ aa_log "Faq Question Deleted"
+ set response 1
}
-
- return $response
+ } else {
+ aa_error "dotlrn_faq::twt::delete_Q_A failed. Bad response url : $response_url"
}
+ return $response
+}
+
# Local variables:
# mode: tcl
# tcl-indent-level: 4