Merge remote-tracking branch 'origin/master' into lazy_simulation_causality

master/bt5/vifib_web_ui_test/PathTemplateItem/portal_tests/vifib_web_zuite/TestKVM.xml

@@ -51,7 +51,7 @@
 <tal:block metal:use-macro="container/Zuite_vifib_instanciation_macro_library/macros/init_environment" />\n
 <tr>\n
   <td>phantomRender</td>\n
-    <td>/home/darthabel/screen/webrequest1.png</td>\n
+  <td>webrequest1.png</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -66,7 +66,7 @@
 </tr>\n
 <tr>\n
   <td>phantomRender</td>\n
-    <td>/home/darthabel/screen/webrequest2.png</td>\n
+  <td>webrequest2.png</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -121,7 +121,7 @@
 </tr>\n
 <tr>\n
   <td>phantomRender</td>\n
-    <td>/home/darthabel/screen/webrequest3.png</td>\n
+  <td>webrequest3.png</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -149,14 +149,15 @@
   <td>id=dialog_submit_button</td>\n
   <td></td>\n
 </tr>\n
+<!-- XXX : vifib UI should automatically propose the latest version of KVM.-->\n
 <tr>\n
   <td>assertElementPresent</td>\n
-  <td>//tr[contains(.,"KVM")][last()]/td[contains(.,"KVM")]/input</td>\n
+  <td>//tr[contains(.,"001")][last()]/td[contains(.,"KVM")]/input</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>storeAttribute</td>\n
-  <td>//tr[contains(.,"KVM")][last()]/td[contains(.,"KVM")]/input@value</td>\n
+  <td>//tr[contains(.,"001")][last()]/td[contains(.,"KVM")]/input@value</td>\n
   <td>value</td>\n
 </tr>\n
 <tr>\n
@@ -166,7 +167,7 @@
 </tr>\n
 <tr>\n
   <td>phantomRender</td>\n
-    <td>/home/darthabel/screen/webrequest4.png</td>\n
+  <td>webrequest4.png</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -222,7 +223,7 @@
 <tr>\n
   <td>type</td>\n
   <td>name=field_your_default_email_text</td>\n
-  <td>mail@domain.com</td>\n
+  <td>email@domain.com</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
@@ -241,7 +242,7 @@
 </tr>\n
 <tr>\n
   <td>phantomRender</td>\n
-    <td>/home/darthabel/screen/webrequest5.png</td>\n
+  <td>webrequest5.png</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -249,9 +250,10 @@
   <td>id=dialog_submit_button</td>\n
   <td></td>\n
 </tr>\n
+\n
 <tr>\n
   <td>phantomRender</td>\n
-    <td>/home/darthabel/screen/webrequest6.png</td>\n
+  <td>webrequest6.png</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -259,25 +261,21 @@
   <td>//img[@alt="My Services"]</td>\n
   <td></td>\n
 </tr>\n
+<!-- Here we wait 15 minutes too see if vifib has calculated everything and\n
+     instance is "instantiation in progress" or better. -->\n
 <tr>\n
-  <td>clickAndWait</td>\n
-  <td>//img[@alt="My Services"]</td>\n
+  <td>pause</td>\n
+  <td>900000</td>\n
   <td></td>\n
 </tr>\n
-<!--tr>\n
-  <td>assertTextPresent</td>\n
-  <td>Unimplemented: Can\'t fetch the reference of the software instance</td>\n
-  <td></td>\n
-</tr>-->\n
-<span metal:use-macro="container/Zuite_vifib_instanciation_macro_library/macros/finished_processing_activities" />\n
 <tr>\n
-    <td>phantomRender</td>\n
-    <td>/home/darthabel/screen/webrequest7.png</td>\n
+  <td>clickAndWait</td>\n
+  <td>//img[@alt="My Services"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>pause</td>\n
-  <td>30000</td>\n
+  <td>phantomRender</td>\n
+  <td>webrequest7.png</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -290,7 +288,6 @@
   <td>link=${kvm}</td>\n
   <td></td>\n
 </tr>\n
-<span metal:use-macro="container/Zuite_vifib_instanciation_macro_library/macros/finished_processing_activities" />\n
 <tr>\n
   <td>assertElementPresent</td>\n
   <td>link=${kvm}</td>\n
@@ -303,12 +300,11 @@
 </tr>\n
 <tr>\n
   <td>phantomRender</td>\n
-    <td>/home/darthabel/screen/webrequest8.png</td>\n
+  <td>webrequest8.png</td>\n
   <td></td>\n
 </tr>\n
 <span metal:use-macro="container/Zuite_vifib_instanciation_macro_library/macros/check_for_started_instance" />\n
-<!-- This part only work with chromium for now -->\n
-<!----><tr>\n
+<tr>\n
   <td>pause</td>\n
   <td>90000</td>\n
   <td></td>\n
@@ -320,14 +316,12 @@
 </tr>\n
 <tr>\n
   <td>store</td>\n
-  <td>javascript{storedVars[\'xml\'].split(\'&lt;parameter\n
-  id=&quot;url&quot;&gt;\')[1].split(\'&lt;/parameter&gt;\')[0];}</td>\n
+  <td>javascript{storedVars[\'xml\'].split(\'&lt;parameter id=&quot;url&quot;&gt;\')[1].split(\'&lt;/parameter&gt;\')[0];}</td>\n
   <td>ip</td>\n
 </tr>\n
 <tr>\n
   <td>store</td>\n
-  <td>javascript{storedVars[\'xml\'].split(\'&lt;parameter\n
-  id=&quot;password&quot;&gt;\')[1].split(\'&lt;/parameter&gt;\')[0];}</td>\n
+  <td>javascript{storedVars[\'xml\'].split(\'&lt;parameter id=&quot;password&quot;&gt;\')[1].split(\'&lt;/parameter&gt;\')[0];}</td>\n
   <td>password</td>\n
 </tr>\n
 <tr>\n
@@ -355,16 +349,17 @@
   <td>id=password_input</td>\n
   <td>13</td>\n
 </tr>\n
+<!--Check if it works without it in chrome AND firefox before removing.\n
 <tr>\n
-\t<td>pause</td>\n
-\t<td>1000</td>\n
-\t<td></td>\n
+  <td>pause</td>\n
+  <td>1000</td>\n
+  <td></td>\n
 </tr>\n
 <tr>\n
-\t<td>submit</td>\n
-\t<td>//input[@id=&quot;password_input&quot;]/..</td>\n
-\t<td>\\13</td>\n
-</tr>\n
+  <td>submit</td>\n
+  <td>//input[@id=&quot;password_input&quot;]/..</td>\n
+  <td>\\13</td>\n
+</tr>-->\n
 <tr>\n
   <td>pause</td>\n
   <td>10000</td>\n
@@ -377,14 +372,14 @@
 </tr>\n
 <tr>\n
   <td>phantomRender</td>\n
-    <td>/home/darthabel/screen/webrequest9.png</td>\n
+  <td>webrequest9.png</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>openAndWait</td>\n
   <td>${address}</td>\n
   <td></td>\n
-</tr><!---->\n
+</tr>\n
 <span metal:use-macro="container/Zuite_vifib_instanciation_macro_library/macros/destroy_instance" />\n
 </tbody>\n
 </table>\n

master/bt5/vifib_web_ui_test/SkinTemplateItem/portal_skins/vifib_web_ui_test.xml

@@ -6,12 +6,33 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>business_template_skin_layer_priority</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>float</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
         <item>
             <key> <string>_objects</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>business_template_skin_layer_priority</string> </key>
+            <value> <float>60.0</float> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>vifib_web_ui_test</string> </value>

master/bt5/vifib_web_ui_test/SkinTemplateItem/portal_skins/vifib_web_ui_test/Zuite_vifib_instanciation_macro_library.xml

@@ -138,9 +138,10 @@
   </tr>\n
   <tr>\n
     <td>waitForCondition</td>\n
+    <!-- XXX-Cedric : should be "Destroyed". -->\n
     <td>new\n
   Ajax.Request(\'ERP5Site_getInstanceStatus?instance_reference=${instance_reference}\',\n
-  {asynchronous: false}).transport.responseText === "Destroyed"; var\n
+  {asynchronous: false}).transport.responseText === "Destruction in progress"; var\n
   i; for (i = 0; i < 10000000; i++){};</td>\n
     <td>600000</td>\n
   </tr>\n

master/bt5/vifib_web_ui_test/bt/revision

-6
\ No newline at end of file
+13

master/product/Vifib/tests/testVifibSkinSelection.py

@@ -125,6 +125,7 @@ vifib_slap
 vifib_software_pdm
 vifib_test
 vifib_web
+vifib_web_ui_test
 erp5_km_theme
 erp5_knowledge_pad
 erp5_simulation
@@ -218,6 +219,7 @@ vifib_slap
 vifib_software_pdm
 vifib_test
 vifib_web
+vifib_web_ui_test
 erp5_free_fiber_request
 erp5_km_theme
 erp5_knowledge_pad
@@ -313,6 +315,7 @@ vifib_slap
 vifib_software_pdm
 vifib_test
 vifib_web
+vifib_web_ui_test
 erp5_km_theme
 erp5_knowledge_pad
 erp5_simulation
@@ -577,6 +580,7 @@ vifib_slap
 vifib_software_pdm
 vifib_test
 vifib_web
+vifib_web_ui_test
 erp5_free_fiber_request
 erp5_knowledge_pad
 erp5_simulation