Commit c44ea891 authored by Ivan Tyagov's avatar Ivan Tyagov

Use synchronous meta data discovery and adjust tests accordingly.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35667 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 7e53c1a1
......@@ -121,26 +121,6 @@
<td></td>\n
</tr>\n
\n
\n
<!-- Table mode -->\n
<!--\n
<tr>\n
<td>clickAndWait</td>\n
<td>style_toggle_icon</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>verifyElementPresent</td>\n
<td>link=Web Page</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>verifyElementPresent</td>\n
<td>link=km.web.site.test.page</td>\n
<td></td>\n
</tr>\n
-->\n
\n
<tal:block metal:use-macro="here/KMZuite_CommonTemplate/macros/deleteKMWebSite" />\n
\n
</tbody></table>\n
......
......@@ -81,6 +81,45 @@
<td>Presentation created successfully</td>\n
<td></td>\n
</tr>\n
<!-- -->\n
<tr>\n
\t<td>verifyValue</td>\n
\t<td>field_my_title</td>\n
\t<td>TioLive, ERP5, Freedom</td>\n
</tr>\n
<tr>\n
\t<td>verifyValue</td>\n
\t<td>field_my_reference</td>\n
\t<td>tiolive-ERP5.DMS.TioLive</td>\n
</tr>\n
<tr>\n
\t<td>verifyValue</td>\n
\t<td>field_my_version</td>\n
\t<td>001</td>\n
</tr>\n
<tr>\n
\t<td>verifyValue</td>\n
\t<td>field_my_language</td>\n
\t<td>en</td>\n
</tr>\n
<tr>\n
\t<td>verifyTextPresent</td>\n
\t<td>tiolive-ERP5.DMS.TioLive-001-en.odp</td>\n
\t<td></td>\n
</tr>\n
<tr>\n
\t<td>verifyTextPresent</td>\n
\t<td>Presentation</td>\n
\t<td></td>\n
</tr>\n
<tr>\n
\t<td>verifyTextPresent</td>\n
\t<td>Converted</td>\n
\t<td></td>\n
</tr>\n
\n
\n
<!-- -->\n
<span metal:use-macro="container/ExpressZuite_viewTestMacroLibrary/macros/wait_for_activities">\n
Wait for activities</span>\n
<tr>\n
......
......@@ -79,6 +79,51 @@
<td>URL contributed successfully</td>\n
<td></td>\n
</tr>\n
<!-- -->\n
<tr>\n
\t<td>verifyTextPresent</td>\n
\t<td>Preview</td>\n
\t<td></td>\n
</tr>\n
<tr>\n
\t<td>verifyValue</td>\n
\t<td>field_my_version</td>\n
\t<td>001</td>\n
</tr>\n
<tr>\n
\t<td>verifyValue</td>\n
\t<td>field_my_language</td>\n
\t<td>en</td>\n
</tr>\n
<tr>\n
\t<td>verifyTextPresent</td>\n
\t<td>Draft</td>\n
\t<td></td>\n
</tr>\n
<tr>\n
\t<td>verifyTextPresent</td>\n
\t<td>Community</td>\n
\t<td></td>\n
</tr>\n
<tr>\n
\t<td>verifyTextPresent</td>\n
\t<td>ERP5</td>\n
\t<td></td>\n
</tr>\n
<tr>\n
\t<td>type</td>\n
\t<td>field_my_reference</td>\n
\t<td>Front-page-ERP5.com-Test</td>\n
</tr>\n
<tr>\n
\t<td>clickAndWait</td>\n
\t<td>hidden_button</td>\n
\t<td></td>\n
</tr>\n
\n
\n
\n
\n
<!-- Wait for activities to finish -->\n
<tr>\n
<td>openAndWait</td>\n
......@@ -115,6 +160,11 @@
<td>FrontPage </td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>verifyElementPresent</td>\n
<td>link=Front-page-ERP5.com-Test</td>\n
<td></td>\n
</tr>\n
\n
<tal:block metal:use-macro="here/KMZuite_CommonTemplate/macros/deleteKMWebSite" />\n
\n
......
......@@ -88,13 +88,6 @@
<td>field_your_search_text</td>\n
<td>\\13</td>\n
</tr>\n
<!--\n
<tr>\n
<td>verifyText</td>\n
<td>//div[@class=\'searchResultHeader\']/span[@class=\'right\']/em[2]</td>\n
<td>1</td>\n
</tr>\n
-->\n
<tr>\n
<td>verifyText</td>\n
<td>//tr[@id=\'listbox_data_line_0\']//span[@class=\'search_result_title\']</td>\n
......
......@@ -83,8 +83,8 @@ km_preference = portal_preferences.newContent(\n
priority = 1,\n
preferred_document_reference_regular_expression = \'(?P<reference>[a-zA-Z0-9-_.]+-[a-zA-Z0-9-_.]+)(|-(?P<version>[0-9a-zA-Z.]+))(|-(?P<language>[a-z]{2})[^-]*)?\',\n
preferred_document_file_name_regular_expression = \'(?P<node_reference>[a-zA-Z0-9_-]+)-(?P<local_reference>[a-zA-Z0-9_.]+)-(?P<version>[0-9a-zA-Z.]+)-(?P<language>[a-z]{2})[^-]*?\',\n
preferred_synchronous_metadata_discovery = False,\n
preferred_redirect_to_document = False,\n
preferred_synchronous_metadata_discovery = True,\n
preferred_redirect_to_document = True,\n
preferred_ooodoc_server_address = context.Zuite_getConversionServerDict()["oood_hostname"],\n
preferred_ooodoc_server_port_number = context.Zuite_getConversionServerDict()["oood_port"])\n
km_preference.enable()\n
......@@ -144,7 +144,6 @@ return "Created Successfully."\n
<string>True</string>
<string>km_preference_id</string>
<string>portal_preferences</string>
<string>False</string>
<string>_getitem_</string>
<string>km_preference</string>
</tuple>
......
46
\ No newline at end of file
47
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment