- fix broken js and include missing js file for testday reports

- update selenium tests with new default (valid results only)

webtools/litmus/js/ManageSubgroups.js

@@ -170,7 +170,7 @@ function populateSubgroup(data) {
   var selectBoxSubgroup = document.getElementById('subgroup_testcases');
   selectBoxSubgroup.options.length = 0;
   for (var i=0; i<subgroup.testcases.length; i++) {
-    var optionText = subgroup.testcases[i].testcase_id + ': ' + subgroup.testcases[i].summary;
+    var optionText = subgroup.testcases[i].summary + ' (' + subgroup.testcases[i].testcase_id + ')';
     selectBoxSubgroup.options[selectBoxSubgroup.length] = new Option(optionText,
                                                      subgroup.testcases[i].testcase_id);
   }

webtools/litmus/js/SelectBoxes.js

@@ -167,7 +167,7 @@ function loadTestgroups(testgroupBox,mySuffix,silent) {
   var productId = productBox.options[productBox.selectedIndex].value;
   var branchBox = document.getElementById('branch'+mySuffix);
   var branchId = branchBox.options[branchBox.selectedIndex].value;
-  if (testgroups) {
+  if (testgroups && branchId != '') {
     for (var i=0; i<testgroups.length; i++) {
       if ((branchId && testgroups[i].branch_id == branchId) ||
 	  (!branchId && productId && testgroups[i].product_id == productId) ||

webtools/litmus/selenium/testcases/advanced_search_admin_options.html

@@ -26,7 +26,7 @@
 <tr>
 	<td>verifyText</td>
 	<td>//div[3]/div/p[1]</td>
-	<td>Custom<br />Submitted By is 'ccooper@deadsquid.com'</td>
+	<td>Custom<br />Submitted By is 'ccooper@deadsquid.com'<br />Display valid results only</td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>

webtools/litmus/selenium/testcases/advanced_search_general_options.html

@@ -26,7 +26,7 @@
 <tr>
 	<td>verifyText</td>
 	<td>//div[3]/div/p[1]</td>
-	<td>Custom<br />Limit to 50 results</td>
+	<td>Custom<br />Limit to 50 results<br />Display valid results only</td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
@@ -66,7 +66,7 @@
 <tr>
 	<td>verifyText</td>
 	<td>//div[3]/div/p[1]</td>
-	<td>Custom<br />Has comments<br />Limit to 50 results<br />Display my results only</td>
+	<td>Custom<br />Has comments<br />Limit to 50 results<br />Display my results only<br />Display valid results only</td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>

webtools/litmus/selenium/testcases/advanced_search_limit_by_date.html

@@ -16,7 +16,7 @@
 <tr>
 	<td>type</td>
 	<td>start_date</td>
-	<td>20061201</td>
+	<td>20061228</td>
 </tr>
 <tr>
 	<td>type</td>
@@ -31,7 +31,7 @@
 <tr>
 	<td>verifyText</td>
 	<td>//div[3]/div/p[1]</td>
-	<td>Custom<br />Date between '20061201' and '20070101'</td>
+	<td>Custom<br />Date between '20061228' and '20070101'<br />Display valid results only</td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
@@ -46,7 +46,7 @@
 <tr>
 	<td>verifyValue</td>
 	<td>start_date</td>
-	<td>20061201</td>
+	<td>20061228</td>
 </tr>
 <tr>
 	<td>verifyValue</td>
@@ -76,7 +76,7 @@
 <tr>
 	<td>verifyText</td>
 	<td>//div[3]/div/p[1]</td>
-	<td>Custom<br />Submitted in the last 14 days</td>
+	<td>Custom<br />Submitted in the last 14 days<br />Display valid results only</td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>

webtools/litmus/selenium/testcases/advanced_search_limit_by_field.html

@@ -81,7 +81,7 @@
 <tr>
 	<td>verifyText</td>
 	<td>//div[3]/div/p[1]</td>
-	<td>Custom<br />Product is '1'<br />Branch is '2'<br />Testgroup is '1'<br />Subgroup is '1'<br />Testcase ID# is '1'<br />Platform is '1'<br />Operating System is '4'<br />Locale is 'en-US'<br />Status is 'pass'</td>
+	<td>Custom<br />Product is 'Firefox'<br />Branch is '1.5 Branch'<br />Testgroup is '1.5 Smoketests'<br />Subgroup is 'Install and Startup'<br />Testcase ID# is '1'<br />Platform is 'Windows'<br />Operating System is 'Windows XP'<br />Locale is 'en-US'<br />Status is 'pass'<br />Display valid results only</td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>

webtools/litmus/selenium/testcases/advanced_search_search_by_field.html

@@ -81,7 +81,7 @@
 <tr>
 	<td>verifyText</td>
 	<td>//div[3]/div/p[1]</td>
-	<td>Custom<br />Comment contains all 'comment'<br />Locale not contain any 'en-US de'<br />Summary regexp 'Install*'<br />Product contains case 'Firefox'</td>
+	<td>Custom<br />Comment contains all 'comment'<br />Locale not contain any 'en-US de'<br />Summary regexp 'Install*'<br />Product contains case 'Firefox'<br />Display valid results only</td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>

webtools/litmus/selenium/testcases/advanced_search_sort_order.html

@@ -21,7 +21,7 @@
 <tr>
 	<td>select</td>
 	<td>sort_order1</td>
-	<td>label=Descending (Z->A)</td>
+	<td>label=Descending (Z-&gt;A)</td>
 </tr>
 <tr>
 	<td>select</td>
@@ -31,7 +31,7 @@
 <tr>
 	<td>select</td>
 	<td>sort_order2</td>
-	<td>label=Ascending (A->Z)</td>
+	<td>label=Ascending (A-&gt;Z)</td>
 </tr>
 <tr>
 	<td>select</td>
@@ -41,7 +41,7 @@
 <tr>
 	<td>select</td>
 	<td>sort_order3</td>
-	<td>label=Descending (Z->A)</td>
+	<td>label=Descending (Z-&gt;A)</td>
 </tr>
 <tr>
 	<td>select</td>
@@ -51,7 +51,7 @@
 <tr>
 	<td>select</td>
 	<td>sort_order4</td>
-	<td>label=Ascending (A->Z)</td>
+	<td>label=Ascending (A-&gt;Z)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -61,7 +61,7 @@
 <tr>
 	<td>verifyText</td>
 	<td>//div[3]/div/p[1]</td>
-	<td>Custom<br />Order by created DESC<br />Order by product ASC<br />Order by branch DESC<br />Order by testcase id ASC</td>
+	<td>Custom<br />Order by created DESC<br />Order by product ASC<br />Order by branch DESC<br />Order by testcase id ASC<br />Display valid results only</td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
@@ -81,7 +81,7 @@
 <tr>
 	<td>verifySelectedLabel</td>
 	<td>sort_order1</td>
-	<td>Descending (Z->A)</td>
+	<td>Descending (Z-&gt;A)</td>
 </tr>
 <tr>
 	<td>verifySelectedLabel</td>
@@ -91,7 +91,7 @@
 <tr>
 	<td>verifySelectedLabel</td>
 	<td>sort_order2</td>
-	<td>Ascending (A->Z)</td>
+	<td>Ascending (A-&gt;Z)</td>
 </tr>
 <tr>
 	<td>verifySelectedLabel</td>
@@ -101,7 +101,7 @@
 <tr>
 	<td>verifySelectedLabel</td>
 	<td>sort_order3</td>
-	<td>Descending (Z->A)</td>
+	<td>Descending (Z-&gt;A)</td>
 </tr>
 <tr>
 	<td>verifySelectedLabel</td>
@@ -111,7 +111,7 @@
 <tr>
 	<td>verifySelectedLabel</td>
 	<td>sort_order4</td>
-	<td>Ascending (A->Z)</td>
+	<td>Ascending (A-&gt;Z)</td>
 </tr>
 
 </tbody></table>

webtools/litmus/selenium/testcases/manage_subgroups_add_subgroup.html

@@ -51,7 +51,7 @@
 <tr>
 	<td>addSelection</td>
 	<td>testcases_for_product</td>
-	<td>label=*Verify Build ID</td>
+	<td>label=Verify Build ID*</td>
 </tr>
 <tr>
 	<td>click</td>

webtools/litmus/selenium/testcases/manage_subgroups_edit_subgroup.html

@@ -66,7 +66,7 @@
 <tr>
 	<td>addSelection</td>
 	<td>subgroup_testcases</td>
-	<td>label=*Verify Build ID</td>
+	<td>label=Verify Build ID*</td>
 </tr>
 <tr>
 	<td>click</td>
@@ -76,7 +76,7 @@
 <tr>
 	<td>addSelection</td>
 	<td>testcases_for_product</td>
-	<td>label=*Allow JavaScript</td>
+	<td>label=Allow JavaScript*</td>
 </tr>
 <tr>
 	<td>click</td>

webtools/litmus/templates/en/default/reporting/testday_report.tmpl

@@ -28,7 +28,7 @@
 [%# INTERFACE:
 #%]  
 
-[% INCLUDE global/html_header.tmpl js_files=['js/prototype.lite.js','js/moo.fx.js','js/moo.fx.pack.js','js/MochiKit/MochiKit.js','js/json.js','js/SelectBoxes.js'] %]
+[% INCLUDE global/html_header.tmpl js_files=['js/prototype.lite.js','js/moo.fx.js','js/moo.fx.pack.js','js/MochiKit/MochiKit.js','js/FormValidation.js','js/json.js','js/SelectBoxes.js'] %]
 [% INCLUDE global/litmus_header.tmpl %]
 
 <div id="page">

webtools/litmus/templates/en/default/reporting/testday_search.tmpl

@@ -34,12 +34,17 @@ var products=[% IF products_js %][% products_js %][% ELSE %]{}[% END %];
 var branches=[% IF branches_js %][% branches_js %][% ELSE %]{}[% END %];
 var testgroups=[% IF testgroups_js %][% testgroups_js %][% ELSE %]{}[% END %];
 
+var formName = '';
+
 function init() {
+  formName = 'testday_report';
   FormInit(document.forms['testday_report'], document.location.search);
 
-  productBox = document.getElementById('product_id');
-  branchBox = document.getElementById('branch_id');
 
+  productBox = document.getElementById('product');
+  branchBox = document.getElementById('branch');
+
+  formName = 'testevent_report';
   loadProducts(productBox)
   FormInit(document.forms['testevent_report'], document.location.search);
   changeProduct();
@@ -48,6 +53,15 @@ function init() {
   FormInit(document.forms['testevent_report'], document.location.search);
 }
 
+function checkFormContents(f) {
+  if (checkTimestamp(f.start_timestamp, 'Start Timestamp') &&
+      checkTimestamp(f.finish_timestamp, 'Finish Timestamp')) {
+    return true;
+  }
+
+  return false;
+}
+
 </script>
 
 <div class="section-full">
@@ -76,7 +90,7 @@ function init() {
 
   </form>
 
-  <form action="testday_report.cgi" method="get" name="testevent_report" id="testevent_report">
+  <form action="testday_report.cgi" method="get" name="testevent_report" id="testevent_report" onSubmit="return checkFormContents(this);">
 
     <table class="testcase-search">
       <tr>