[CMF-checkins] CVS: CMF/functest/creator - submit_news.zft:1.2

[Tres Seaver]

Update of /cvs-repository/CMF/functest/creator
In directory cvs.zope.org:/tmp/cvs-serv30457/functest/creator

Modified Files:
	submit_news.zft 
Log Message:
 - Accomodate new FT conventions.


=== CMF/functest/creator/submit_news.zft 1.1 => 1.2 ===
--- CMF/functest/creator/submit_news.zft:1.1	Thu Aug 29 19:05:40 2002
+++ CMF/functest/creator/submit_news.zft	Sat Mar  6 13:37:04 2004
@@ -7,40 +7,40 @@
 Function: submit_news_setup
 
 [Home_Page]
-URL: %(portal_url)s/%(site_path)s
+URL: %(site_host)s/%(site_path)s
 Expected_Result: 200
 
 [Login_Form]
-URL: %(portal_url)s/%(site_path)s/login_form
+URL: %(site_host)s/%(site_path)s/login_form
 Expected_Result: 200
 
 [Login]
-URL: %(portal_url)s/%(site_path)s/logged_in
+URL: %(site_host)s/%(site_path)s/logged_in
 Field_1: %(doh)sac_name:string = %(userid)s
 Field_2: %(doh)sac_password:string = %(password)s
 Expected_Result: 200
 
 [My_Stuff]
-URL: %(portal_url)s/%(site_path)s/Members/%(userid)s/folder_contents
+URL: %(site_host)s/%(site_path)s/Members/%(userid)s/folder_contents
 # Authentication could be via cookie, instead
 Authentication: %(userid)s:%(password)s
 Expected_Result: 200
 
 [Factories]
-URL: %(portal_url)s/%(site_path)s/Members/%(userid)s/folder_factories
+URL: %(site_host)s/%(site_path)s/Members/%(userid)s/folder_factories
 Authentication: %(userid)s:%(password)s
 Expected_Result: 200
 
 [New_Item]
-URL: %(portal_url)s/%(site_path)s/Members/%(userid)s/invokeFactory
+URL: %(site_host)s/%(site_path)s/Members/%(userid)s/invokeFactory
 Authentication: %(userid)s:%(password)s
 Field_1: id:string=testnews
 Field_2: type_name:string=News Item
 Expected_Result: 302
-Expected_Redirect: %(portal_url)s/Members/%(userid)s/testnews/metadata_edit_form
+Expected_Redirect: %(site_host)s/Members/%(userid)s/testnews/metadata_edit_form
 
 [Metadata]
-URL: %(portal_url)s/%(site_path)s/Members/%(userid)s/testnews/metadata_edit
+URL: %(site_host)s/%(site_path)s/Members/%(userid)s/testnews/metadata_edit
 Authentication: %(userid)s:%(password)s
 Field_1: title:string=New News
 Field_2: description:string=This is a test news item.
@@ -48,38 +48,38 @@
 Field_4: format:string=text/plain
 Field_5: change_and_edit:string= Change & Edit
 Expected_Result: 302
-Expected_Redirect: %(portal_url)s/Members/%(userid)s/testnews/newsitem_edit_form
+Expected_Redirect: %(site_host)s/Members/%(userid)s/testnews/newsitem_edit_form
 
 [Edit_Form]
-URL: %(portal_url)s/%(site_path)s/Members/%(userid)s/testnews/newsitem_edit_form
+URL: %(site_host)s/%(site_path)s/Members/%(userid)s/testnews/newsitem_edit_form
 Authentication: %(userid)s:%(password)s
 Expected_Result: 200
 
 [Edit]
-URL: %(portal_url)s/%(site_path)s/Members/%(userid)s/testnews/newsitem_edit
+URL: %(site_host)s/%(site_path)s/Members/%(userid)s/testnews/newsitem_edit
 Authentication: %(userid)s:%(password)s
 Field_1: description:string=This is a test news item.
 Field_2: text:string=Testing, testing: 1, 2, 3...
 Expected_Result: 302
-Expected_Redirect: %(portal_url)s/Members/%(userid)s/testnews/newsitem_edit_form
+Expected_Redirect: %(site_host)s/Members/%(userid)s/testnews/newsitem_edit_form
 
 [View]
-URL: %(portal_url)s/%(site_path)s/Members/%(userid)s/testnews/newsitem_view
+URL: %(site_host)s/%(site_path)s/Members/%(userid)s/testnews/newsitem_view
 Authentication: %(userid)s:%(password)s
 Expected_Result: 200
 
 [Submit_form]
-URL: %(portal_url)s/%(site_path)s/Members/%(userid)s/testnews/content_submit_form
+URL: %(site_host)s/%(site_path)s/Members/%(userid)s/testnews/content_submit_form
 Authentication: %(userid)s:%(password)s
 Expected_Result: 200
 
 [Submit]
-URL: %(portal_url)s/%(site_path)s/Members/%(userid)s/testnews/content_status_modify
+URL: %(site_host)s/%(site_path)s/Members/%(userid)s/testnews/content_status_modify
 Authentication: %(userid)s:%(password)s
 Field_1: comment:string=Submitting
 Field_2: workflow_action:string=submit
 Expected_Result: 302
-Expected_Redirect: %(portal_url)s/Members/user/testnews/view
+Expected_Redirect: %(site_host)s/Members/user/testnews/view
 
 [Postcondition]
 Filename: %(config_dir)s/scaffolding.py