SeleniumHQ · tourdedave · Aug 12, 2018 · Jun 27, 2018 · Jun 28, 2018 · Jun 28, 2018
diff --git a/packages/selenium-ide/src/content/bootstrap.html b/packages/selenium-ide/src/content/bootstrap.html
@@ -21,4 +21,25 @@
   <body>
       <h1>Preparing to run your test</h1>
   </body>
+  <script>
+    var scripts = [
+      "assets/vendor/global.js",
+      "assets/vendor/selenium-browserdetect.js",
+      "assets/polyfills.js",
+      "assets/escape.js",
+      "assets/injector.js",
+      "assets/record.js"
+    ];
+    var urls;
+    if (chrome) {
+      urls = scripts.map(script => (chrome.runtime.getURL(script)));
+    } else if (browser) {
+      urls = scripts.map(script => (browser.runtime.getURL(script)));
+    }
+    urls.forEach(url => {
+      var e = document.createElement("script");
+      e.src = url;
+      document.body.appendChild(e);
+    });
+  </script>
 </html>
diff --git a/packages/selenium-ide/src/content/commands-api.js b/packages/selenium-ide/src/content/commands-api.js
@@ -42,32 +42,39 @@ function doCommands(request, sender, sendResponse) {
     } else if (request.commands == "domWait") {
       selenium["doDomWait"]("", selenium.preprocessParameter(""));
       sendResponse({ dom_time: window.sideex_new_page });
+    } else if (request.commands === "evaluateConditional") {
+      try {
+        let value = selenium["doEvaluateConditional"](request.target);
+        sendResponse({ result: "success", value: value });
+      } catch(e) {
+        sendResponse({ result: e.message });
+      }
     } else {
       const upperCase = request.commands.charAt(0).toUpperCase() + request.commands.slice(1);
       if (selenium["do" + upperCase] != null) {
         try {
           document.body.setAttribute("SideeXPlayingFlag", true);
-          let returnValue = selenium["do"+upperCase](selenium.preprocessParameter(request.target),selenium.preprocessParameter(request.value));
+          let returnValue = selenium["do" + upperCase](selenium.preprocessParameter(request.target), selenium.preprocessParameter(request.value));
           if (returnValue instanceof Promise) {
             // The command is a asynchronous function
             returnValue.then(function() {
               // Asynchronous command completed successfully
               document.body.removeAttribute("SideeXPlayingFlag");
-              sendResponse({result: "success"});
+              sendResponse({ result: "success" });
             }).catch(function(reason) {
               // Asynchronous command failed
               document.body.removeAttribute("SideeXPlayingFlag");
-              sendResponse({result: reason});
+              sendResponse({ result: reason });
             });
           } else {
             // Synchronous command completed successfully
             document.body.removeAttribute("SideeXPlayingFlag");
-            sendResponse({result: "success"});
+            sendResponse({ result: "success" });
           }
         } catch(e) {
           // Synchronous command failed
           document.body.removeAttribute("SideeXPlayingFlag");
-          sendResponse({result: e.message});
+          sendResponse({ result: e.message });
         }
       } else {
         sendResponse({ result: "Unknown command: " + request.commands });
@@ -84,9 +91,9 @@ function doCommands(request, sender, sendResponse) {
     try {
       const element = selenium.browserbot.findElement(request.locator);
       const locator = locatorBuilders.buildAll(element).find(([loc, strat]) => (/^xpath/.test(strat)))[0]; //eslint-disable-line no-unused-vars
-      sendResponse({result: "success", locator});
+      sendResponse({ result: "success", locator });
     } catch(e) {
-      sendResponse({result: e.message});
+      sendResponse({ result: e.message });
     }
   }
   if (request.selectMode) {

diff --git a/packages/selenium-ide/src/content/selenium-api.js b/packages/selenium-ide/src/content/selenium-api.js
@@ -228,8 +228,16 @@ Selenium.prototype.reset = function() {
   this.browserbot.resetPopups();
 };
 
-Selenium.prototype.eval = function(script, scoped = true) {
-  return window.eval(scoped ? `(() => {${script}})()` : script);
+Selenium.prototype.eval = function(script, scoped = true, isExpression = false) {
+  if (isExpression) {
+    return window.eval(scoped ? `(() => (${script}))()` : script);
+  } else {
+    return window.eval(scoped ? `(() => {${script}})()` : script);
+  }
+};
+
+Selenium.prototype.doEvaluateConditional = function(condition) {
+  return !!(this.eval(condition, undefined, true));
 };
 
 Selenium.prototype.doVerifyChecked = function(locator) {
@@ -331,6 +339,16 @@ Selenium.prototype.doVerifyElementNotPresent = function(locator) {
   }
 };
 
+Selenium.prototype.doVerify = function(actual, expected) {
+  this.doAssert(actual, expected);
+};
+
+Selenium.prototype.doAssert = function(actual, expected) {
+  if (actual !== expected) {
+    throw new Error("Actual value '" + actual + "' did not match '" + expected + "'");
+  }
+};
+
 Selenium.prototype.doAssertChecked = function(locator) {
   let element = this.browserbot.findElement(locator);
   if (element.type !== "checkbox" && element.type !== "radio") {

diff --git a/packages/selenium-ide/src/manifest.json b/packages/selenium-ide/src/manifest.json
@@ -42,7 +42,7 @@
     "assets/prompt.css",
     "assets/bootstrap.html"
   ],
-  "content_security_policy": "script-src 'self'; object-src 'self'",
+  "content_security_policy": "script-src 'self' 'sha256-UUwVIygWwzdom+NTsGSMgQnlQ8Phnj5BIK5+S3HWX4Y=' 'unsafe-eval'; object-src 'self'",
   "content_scripts": [
     {
       "matches": [
@@ -60,9 +60,8 @@
       "all_frames": true
     }
   ],
-  "background": {
-    "scripts": [
-      "assets/background.js"
-    ]
+  "background":
+  {
+    "scripts": ["assets/background.js"]
   }
-}
+}
diff --git a/packages/selenium-ide/src/neo/IO/ControlFlowValidator.js b/packages/selenium-ide/src/neo/IO/ControlFlowValidator.js
diff --git a/packages/selenium-ide/src/neo/IO/SideeX/ext-command.js b/packages/selenium-ide/src/neo/IO/SideeX/ext-command.js
@@ -370,20 +370,30 @@ export default class ExtCommand {
     let upperCase = command.charAt(0).toUpperCase() + command.slice(1);
     return "do" + upperCase;
   }
-}
 
-export function isExtCommand(command) {
-  switch(command) {
-    case "pause":
-    case "open":
-    case "selectFrame":
-    case "selectWindow":
-    case "run":
-    case "setSpeed":
-    case "store":
-    case "close":
-      return true;
-    default:
-      return false;
+  isExtCommand(command) {
+    switch(command) {
+      case "pause":
+      case "open":
+      case "selectFrame":
+      case "selectWindow":
+      case "run":
+      case "setSpeed":
+      case "store":
+      case "close":
+        return true;
+      default:
+        return false;
+    }
+  }
+
+  isWindowMethodCommand(command) {
+    return (command == "answerOnNextPrompt"
+      || command == "chooseCancelOnNextPrompt"
+      || command == "assertPrompt"
+      || command == "chooseOkOnNextConfirmation"
+      || command == "chooseCancelOnNextConfirmation"
+      || command == "assertConfirmation"
+      || command == "assertAlert");
   }
 }