Fix tests so they auto-start when run via cordova-paramedic

tests/tests.js

@@ -19,7 +19,7 @@
  *
 */
 
-/* global MSApp, alert */
+/* global MSApp */
 
 var cordova = require('cordova');
 var isWindows = cordova.platformId === 'windows';
@@ -33,7 +33,6 @@ if (isWindows && navigator && navigator.notification && navigator.notification.a
 }
 
 exports.defineAutoTests = function () {
-
     var createTests = function (platformOpts) {
         platformOpts = platformOpts || '';
 
@@ -154,7 +153,6 @@ exports.defineAutoTests = function () {
         });
     });
     };
-
     if (isIos) {
         createTests('usewkwebview=no');
         createTests('usewkwebview=yes');
@@ -165,6 +163,15 @@ exports.defineAutoTests = function () {
 
 exports.defineManualTests = function (contentEl, createActionButton) {
 
+    var platformOpts = '';
+    var platform_info = '';
+    if (isIos) {
+        platformOpts = 'usewkwebview=no';
+        platform_info = '<h1>Webview</h1>' +
+            '<p>Use this button to toggle the Webview implementation.</p>' +
+            '<div id="webviewToggle"></div>';
+    }
+
     function doOpen (url, target, params, numExpectedRedirects, useWindowOpen) {
         numExpectedRedirects = numExpectedRedirects || 0;
         useWindowOpen = useWindowOpen || false;
@@ -173,7 +180,6 @@ exports.defineManualTests = function (contentEl, createActionButton) {
         var counts;
         var lastLoadStartURL;
         var wasReset = false;
-
         function reset () {
             counts = {
                 'loaderror': 0,
@@ -183,7 +189,6 @@ exports.defineManualTests = function (contentEl, createActionButton) {
             };
             lastLoadStartURL = '';
         }
-
         reset();
 
         var iab;
@@ -277,11 +282,11 @@ exports.defineManualTests = function (contentEl, createActionButton) {
         };
         if (cssUrl) {
             iab.addEventListener('loadstop', function (event) {
-                iab.insertCSS({file: cssUrl}, useCallback && callback);
+                iab.insertCSS({ file: cssUrl }, useCallback && callback);
             });
         } else {
             iab.addEventListener('loadstop', function (event) {
-                iab.insertCSS({code: '#style-update-literal { \ndisplay: block !important; \n}'},
+                iab.insertCSS({ code: '#style-update-literal { \ndisplay: block !important; \n}' },
                     useCallback && callback);
             });
         }
@@ -291,7 +296,7 @@ exports.defineManualTests = function (contentEl, createActionButton) {
         var iab = doOpen(url, '_blank', 'location=yes');
         if (jsUrl) {
             iab.addEventListener('loadstop', function (event) {
-                iab.executeScript({file: jsUrl}, useCallback && function (results) {
+                iab.executeScript({ file: jsUrl }, useCallback && function (results) {
                     if (results && results.length === 0) {
                         alert('Results verified'); // eslint-disable-line no-undef
                     } else {
@@ -307,7 +312,7 @@ exports.defineManualTests = function (contentEl, createActionButton) {
                   '    header.innerHTML = "Script literal successfully injected";\n' +
                   '    return "abc";\n' +
                   '})()';
-                iab.executeScript({code: code}, useCallback && function (results) {
+                iab.executeScript({ code: code }, useCallback && function (results) {
                     if (results && results.length === 1 && results[0] === 'abc') {
                         alert('Results verified'); // eslint-disable-line no-undef
                     } else {
@@ -318,11 +323,8 @@ exports.defineManualTests = function (contentEl, createActionButton) {
             });
         }
     }
-
     var hiddenwnd = null;
-    var loadlistener = function (event) {
+    var loadlistener = function (event) { alert('background window loaded '); }; // eslint-disable-line no-undef
-        alert('background window loaded ');
-    }; // eslint-disable-line no-undef
     function openHidden (url, startHidden) {
         var shopt = (startHidden) ? 'hidden=yes' : '';
         if (platformOpts) {
@@ -335,13 +337,11 @@ exports.defineManualTests = function (contentEl, createActionButton) {
         }
         if (startHidden) hiddenwnd.addEventListener('loadstop', loadlistener);
     }
-
     function showHidden () {
         if (hiddenwnd) {
             hiddenwnd.show();
         }
     }
-
     function closeHidden () {
         if (hiddenwnd) {
             hiddenwnd.removeEventListener('loadstop', loadlistener);
@@ -358,15 +358,6 @@ exports.defineManualTests = function (contentEl, createActionButton) {
         '<h4>User-Agent: <span id="user-agent"> </span></hr>' +
         '</div>';
 
-    var platformOpts = '';
-    var platform_info = '';
-    if (isIos) {
-        platformOpts = 'usewkwebview=no';
-        platform_info = '<h1>Webview</h1>' +
-            '<p>Use this button to toggle the Webview implementation.</p>' +
-            '<div id="webviewToggle"></div>';
-    }
-
     var local_tests = '<h1>Local URL</h1>' +
         '<div id="openLocal"></div>' +
         'Expected result: opens successfully in CordovaWebView.' +
@@ -523,13 +514,11 @@ exports.defineManualTests = function (contentEl, createActionButton) {
     var injectjs = isWindows ? basePath + 'inject.js' : 'inject.js';
     var injectcss = isWindows ? basePath + 'inject.css' : 'inject.css';
     var videohtml = basePath + 'video.html';
-
     if (isIos) {
         createActionButton('Webview=UIWebView', function () {
             var webviewOption = 'usewkwebview=';
             var webviewToggle = document.getElementById('webviewToggle');
             var button = webviewToggle.getElementsByClassName('topcoat-button')[0];
-
             if (platformOpts === webviewOption + 'yes') {
                 platformOpts = webviewOption + 'no';
                 button.textContent = 'Webview=UIWebView';