Index: openacs-4/packages/acs-automated-testing/acs-automated-testing.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/acs-automated-testing.info,v
diff -u -r1.47.2.3 -r1.47.2.4
--- openacs-4/packages/acs-automated-testing/acs-automated-testing.info 17 Apr 2019 11:05:20 -0000 1.47.2.3
+++ openacs-4/packages/acs-automated-testing/acs-automated-testing.info 23 Nov 2020 19:04:34 -0000 1.47.2.4
@@ -7,7 +7,7 @@
t
t
-
+
OpenACS
The interface to the automated testing facilities within OpenACS.
2017-08-06
@@ -19,7 +19,7 @@
OpenACS system. Also provides a UI for managing
automatic-rebuild servers as in a test farm.
-
+
Index: openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl,v
diff -u -r1.79.2.35 -r1.79.2.36
--- openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl 5 Nov 2020 10:14:23 -0000 1.79.2.35
+++ openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl 23 Nov 2020 19:04:34 -0000 1.79.2.36
@@ -1557,6 +1557,37 @@
return $d
}
+
+ ad_proc -public ::acs::test::get_url_from_location {
+ dict
+ } {
+ Determine the url based on the location field provided from
+ the result dict (as returned from acs::test::http).
+
+ @param dict dict containing an ns_set called headers
+ @see acs::test::http
+ } {
+ set location [ns_set iget [dict get $dict headers] Location ""]
+ if {$location ne ""} {
+ set urlDict [ns_parseurl $location]
+ #aa_log "parse url '$location' => $urlDict"
+ if {[dict get $urlDict tail] ne ""} {
+ set url [dict get $urlDict path]/[dict get $urlDict tail]
+ } else {
+ set url [dict get $urlDict path]/
+ }
+ if {[dict exists $urlDict query]} {
+ set query [dict get $urlDict query]
+ if {$query ne ""} {
+ append url "?$query"
+ }
+ }
+ } else {
+ set url ""
+ }
+ return $url
+ }
+
ad_proc -public ::acs::test::confirm_email {
-user_id:required
} {
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 -r1.60.2.7 -r1.60.2.8
--- openacs-4/packages/file-storage/file-storage.info 21 Jul 2020 14:06:40 -0000 1.60.2.7
+++ openacs-4/packages/file-storage/file-storage.info 23 Nov 2020 19:04:34 -0000 1.60.2.8
@@ -7,7 +7,7 @@
f
f
-
+
OpenACS
Collaborative document storage
2017-08-06
@@ -17,11 +17,11 @@
2
#file-storage.file-storage#
-
+
-
+
Index: openacs-4/packages/file-storage/tcl/test/webtest-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/test/webtest-procs.tcl,v
diff -u -r1.1.2.4 -r1.1.2.5
--- openacs-4/packages/file-storage/tcl/test/webtest-procs.tcl 9 Feb 2020 15:39:58 -0000 1.1.2.4
+++ openacs-4/packages/file-storage/tcl/test/webtest-procs.tcl 23 Nov 2020 19:04:34 -0000 1.1.2.5
@@ -32,7 +32,7 @@
description "$folder_description"
}]]
acs::test::reply_has_status_code $d 302
- set location [::xowiki::test::get_url_from_location $d]
+ set location [::acs::test::get_url_from_location $d]
if { [string match "*/\?folder_id*" $location] } {
set d [acs::test::http -last_request $d $location]
@@ -67,7 +67,7 @@
folder_name "$folder_name"
}]]
acs::test::reply_has_status_code $d 302
- set location [::xowiki::test::get_url_from_location $d]
+ set location [::acs::test::get_url_from_location $d]
if { [string match "*/\?folder_id*" $location] } {
set d [acs::test::http -last_request $d $location]
Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.180.2.50 -r1.180.2.51
--- openacs-4/packages/xowiki/xowiki.info 19 Nov 2020 21:21:13 -0000 1.180.2.50
+++ openacs-4/packages/xowiki/xowiki.info 23 Nov 2020 19:04:34 -0000 1.180.2.51
@@ -10,7 +10,7 @@
t
xowiki
-
+
Gustaf Neumann
A xotcl-based enterprise wiki system with multiple object types
2017-08-06
@@ -55,7 +55,7 @@
BSD-Style
2
-
+
@@ -67,7 +67,7 @@
-
+
Index: openacs-4/packages/xowiki/tcl/test/test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/test/test-procs.tcl,v
diff -u -r1.15.2.15 -r1.15.2.16
--- openacs-4/packages/xowiki/tcl/test/test-procs.tcl 26 Aug 2020 18:46:08 -0000 1.15.2.15
+++ openacs-4/packages/xowiki/tcl/test/test-procs.tcl 23 Nov 2020 19:04:34 -0000 1.15.2.16
@@ -42,20 +42,10 @@
return [$node selectNodes $q]
}
- ad_proc -private ::xowiki::test::get_url_from_location {d} {
- set location [ns_set iget [dict get $d headers] Location ""]
- if {$location ne ""} {
- set url [ns_parseurl $location]
- #aa_log "parse url '$location' => $url"
- if {[dict get $url tail] ne ""} {
- set url [dict get $url path]/[dict get $url tail]
- } else {
- set url [dict get $url path]
- }
- } else {
- set url ""
- }
- return $url
+ ad_proc -private -deprecated ::xowiki::test::get_url_from_location {d} {
+ Deprecated version of ::acs::test::get_url_from_location
+ } {
+ ::acs::test::get_url_from_location $d
}
ad_proc -private ::xowiki::test::pretty_form_content {d} {
@@ -197,7 +187,7 @@
set d [acs::test::http -last_request $last_request -user_id $user_id \
$instance/$folder_name?m=delete&return_url=$instance/]
if {[acs::test::reply_has_status_code $d 302]} {
- set location [::xowiki::test::get_url_from_location $d]
+ set location [::acs::test::get_url_from_location $d]
set d [acs::test::http -last_request $last_request -user_id $user_id $location/]
acs::test::reply_has_status_code $d 200
}
@@ -270,7 +260,7 @@
$url]
acs::test::reply_has_status_code $d 302
- set location [::xowiki::test::get_url_from_location $d]
+ set location [::acs::test::get_url_from_location $d]
aa_true "create_form_page: location '$location' is valid" {$location ne ""}
#
@@ -326,7 +316,7 @@
}
aa_log "create_form_page: form_content:\n[::xowiki::test::pretty_form_content $form_content]"
- set location [::xowiki::test::get_url_from_location $d]
+ set location [::acs::test::get_url_from_location $d]
aa_true "create_form_page: location '$location' is valid" {$location ne ""}
set d [acs::test::http \
@@ -373,7 +363,7 @@
[export_vars -base $instance/$path $extra_url_parameter]]
acs::test::reply_has_status_code $d 200
- #set location [::xowiki::test::get_url_from_location $d]
+ #set location [::acs::test::get_url_from_location $d]
#aa_true "location '$location' is valid" {$location ne ""}
set response [dict get $d body]
@@ -496,7 +486,7 @@
ns_log notice "Maybe a validation error? response\n$response"
}
- set location [::xowiki::test::get_url_from_location $d]
+ set location [::acs::test::get_url_from_location $d]
aa_true "location '$location' is valid" {$location ne ""}
::xo::Package initialize -url $location