Commit f60a2de8 authored by Cédric de Saint Martin's avatar Cédric de Saint Martin

Merge branch 'master' into ui_test

Something wrong appened at previous merge to master. Cleaning.

Conflicts:
	master/bt5/vifib_web_ui_test/PathTemplateItem/portal_tests/vifib_web_zuite/TestKVM.xml
	master/bt5/vifib_web_ui_test/SkinTemplateItem/portal_skins/vifib_web_ui_test.xml
	master/bt5/vifib_web_ui_test/SkinTemplateItem/portal_skins/vifib_web_ui_test/Zuite_vifib_instanciation_macro_library.xml
	master/bt5/vifib_web_ui_test/bt/revision
parents 9357830d 479c5798
...@@ -175,7 +175,6 @@ ...@@ -175,7 +175,6 @@
<td>id=dialog_submit_button</td>\n <td>id=dialog_submit_button</td>\n
<td></td>\n <td></td>\n
</tr>\n </tr>\n
\n
<tr>\n <tr>\n
<td>assertElementPresent</td>\n <td>assertElementPresent</td>\n
<td>name=field_your_last_name</td>\n <td>name=field_your_last_name</td>\n
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>"""\n
Storage for the login and password of the test user\n
"""\n
\n
return {\'test_user_login\' :\'test_customer_vifib_web\',\n
\'test_user_password\': \'testuser\'}\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Vifib_testUserInfo</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
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