implemented some elements location functions

gedaiu · Jan 3, 2016 · f982b28 · f982b28
1 parent e159af7
commit f982b28
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 8 deletions.
diff --git a/source/selenium.d b/source/selenium.d
@@ -178,6 +178,15 @@ struct Cookie {
 	}
 }
 
+struct ElementLocator {
+	LocatorStrategy using;
+	string value;
+}
+
+struct WebElement {
+	string ELEMENT;
+}
+
 struct SeleniumSession {
 	string serverUrl;
 
@@ -326,14 +335,35 @@ struct SeleniumSession {
 		return this;
 	}
 
+  auto deleteCookie(string name) {
+		DELETE("/cookie/" ~ name);
+		return this;
+	}
+
+	auto source() {
+		return GET!string("/source");
+	}
+
+	auto title() {
+		return GET!string("/title");
+	}
 
+	auto element(ElementLocator elem) {
+		return POST!WebElement("/element", elem);
+	}
+
+	auto elements(ElementLocator elem) {
+		return POST!(WebElement[])("/elements", elem);
+	}
+
+	auto activeElement() {
+		return POST!WebElement("/element/active");
+	}
+
+	auto elementFromElement(string initialElem, ElementLocator elem) {
+		return POST!WebElement("/element/" ~ initialElem ~ "/element", elem);
+	}
 	/*
-/session/:sessionId/cookie/:name
-/session/:sessionId/source
-/session/:sessionId/title
-/session/:sessionId/element
-/session/:sessionId/elements
-/session/:sessionId/element/active
 /session/:sessionId/element/:id
 /session/:sessionId/element/:id/element
 /session/:sessionId/element/:id/elements
@@ -470,7 +500,7 @@ private Json makeRequest(T)(HTTPMethod method, string path, T data) {
 	Json result;
 	bool done = false;
 
-	logInfo("REQUEST: %s %s %s", method, path, data.to!string);
+	logInfo("REQUEST: %s %s %s", method, path, data.serializeToJson.toPrettyString);
 
 	requestHTTP(path,
 		(scope req) {

diff --git a/source/test.d b/source/test.d
@@ -11,7 +11,7 @@ unittest {
   auto url2 = "http://www.amazon.com/The-Boys-Boat-Americans-Olympics/dp/0143125478/";
 
   auto session = SeleniumSession("http://127.0.0.1:4444/wd/hub", Capabilities.chrome);
-
+/+
   session.timeouts(TimeoutType.script, 10_000);
   session.timeouts(TimeoutType.implicit, 10_000);
   session.timeouts(TimeoutType.pageLoad, 10_000);
@@ -61,7 +61,23 @@ unittest {
 
   auto cookie = Cookie("test", "value");
   session.setCookie(cookie);
+  session.deleteCookie("test");
   session.deleteAllCookies;
++/
+  assert(session.source != "");
+  session.url("http://wfmu.org/playlists/LM");
+  assert(session.title == "WFMU: This Is The Modern World with Trouble: Playlists and Archives");
+  auto elem = ElementLocator(LocatorStrategy.ClassName, "ui-dialog");
+  session.element(elem);
+  auto elem2 = ElementLocator(LocatorStrategy.CssSelector, ".showList ul");
+  session.elements(elem2);
+  session.element(elem2);
+
+  auto elem3 = ElementLocator(LocatorStrategy.TagName, "li");
+  session.elementFromElement(session.element(elem2).ELEMENT, elem3);
+
+  session.activeElement;
+
 
   session.disconnect;
 }