fixes #5 by adding back template replacement for DateTime_Stamp and c…

…orrecting logic
a11smiles · Jan 2, 2017 · 0e4ff2c · 0e4ff2c
1 parent 35f80cd
commit 0e4ff2c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 21 deletions.
diff --git a/lib/reporter.js b/lib/reporter.js
@@ -215,6 +215,7 @@ var HtmlDetailedReporter = function (baseReporterDecorator, config, logger, help
         // Replace remaining placeholders
         template = template.replace('{{Auto_Reload}}', autoReload);
         template = template.replace('{{Refresh_Timeout}}', refreshTimeout);
+        template = template.replace('{{DateTime_Stamp}}', formatTimestamp());
         template = template.replace('{{Total_Test_Count}}', counts.totalCnt);
         template = template.replace('{{Total_Pass_Count}}', counts.passCnt);
         template = template.replace('{{Total_Skip_Count}}', counts.skipCnt);

diff --git a/template.html b/template.html
@@ -32,8 +32,33 @@
         </style>
         <script src="{{jquery_Path}}/jquery.min.js"></script>
         <script>
-            var reload = {{Auto_Reload}};
-
+            var reload = shouldReload();
+
+            var shouldReload = function() {
+                if (location.search != null && location.search != undefined && location.search.length > 0)
+                    return location.search.substr(1) === 'true' ? true : false;
+                else
+                    return {{Auto_Reload}};
+            };
+
+            var setState = function(status) {
+                if (status) {
+                    $('#refreshBtn').removeClass('btn-danger');
+                    $('#refreshBtn').addClass('btn-success');
+                    $('#refreshBtn').text('Enable Refresh');
+                } else {
+                    $('#refreshBtn').removeClass('btn-success');
+                    $('#refreshBtn').addClass('btn-danger');                        
+                    $('#refreshBtn').text('Disable Refresh');
+                }                    
+            };
+
+            var refresh = function() {
+                if (reload) {
+                    location.search = reload;
+                }
+            };
+
             $(document).ready(function() {
                 setState(!reload);                
 
@@ -47,26 +72,8 @@
                     }
                 });
 
-                var setState = function(status) {
-                    if (status) {
-                        $('#refreshBtn').removeClass('btn-danger');
-                        $('#refreshBtn').addClass('btn-success');
-                        $('#refreshBtn').text('Enable Refresh');
-                    } else {
-                        $('#refreshBtn').removeClass('btn-success');
-                        $('#refreshBtn').addClass('btn-danger');                        
-                        $('#refreshBtn').text('Disable Refresh');
-                    }                    
-                }
-
-                var refresh = function() {
-                    if (reload) {
-                        location.reload();
-                    }
-                };
-
                 setTimeout(refresh, {{Refresh_Timeout}});
-            })
+            });
         </script>
     </head>
   <body id="REPORT_TEMPLATE">