added element post/get commands

cisco-open-source · Dec 18, 2013 · d369690 · d369690
1 parent bfe1a28
commit d369690
Show file tree

Hide file tree

Showing 2 changed files with 106 additions and 17 deletions.
diff --git a/web/WebDriverJsDemo.html b/web/WebDriverJsDemo.html
@@ -1,5 +1,6 @@
 <html>
   <head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
     <style type="text/css">
       .unitLabel {
         font-size: small;
@@ -15,6 +16,10 @@
       #keyboard input {
         min-width: 30px;
       }
+
+      #findElementPanel td {
+        vertical-align: top;
+      }
     </style>
     <script src="webdriver.js"></script>
     <script src="base64-arraybuffer.js"></script>
@@ -49,17 +54,48 @@
     <div id="error" class="commandBlock" style="display: none; color: red;">
     </div>
 
-    <div class="commandBlock">
-      Find element by
-      <select name="findElementCriteria">
-        <option value="id">id</option>
-        <option value="name">name</option>
-        <option value="tagName">tag name</option>
-        <option value="xpath">xpath</option>
-      </select>
-      <input name="findElementKey" type="text"/>
-      <input type="submit" value="Find element" onclick="wd.onFindElement()">
-      <span id="foundElement" style="visibility: hidden;"></span>
+    <div id="findElementPanel" class="commandBlock">
+      <table>
+        <tr>
+          <td>
+            Find element by
+          </td>
+          <td>
+            <select name="findElementCriteria">
+              <option value="id">id</option>
+              <option value="name">name</option>
+              <option value="tagName">tag name</option>
+              <option value="xpath">xpath</option>
+            </select>
+          </td>
+          <td>
+            <input name="findElementKey" type="text"/>
+          </td>
+          <td>
+            <input type="submit" value="Find element" onclick="wd.onFindElement()"/>
+          </td>
+          <td>
+            <span id="foundElement" style="visibility: hidden;"></span>
+          </td>
+          <td>
+            <span id="elementActions" style="visibility: hidden;">
+              <input type="submit" value="Click" onclick="wd.onElementClick()"/>
+              <input type="submit" value="Submit" onclick="wd.onElementSubmit()"/>
+              <input type="submit" value="Clear" onclick="wd.onElementClear()"/>
+
+              <input type="submit" value="Tag name" onclick="wd.onElementTagName()"/>
+              <input type="submit" value="Text" onclick="wd.onElementText()"/>
+
+              <input type="submit" value="Location" onclick="wd.onElementLocation()"/>
+              <input type="submit" value="Size" onclick="wd.onElementSize()"/>
+
+              <input type="submit" value="Selected?" onclick="wd.onElementIsSelected()"/>
+              <input type="submit" value="Enabled?" onclick="wd.onElementIsEnabled()"/>
+              <input type="submit" value="Displayed?" onclick="wd.onElementIsDisplayed()"/>
+            </span>
+          </td>
+        </tr>
+      </table>
     </div>
 
     <div class="commandBlock">

diff --git a/web/webdriver-app.js b/web/webdriver-app.js
@@ -555,10 +555,13 @@ WebDriverJsView.prototype.setFoundElementId = function(id) {
   var element = document.getElementById('foundElement');
   if (typeof id.ELEMENT === 'string') {
     element.innerHTML = 'Found element ' + id.ELEMENT;
+    element.style.visibility = 'visible';
+    document.getElementById('elementActions').style.visibility = 'visible';
   } else {
-    element.innerHTML = id.ELEMENT.message;
+    element.style.visibility = 'hidden';
+    this.setError(id.ELEMENT.message);
+    document.getElementById('elementActions').style.visibility = 'hidden';
   }
-  element.style.visibility = 'visible';
 }
 
 WebDriverJsView.prototype.setError = function(message) {
@@ -669,6 +672,60 @@ WebDriverJsController.prototype.onFindElement = function() {
   });
 };
 
+WebDriverJsController.prototype.onElementClick = function() {
+  this.element.click();
+};
+
+WebDriverJsController.prototype.onElementSubmit = function() {
+  this.element.submit();
+};
+
+WebDriverJsController.prototype.onElementClear = function() {
+  this.element.clear();
+};
+
+WebDriverJsController.prototype.onElementTagName = function() {
+  this.element.getTagName().then(function(value) {
+    alert('Element tag name: ' + value);
+  });
+};
+
+WebDriverJsController.prototype.onElementText = function() {
+  this.element.getText().then(function(value) {
+    alert('Element text: ' + value);
+  });
+};
+
+WebDriverJsController.prototype.onElementLocation = function() {
+  this.element.getLocation().then(function(value) {
+    alert('Element location: ' + JSON.stringify(value));
+  });
+};
+
+WebDriverJsController.prototype.onElementSize = function() {
+  this.element.getSize().then(function(value) {
+    alert('Element size: ' + JSON.stringify(value));
+  });
+};
+
+WebDriverJsController.prototype.onElementIsSelected = function() {
+  this.element.isSelected().then(function(value) {
+    alert('Element selection: ' + value);
+  });
+};
+
+WebDriverJsController.prototype.onElementIsEnabled = function() {
+  this.element.isEnabled().then(function(value) {
+    alert('Element enabled: ' + value);
+  });
+};
+
+WebDriverJsController.prototype.onElementIsDisplayed = function() {
+  this.element.isDisplayed().then(function(value) {
+    alert('Element displayed: ' + value);
+  });
+};
+
 WebDriverJsController.prototype.onSendKeys = function(key) {
   if (this.element) {
     this.element.sendKeys(key);
@@ -677,10 +734,6 @@ WebDriverJsController.prototype.onSendKeys = function(key) {
   }
 };
 
-WebDriverJsController.prototype.onClick = function() {
-  this.element.click();
-};
-
 WebDriverJsController.prototype.onListWindowHandles = function() {
   var self = this;
   var select = document.getElementById('windowList');