Merge branch 'assertions'

Author: corevo

packages/selenium-ide/src/neo/models/Command.js

@@ -70,12 +70,19 @@ export const Commands = Object.freeze({
   addSelection: "add selection",
   answerOnNextPrompt: "answer on next prompt",
   assertAlert: "assert alert",
+  assertChecked: "assert checked",
+  assertNotChecked: "assert not checked",
   assertConfirmation: "assert confirmation",
+  assertEditable: "assert editable",
+  assertNotEditable: "assert not editable",
   assertElementPresent: "assert element present",
   assertElementNotPresent: "assert element not present",
   assertPrompt: "assert prompt",
+  assertSelectedValue: "assert selected value",
+  assertNotSelectedValue: "assert not selected value",
   assertText: "assert text",
   assertTitle: "assert title",
+  assertValue: "assert value",
   chooseCancelOnNextConfirmation: "choose cancel on next confirmation",
   chooseCancelOnNextPrompt: "choose cancel on next prompt",
   chooseOkOnNextConfirmation: "choose ok on next confirmation",
@@ -101,10 +108,17 @@ export const Commands = Object.freeze({
   storeText: "store text",
   storeTitle: "store title",
   type: "type",
+  verifyChecked: "verify checked",
+  verifyNotChecked: "verify not checked",
+  verifyEditable: "verify editable",
+  verifyNotEditable: "verify not editable",
   verifyElementPresent: "verify element present",
   verifyElementNotPresent: "verify element not present",
+  verifySelectedValue: "verify selected value",
+  verifyNotSelectedValue: "verify not selected value",
   verifyText: "verify text",
-  verifyTitle: "verify title"
+  verifyTitle: "verify title",
+  verifyValue: "verify value"
 });
 
 export const CommandsArray = Object.freeze(Object.keys(Commands));

packages/selenium-ide/src/selenium-api.js

@@ -347,13 +347,69 @@ Selenium.prototype.reset = function() {
   this.browserbot.resetPopups();
 };
 
+Selenium.prototype.doVerifyChecked = function(locator) {
+  let element = this.browserbot.findElement(locator);
+  if (element.type !== "checkbox" && element.type !== "radio") {
+    throw new Error(`Element with locator ${locator} is not a checkbox nor a radio button`);
+  } else if (!element.checked) {
+    throw new Error(`Element with locator ${locator} is not checked`);
+  }
+};
+
+Selenium.prototype.doVerifyNotChecked = function(locator) {
+  let element = this.browserbot.findElement(locator);
+  if (element.type !== "checkbox" && element.type !== "radio") {
+    throw new Error(`Element with locator ${locator} is not a checkbox nor a radio button`);
+  } else if (element.checked) {
+    throw new Error(`Element with locator ${locator} is checked`);
+  }
+};
+
+Selenium.prototype.doVerifyEditable = function(locator) {
+  if (!this.isEditable(locator)) {
+    throw new Error(`Element with locator ${locator} is not editable`);
+  }
+};
+
+Selenium.prototype.doVerifyNotEditable = function(locator) {
+  if (this.isEditable(locator)) {
+    throw new Error(`Element with locator ${locator} is editable`);
+  }
+};
+
+
+Selenium.prototype.doVerifySelectedValue = function(locator, value) {
+  let element = this.browserbot.findElement(locator);
+  if (element.type !== "select-one") {
+    throw new Error(`Element with locator ${locator} is not a select`);
+  } else if (element.value !== value) {
+    throw new Error("Actual value '" + element.value + "' did not match '" + value + "'");
+  }
+};
+
+Selenium.prototype.doVerifyNotSelectedValue = function(locator, value) {
+  let element = this.browserbot.findElement(locator);
+  if (element.type !== "select-one") {
+    throw new Error(`Element with locator ${locator} is not a select`);
+  } else if (element.value === value) {
+    throw new Error("Actual value '" + element.value + "' did match");
+  }
+};
+
 Selenium.prototype.doVerifyText = function(locator, value) {
   let element = this.browserbot.findElement(locator);
   if (getText(element) !== value) {
     throw new Error("Actual value '" + getText(element) + "' did not match '" + value + "'");
   }
 };
 
+Selenium.prototype.doVerifyValue = function(locator, value) {
+  let element = this.browserbot.findElement(locator);
+  if (element.value !== value) {
+    throw new Error("Actual value '" + element.value + "' did not match '" + value + "'");
+  }
+};
+
 Selenium.prototype.doVerifyTitle = function(value) {
   if (normalizeSpaces(this.getTitle()) !== value) {
     throw new Error("Actual value '" + normalizeSpaces(this.getTitle()) + "' did not match '" + value + "'");
@@ -383,13 +439,68 @@ Selenium.prototype.doVerifyElementNotPresent = function(locator) {
   }
 };
 
+Selenium.prototype.doAssertChecked = function(locator) {
+  let element = this.browserbot.findElement(locator);
+  if (element.type !== "checkbox" && element.type !== "radio") {
+    throw new Error(`Element with locator ${locator} is not a checkbox nor a radio button`);
+  } else if (!element.checked) {
+    throw new Error(`Element with locator ${locator} is not checked`);
+  }
+};
+
+Selenium.prototype.doAssertNotChecked = function(locator) {
+  let element = this.browserbot.findElement(locator);
+  if (element.type !== "checkbox" && element.type !== "radio") {
+    throw new Error(`Element with locator ${locator} is not a checkbox nor a radio button`);
+  } else if (element.checked) {
+    throw new Error(`Element with locator ${locator} is checked`);
+  }
+};
+
+Selenium.prototype.doAssertEditable = function(locator) {
+  if (!this.isEditable(locator)) {
+    throw new Error(`Element with locator ${locator} is not editable`);
+  }
+};
+
+Selenium.prototype.doAssertNotEditable = function(locator) {
+  if (this.isEditable(locator)) {
+    throw new Error(`Element with locator ${locator} is editable`);
+  }
+};
+
+Selenium.prototype.doAssertSelectedValue = function(locator, value) {
+  let element = this.browserbot.findElement(locator);
+  if (element.type !== "select-one") {
+    throw new Error(`Element with locator ${locator} is not a select`);
+  } else if (element.value !== value) {
+    throw new Error("Actual value '" + element.value + "' did not match '" + value + "'");
+  }
+};
+
+Selenium.prototype.doAssertNotSelectedValue = function(locator, value) {
+  let element = this.browserbot.findElement(locator);
+  if (element.type !== "select-one") {
+    throw new Error(`Element with locator ${locator} is not a select`);
+  } else if (element.value === value) {
+    throw new Error("Actual value '" + element.value + "' did match");
+  }
+};
+
 Selenium.prototype.doAssertText = function(locator, value) {
   let element = this.browserbot.findElement(locator);
   if (getText(element) !== value) {
     throw new Error("Actual value '" + getText(element) + "' did not match '" + value + "'");
   }
 };
 
+Selenium.prototype.doAssertValue = function(locator, value) {
+  let element = this.browserbot.findElement(locator);
+  if (element.value !== value) {
+    throw new Error("Actual value '" + element.value + "' did not match '" + value + "'");
+  }
+};
+
 Selenium.prototype.doAssertTitle = function(value) {
   if (normalizeSpaces(this.getTitle()) !== value) {
     throw new Error("Actual value '" + normalizeSpaces(this.getTitle()) + "' did not match '" + value + "'");